diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-28 13:15:11 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-28 13:15:11 +0000 |
| commit | 8eac7261956a895b05459b42214935c31b7fc33a (patch) | |
| tree | 255e35496078adbe354ede2e89193f6c9788f960 /src | |
| parent | 86b915901a7174298c4997004b562a75726a1068 (diff) | |
| download | nginx-8eac7261956a895b05459b42214935c31b7fc33a.tar.gz nginx-8eac7261956a895b05459b42214935c31b7fc33a.zip | |
fix building --without-pcre
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_referer_module.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c index 15c935194..05828997b 100644 --- a/src/http/modules/ngx_http_referer_module.c +++ b/src/http/modules/ngx_http_referer_module.c @@ -246,7 +246,9 @@ ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent, void *child) if (conf->keys == NULL) { conf->hash = prev->hash; +#if (NGX_PCRE) ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); +#endif ngx_conf_merge_value(conf->no_referer, prev->no_referer, 0); ngx_conf_merge_value(conf->blocked_referer, prev->blocked_referer, 0); @@ -322,7 +324,9 @@ ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent, void *child) conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash; } +#if (NGX_PCRE) ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); +#endif if (conf->no_referer == NGX_CONF_UNSET) { conf->no_referer = 0; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index edfc3bb81..13bb933f0 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2670,8 +2670,10 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf) #if (NGX_HTTP_GZIP) lcf->gzip_vary = NGX_CONF_UNSET; lcf->gzip_http_version = NGX_CONF_UNSET_UINT; +#if (NGX_PCRE) lcf->gzip_disable = NGX_CONF_UNSET_PTR; #endif +#endif return lcf; } @@ -2891,7 +2893,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_bitmask_value(conf->gzip_proxied, prev->gzip_proxied, (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF)); +#if (NGX_PCRE) ngx_conf_merge_ptr_value(conf->gzip_disable, prev->gzip_disable, NULL); +#endif #endif |