[nginx] svn commit: r4459 - trunk/src/http/modules

[vbart at nginx.com]

Author: vbart
Date: 2012-02-10 10:48:58 +0000 (Fri, 10 Feb 2012)
New Revision: 4459

Modified:
   trunk/src/http/modules/ngx_http_limit_conn_module.c
Log:
Limit conn: returned to the old behavior of using the first actual limit on
the way.

It was unintentionally changed in r4272, so that it could only limit the first
location where the processing of the request has reached PREACCESS phase.


Modified: trunk/src/http/modules/ngx_http_limit_conn_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_limit_conn_module.c	2012-02-10 09:56:37 UTC (rev 4458)
+++ trunk/src/http/modules/ngx_http_limit_conn_module.c	2012-02-10 10:48:58 UTC (rev 4459)
@@ -159,8 +159,6 @@
         return NGX_DECLINED;
     }
 
-    r->main->limit_conn_set = 1;
-
     lccf = ngx_http_get_module_loc_conf(r, ngx_http_limit_conn_module);
     limits = lccf->limits.elts;
 
@@ -187,6 +185,8 @@
             continue;
         }
 
+        r->main->limit_conn_set = 1;
+
         hash = ngx_crc32_short(vv->data, len);
 
         shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;