Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http.h @ 464:c8cfb6c462ef NGINX_0_7_44
nginx 0.7.44
*) Feature: the ngx_http_proxy_module preliminary cache support.
*) Feature: the --with-pcre option in the configure.
*) Feature: the "try_files" directive is now allowed on the server
block level.
*) Bugfix: the "try_files" directive handled incorrectly a query string
in a fallback parameter.
*) Bugfix: the "try_files" directive might test incorrectly directories.
*) Bugfix: if there is the single server for given address:port pair,
then captures in regular expressions in a "server_name" directive
did not work.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 23 Mar 2009 00:00:00 +0300 |
parents | fd759445d8a8 |
children | ed5e10fb40fc |
line wrap: on
line diff
--- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -10,12 +10,13 @@ #include <ngx_config.h> #include <ngx_core.h> -#include <ngx_garbage_collector.h> -typedef struct ngx_http_request_s ngx_http_request_t; -typedef struct ngx_http_upstream_s ngx_http_upstream_t; -typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t; +typedef struct ngx_http_request_s ngx_http_request_t; +typedef struct ngx_http_upstream_s ngx_http_upstream_t; +typedef struct ngx_http_cache_s ngx_http_cache_t; +typedef struct ngx_http_file_cache_s ngx_http_file_cache_t; +typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t; typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r, ngx_table_elt_t *h, ngx_uint_t offset); @@ -23,21 +24,18 @@ typedef u_char *(*ngx_http_log_handler_p ngx_http_request_t *sr, u_char *buf, size_t len); -#if (NGX_HTTP_CACHE) -#include <ngx_http_cache.h> -#endif -/* STUB */ -#include <ngx_http_cache.h> - #include <ngx_http_variables.h> #include <ngx_http_request.h> #include <ngx_http_upstream.h> #include <ngx_http_upstream_round_robin.h> #include <ngx_http_config.h> #include <ngx_http_busy_lock.h> +#include <ngx_http_script.h> #include <ngx_http_core_module.h> -#include <ngx_http_script.h> +#if (NGX_HTTP_CACHE) +#include <ngx_http_cache.h> +#endif #if (NGX_HTTP_SSI) #include <ngx_http_ssi_filter_module.h> #endif @@ -78,6 +76,8 @@ ngx_int_t ngx_http_parse_multi_header_li ngx_str_t *name, ngx_str_t *value); ngx_int_t ngx_http_arg(ngx_http_request_t *r, u_char *name, size_t len, ngx_str_t *value); +void ngx_http_split_args(ngx_http_request_t *r, ngx_str_t *uri, + ngx_str_t *args); ngx_int_t ngx_http_find_server_conf(ngx_http_request_t *r);