Mercurial > hg > nginx

changeset 1800:3e1c695258d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix building --without-pcre
author Igor Sysoev <igor@sysoev.ru>
date Fri, 28 Dec 2007 13:15:11 +0000
parents 0b5b94805d26
children a4cb9c04e7f2
files src/http/modules/ngx_http_referer_module.c src/http/ngx_http_core_module.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 *
     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 *
         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;
--- 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
 #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 
     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