Mercurial > hg > nginx
changeset 1396:ec4d58ab30ea stable-0.5
r1387 merge:
fix building by bcc without PCRE
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 14 Aug 2007 20:03:00 +0000 |
parents | bf5b86d5f00e |
children | 78bfaf37dc40 |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Tue Aug 14 20:02:09 2007 +0000 +++ b/src/http/ngx_http_core_module.c Tue Aug 14 20:03:00 2007 +0000 @@ -933,14 +933,19 @@ ngx_array_t *locations, ngx_uint_t regex_start, size_t len) { ngx_int_t n, rc; - ngx_uint_t i, found, noregex; + ngx_uint_t i, found; ngx_http_core_loc_conf_t *clcf, **clcfp; +#if (NGX_PCRE) + ngx_uint_t noregex; +#endif ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "find location for \"%V\"", &r->uri); found = 0; +#if (NGX_PCRE) noregex = 0; +#endif clcfp = locations->elts; for (i = 0; i < locations->nelts; i++) { @@ -998,9 +1003,12 @@ break; } + found = 1; + r->loc_conf = clcfp[i]->loc_conf; +#if (NGX_PCRE) noregex = clcfp[i]->noregex; - found = 1; +#endif } }