nginx: src/http/ngx_http_core_module.c comparison

*) regex match must return NGX_OK to stop regex searching, this fixes inclusive regex location *) change NGX_HTTP_INTERNAL_SERVER_ERROR to NGX_ERROR

comparison

equal deleted inserted replaced

-:e9420c1b6f25
+:ecce31d90117
 r->content_handler = NULL;
 r->uri_changed = 0;
 rc = ngx_http_core_find_location(r);
-if (rc == NGX_HTTP_INTERNAL_SERVER_ERROR) {
+if (rc == NGX_ERROR) {
 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
 return NGX_OK;
 }
 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 r->content_handler = clcf->handler;
 }
 }
+/*
+* NGX_OK       - exact or regex match
+* NGX_DONE     - auto redirect
+* NGX_AGAIN    - inclusive match
+* NGX_ERROR    - regex error
+* NGX_DECLINED - no match
+*/
 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 (n < 0) {
 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
 ngx_regex_exec_n
 " failed: %d on \"%V\" using \"%V\"",
 n, &r->uri, &(*clcfp)->name);
-return NGX_HTTP_INTERNAL_SERVER_ERROR;
+return NGX_ERROR;
 }
 /* match */
 r->loc_conf = (*clcfp)->loc_conf;
 /* look up nested locations */
-return ngx_http_core_find_location(r);
+rc = ngx_http_core_find_location(r);
+return (rc == NGX_ERROR) ? rc : NGX_OK;
 }
 }
 #endif
 return rc;

Mercurial > hg > nginx