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 15c9351947e7e44b89dfe68df97d213e56bc6779..05828997b32eda70b866f9a77dbfd63c86d8fc58 100644 (file)
--- 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 edfc3bb81a9e109f35f061a5f14b95c8fa288dc1..13bb933f0888c6b9ef1ff4487f1d6901241b0ca7 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2670,7 +2670,9 @@ 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