comparison src/http/ngx_http_core_module.h @ 456:ca8f7f6cab16 NGINX_0_7_40

nginx 0.7.40 *) Feature: the "location" directive supports captures in regular expressions. *) Feature: an "alias" directive with capture references may be used inside a location given by a regular expression with captures. *) Feature: the "server_name" directive supports captures in regular expressions. *) Workaround: the ngx_http_autoindex_module did not show the trailing slash in directories on XFS filesystem; the issue had appeared in 0.7.15. Thanks to Dmitry Kuzmenko.
author Igor Sysoev <http://sysoev.ru>
date Mon, 09 Mar 2009 00:00:00 +0300
parents a8424ffa495c
children bb941a2996a6
comparison
equal deleted inserted replaced
455:ead634c4b006 456:ca8f7f6cab16
243 243
244 244
245 struct ngx_http_server_name_s { 245 struct ngx_http_server_name_s {
246 #if (NGX_PCRE) 246 #if (NGX_PCRE)
247 ngx_regex_t *regex; 247 ngx_regex_t *regex;
248 ngx_uint_t captures; /* unsigned captures:1; */
248 #endif 249 #endif
249 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */ 250 ngx_http_core_srv_conf_t *core_srv_conf; /* virtual name server conf */
250 ngx_str_t name; 251 ngx_str_t name;
251 }; 252 };
252 253
272 struct ngx_http_core_loc_conf_s { 273 struct ngx_http_core_loc_conf_s {
273 ngx_str_t name; /* location name */ 274 ngx_str_t name; /* location name */
274 275
275 #if (NGX_PCRE) 276 #if (NGX_PCRE)
276 ngx_regex_t *regex; 277 ngx_regex_t *regex;
278
279 unsigned captures:1;
277 #endif 280 #endif
278 281
279 unsigned noname:1; /* "if () {}" block or limit_except */ 282 unsigned noname:1; /* "if () {}" block or limit_except */
280 unsigned named:1; 283 unsigned named:1;
281 284
287 #if (NGX_HTTP_GZIP) 290 #if (NGX_HTTP_GZIP)
288 unsigned gzip_disable_msie6:2; 291 unsigned gzip_disable_msie6:2;
289 #endif 292 #endif
290 293
291 ngx_http_location_tree_node_t *static_locations; 294 ngx_http_location_tree_node_t *static_locations;
295 #if (NGX_PCRE)
292 ngx_http_core_loc_conf_t **regex_locations; 296 ngx_http_core_loc_conf_t **regex_locations;
297 #endif
293 298
294 /* pointer to the modules' loc_conf */ 299 /* pointer to the modules' loc_conf */
295 void **loc_conf; 300 void **loc_conf;
296 301
297 uint32_t limit_except; 302 uint32_t limit_except;