comparison src/http/modules/ngx_http_referer_module.c @ 362:54fad6c4b555 NGINX_0_6_25

nginx 0.6.25 *) Change: now the "server_name_in_redirect" directive is used instead of the "server_name" directive's special "*" parameter. *) Change: now wildcard and regex names can be used as main name in a "server_name" directive. *) Change: the "satisfy_any" directive was replaced by the "satisfy" directive. *) Workaround: old worker processes might hog CPU after reconfiguration if they was run under Linux OpenVZ. *) Feature: the "min_delete_depth" directive. *) Bugfix: the COPY and MOVE methods did not work with single files. *) Bugfix: the ngx_http_gzip_static_module did not allow the ngx_http_dav_module to work; bug appeared in 0.6.23. *) Bugfix: socket leak in HTTPS mode if deferred accept was used. Thanks to Ben Maurer. *) Bugfix: nginx could not be built without PCRE library; bug appeared in 0.6.23.
author Igor Sysoev <http://sysoev.ru>
date Tue, 08 Jan 2008 00:00:00 +0300
parents 9121a0a91f47
children f39b9e29530d
comparison
equal deleted inserted replaced
361:160660bad929 362:54fad6c4b555
244 ngx_hash_init_t hash; 244 ngx_hash_init_t hash;
245 245
246 if (conf->keys == NULL) { 246 if (conf->keys == NULL) {
247 conf->hash = prev->hash; 247 conf->hash = prev->hash;
248 248
249 #if (NGX_PCRE)
249 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); 250 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL);
251 #endif
250 ngx_conf_merge_value(conf->no_referer, prev->no_referer, 0); 252 ngx_conf_merge_value(conf->no_referer, prev->no_referer, 0);
251 ngx_conf_merge_value(conf->blocked_referer, prev->blocked_referer, 0); 253 ngx_conf_merge_value(conf->blocked_referer, prev->blocked_referer, 0);
252 254
253 return NGX_CONF_OK; 255 return NGX_CONF_OK;
254 } 256 }
320 } 322 }
321 323
322 conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash; 324 conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash;
323 } 325 }
324 326
327 #if (NGX_PCRE)
325 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL); 328 ngx_conf_merge_ptr_value(conf->regex, prev->regex, NULL);
329 #endif
326 330
327 if (conf->no_referer == NGX_CONF_UNSET) { 331 if (conf->no_referer == NGX_CONF_UNSET) {
328 conf->no_referer = 0; 332 conf->no_referer = 0;
329 } 333 }
330 334