diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-08-12 15:25:09 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-08-12 15:25:09 +0000 |
commit | 307ab0ded686d43c7e8717f954ee16f47ff56433 (patch) | |
tree | 2a1333c837aeed5e0958a9a580cd1648cf117e56 | |
parent | 242d1de5d0675e4a71fbae600a677b55e205ac4f (diff) | |
download | nginx-307ab0ded686d43c7e8717f954ee16f47ff56433.tar.gz nginx-307ab0ded686d43c7e8717f954ee16f47ff56433.zip |
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 f8bd6b92c..a21075bc3 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 } } |