comparison src/http/ngx_http_core_module.h @ 1395:bf5b86d5f00e stable-0.5

r1354 merge: named location
author Igor Sysoev <igor@sysoev.ru>
date Tue, 14 Aug 2007 20:02:09 +0000
parents 5e4d3b5d7ad0
children 9b10ba85b249
comparison
equal deleted inserted replaced
1384:6485121a080d 1395:bf5b86d5f00e
77 77
78 78
79 typedef struct { 79 typedef struct {
80 ngx_http_phase_handler_t *handlers; 80 ngx_http_phase_handler_t *handlers;
81 ngx_uint_t server_rewrite_index; 81 ngx_uint_t server_rewrite_index;
82 ngx_uint_t location_rewrite_index;
82 } ngx_http_phase_engine_t; 83 } ngx_http_phase_engine_t;
83 84
84 85
85 typedef struct { 86 typedef struct {
86 ngx_array_t handlers; 87 ngx_array_t handlers;
115 * array of the ngx_http_core_loc_conf_t *, 116 * array of the ngx_http_core_loc_conf_t *,
116 * used in the ngx_http_core_find_location() and in the merge phase 117 * used in the ngx_http_core_find_location() and in the merge phase
117 */ 118 */
118 ngx_array_t locations; 119 ngx_array_t locations;
119 120
120 unsigned regex_start:16; 121 unsigned regex_start:15;
122 unsigned named_start:15;
121 unsigned wildcard:1; 123 unsigned wildcard:1;
122 124
123 /* array of the ngx_http_listen_t, "listen" directive */ 125 /* array of the ngx_http_listen_t, "listen" directive */
124 ngx_array_t listen; 126 ngx_array_t listen;
125 127
209 211
210 #if (NGX_PCRE) 212 #if (NGX_PCRE)
211 ngx_regex_t *regex; 213 ngx_regex_t *regex;
212 #endif 214 #endif
213 215
214 unsigned regex_start:16; 216 unsigned regex_start:15;
215 217
216 unsigned noname:1; /* "if () {}" block */ 218 unsigned noname:1; /* "if () {}" block or limit_except */
219 unsigned named:1;
217 220
218 unsigned exact_match:1; 221 unsigned exact_match:1;
219 unsigned noregex:1; 222 unsigned noregex:1;
220 223
221 unsigned auto_redirect:1; 224 unsigned auto_redirect:1;
311 ngx_int_t ngx_http_subrequest(ngx_http_request_t *r, 314 ngx_int_t ngx_http_subrequest(ngx_http_request_t *r,
312 ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **sr, 315 ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **sr,
313 ngx_http_post_subrequest_t *psr, ngx_uint_t flags); 316 ngx_http_post_subrequest_t *psr, ngx_uint_t flags);
314 ngx_int_t ngx_http_internal_redirect(ngx_http_request_t *r, 317 ngx_int_t ngx_http_internal_redirect(ngx_http_request_t *r,
315 ngx_str_t *uri, ngx_str_t *args); 318 ngx_str_t *uri, ngx_str_t *args);
319 ngx_int_t ngx_http_named_location(ngx_http_request_t *r, ngx_str_t *name);
320
316 321
317 ngx_http_cleanup_t *ngx_http_cleanup_add(ngx_http_request_t *r, size_t size); 322 ngx_http_cleanup_t *ngx_http_cleanup_add(ngx_http_request_t *r, size_t size);
318 323
319 324
320 typedef ngx_int_t (*ngx_http_output_header_filter_pt)(ngx_http_request_t *r); 325 typedef ngx_int_t (*ngx_http_output_header_filter_pt)(ngx_http_request_t *r);