Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 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 775edc46ee66
children a4cb9c04e7f2
comparison
equal deleted inserted replaced
1799:0b5b94805d26 1800:3e1c695258d3
2668 lcf->open_file_cache_events = NGX_CONF_UNSET; 2668 lcf->open_file_cache_events = NGX_CONF_UNSET;
2669 2669
2670 #if (NGX_HTTP_GZIP) 2670 #if (NGX_HTTP_GZIP)
2671 lcf->gzip_vary = NGX_CONF_UNSET; 2671 lcf->gzip_vary = NGX_CONF_UNSET;
2672 lcf->gzip_http_version = NGX_CONF_UNSET_UINT; 2672 lcf->gzip_http_version = NGX_CONF_UNSET_UINT;
2673 #if (NGX_PCRE)
2673 lcf->gzip_disable = NGX_CONF_UNSET_PTR; 2674 lcf->gzip_disable = NGX_CONF_UNSET_PTR;
2675 #endif
2674 #endif 2676 #endif
2675 2677
2676 return lcf; 2678 return lcf;
2677 } 2679 }
2678 2680
2889 ngx_conf_merge_uint_value(conf->gzip_http_version, prev->gzip_http_version, 2891 ngx_conf_merge_uint_value(conf->gzip_http_version, prev->gzip_http_version,
2890 NGX_HTTP_VERSION_11); 2892 NGX_HTTP_VERSION_11);
2891 ngx_conf_merge_bitmask_value(conf->gzip_proxied, prev->gzip_proxied, 2893 ngx_conf_merge_bitmask_value(conf->gzip_proxied, prev->gzip_proxied,
2892 (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF)); 2894 (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF));
2893 2895
2896 #if (NGX_PCRE)
2894 ngx_conf_merge_ptr_value(conf->gzip_disable, prev->gzip_disable, NULL); 2897 ngx_conf_merge_ptr_value(conf->gzip_disable, prev->gzip_disable, NULL);
2898 #endif
2895 2899
2896 #endif 2900 #endif
2897 2901
2898 return NGX_CONF_OK; 2902 return NGX_CONF_OK;
2899 } 2903 }