diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-23 13:29:41 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-03-23 13:29:41 +0000 |
| commit | e729b9875df37eb1b9ab8bbb62aa84a48d1e0f04 (patch) | |
| tree | 88d06e6e5efb53995d6553f84f203e4e494df0ce /src/http/ngx_http.h | |
| parent | edb4d121199e5911d3c39a25ea36f63fa8dcf6a9 (diff) | |
| download | nginx-e729b9875df37eb1b9ab8bbb62aa84a48d1e0f04.tar.gz | |
Changes with nginx 0.7.44 23 Mar 2009v0.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.
Diffstat (limited to 'src/http/ngx_http.h')
| -rw-r--r-- | src/http/ngx_http.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index cac2a9c3c..89de976df 100644 --- 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_pt)(ngx_http_request_t *r, 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_core_module.h> #include <ngx_http_script.h> +#include <ngx_http_core_module.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_lines(ngx_array_t *headers, 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); |