mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-17 17:20:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix building --without-pcre

Browse Source
This commit is contained in:
Igor Sysoev 2007-12-28 13:15:11 +00:00
parent 86b915901a
commit 8eac726195
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/modules/ngx_http_referer_module.c
View File

@ -246,7 +246,9 @@ ngx_http_referer_merge_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->keys == NULL) { if (conf->keys == NULL) {
conf->hash = prev->hash; conf->hash = prev->hash;
#if (NGX_PCRE)
ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); 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->no_referer, prev->no_referer, 0);
ngx_conf_merge_value(conf->blocked_referer, prev->blocked_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; conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash;
} }
#if (NGX_PCRE)
ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL);
#endif
if (conf->no_referer == NGX_CONF_UNSET) { if (conf->no_referer == NGX_CONF_UNSET) {
conf->no_referer = 0; conf->no_referer = 0;

4
src/http/ngx_http_core_module.c
View File

@ -2670,7 +2670,9 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
lcf->gzip_vary = NGX_CONF_UNSET; lcf->gzip_vary = NGX_CONF_UNSET;
lcf->gzip_http_version = NGX_CONF_UNSET_UINT; lcf->gzip_http_version = NGX_CONF_UNSET_UINT;
#if (NGX_PCRE)
lcf->gzip_disable = NGX_CONF_UNSET_PTR; lcf->gzip_disable = NGX_CONF_UNSET_PTR;
#endif
#endif #endif
return lcf; 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_merge_bitmask_value(conf->gzip_proxied, prev->gzip_proxied,
(NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF)); (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF));
#if (NGX_PCRE)
ngx_conf_merge_ptr_value(conf->gzip_disable, prev->gzip_disable, NULL); ngx_conf_merge_ptr_value(conf->gzip_disable, prev->gzip_disable, NULL);
#endif
#endif #endif