fix building --without-pcre
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c index 15c9351..0582899 100644 --- a/src/http/modules/ngx_http_referer_module.c +++ b/src/http/modules/ngx_http_referer_module.c
@@ -246,7 +246,9 @@ 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 @@ 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 edfc3bb..13bb933 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c
@@ -2670,8 +2670,10 @@ #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_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