nginx: src/http/ngx_http_core_module.c comparison

fix noregex for inclusive locations

comparison

equal deleted inserted replaced

-:274c0f3ea600
+:e9420c1b6f25
 static ngx_int_t
 ngx_http_core_find_location(ngx_http_request_t *r)
 {
 ngx_int_t                  rc;
 ngx_http_core_loc_conf_t  *pclcf;
+#if (NGX_PCRE)
+ngx_int_t                  n;
+ngx_uint_t                 noregex;
+ngx_http_core_loc_conf_t  *clcf, **clcfp;
+noregex = 0;
+#endif
 pclcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 rc = ngx_http_core_find_static_location(r, pclcf->static_locations);
 if (rc == NGX_AGAIN) {
+#if (NGX_PCRE)
+clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+noregex = clcf->noregex;
+#endif
 /* look up nested locations */
 rc = ngx_http_core_find_location(r);
 }
 if (rc == NGX_OK || rc == NGX_DONE) {
 return rc;
 }
 /* rc == NGX_DECLINED or rc == NGX_AGAIN in nested location */
 #if (NGX_PCRE)
-{
-ngx_int_t                  n;
+if (noregex == 0 && pclcf->regex_locations) {
-ngx_http_core_loc_conf_t  *clcf, **clcfp;
-clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-if (clcf->noregex == 0 && pclcf->regex_locations) {
 for (clcfp = pclcf->regex_locations; *clcfp; clcfp++) {
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "test location: ~ \"%V\"", &(*clcfp)->name);
 /* look up nested locations */
 return ngx_http_core_find_location(r);
 }
-}
 }
 #endif
 return rc;
 }

Mercurial > hg > nginx