Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_core_module.h @ 324:f7cd062ee035 NGINX_0_6_6
nginx 0.6.6
*) Feature: the --sysconfdir=PATH option in configure.
*) Feature: named locations.
*) Feature: the $args variable can be set with the "set" directive.
*) Feature: the $is_args variable.
*) Bugfix: fair big weight upstream balancer.
*) Bugfix: if a client has closed connection to mail proxy then nginx
might not close connection to backend.
*) Bugfix: if the same host without specified port was used as backend
for HTTP and HTTPS, then nginx used only one port - 80 or 443.
*) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early
versions; bug appeared in 0.6.4.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 30 Jul 2007 00:00:00 +0400 |
| parents | 429900ca25ee |
| children | 9fc4ab6673f9 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -79,6 +79,7 @@ struct ngx_http_phase_handler_s { typedef struct { ngx_http_phase_handler_t *handlers; ngx_uint_t server_rewrite_index; + ngx_uint_t location_rewrite_index; } ngx_http_phase_engine_t; @@ -117,7 +118,8 @@ typedef struct { */ ngx_array_t locations; - unsigned regex_start:16; + unsigned regex_start:15; + unsigned named_start:15; unsigned wildcard:1; /* array of the ngx_http_listen_t, "listen" directive */ @@ -212,9 +214,10 @@ struct ngx_http_core_loc_conf_s { ngx_regex_t *regex; #endif - unsigned regex_start:16; + unsigned regex_start:15; - unsigned noname:1; /* "if () {}" block */ + unsigned noname:1; /* "if () {}" block or limit_except */ + unsigned named:1; unsigned exact_match:1; unsigned noregex:1; @@ -314,6 +317,8 @@ ngx_int_t ngx_http_subrequest(ngx_http_r ngx_http_post_subrequest_t *psr, ngx_uint_t flags); ngx_int_t ngx_http_internal_redirect(ngx_http_request_t *r, ngx_str_t *uri, ngx_str_t *args); +ngx_int_t ngx_http_named_location(ngx_http_request_t *r, ngx_str_t *name); + ngx_http_cleanup_t *ngx_http_cleanup_add(ngx_http_request_t *r, size_t size);