diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-08-15 00:03:00 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-08-15 00:03:00 +0400 |
commit | 7f06d5bccc5a67b24bd30e11efda8f62a63fd908 (patch) | |
tree | 6da3a63db7f33a5355056443c7ce919d7e596bb6 | |
parent | d4eeedc3a0e5125ef1b1a1fed247318e5de0dcf1 (diff) |
r1387 merge:
fix building by bcc without PCRE
-rw-r--r-- | src/http/ngx_http_core_module.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 8f36caeb8..696c10b34 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -933,14 +933,19 @@ ngx_http_core_find_location(ngx_http_request_t *r, 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 @@ ngx_http_core_find_location(ngx_http_request_t *r, break; } + found = 1; + r->loc_conf = clcfp[i]->loc_conf; +#if (NGX_PCRE) noregex = clcfp[i]->noregex; - found = 1; +#endif } } |