From 02025fd6bdfa997f521c3b26a08aeba366308e84 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 18 Jan 2005 13:03:58 +0000 Subject: nginx-0.1.14-RELEASE import *) Feature: the autoconfiguration directives: --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and --http-fastcgi-temp-path=PATH *) Change: the directory name for the temporary files with the client request body is specified by directive client_body_temp_path, by default it is /client_body_temp. *) Feature: the ngx_http_fastcgi_module and the directives: fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params, fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout, fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers, fastcgi_busy_buffers_size, fastcgi_temp_path, fastcgi_max_temp_file_size, fastcgi_temp_file_write_size, fastcgi_next_upstream, and fastcgi_x_powered_by. *) Bugfix: the "[alert] zero size buf" error; the bug had appeared in 0.1.3. *) Change: the URI must be specified after the host name in the proxy_pass directive. *) Change: the %3F symbol in the URI was considered as the argument string start. *) Feature: the unix domain sockets support in the ngx_http_proxy_module. *) Feature: the ssl_engine and ssl_ciphers directives. Thanks to Sergey Skvortsov for SSL-accelerator. --- src/http/ngx_http.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/http/ngx_http.h') diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index 42550aa22..9425e3b36 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -13,6 +13,7 @@ #include typedef struct ngx_http_request_s ngx_http_request_t; +typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t; typedef struct ngx_http_cleanup_s ngx_http_cleanup_t; typedef struct ngx_http_in_addr_s ngx_http_in_addr_t; @@ -22,6 +23,7 @@ typedef struct ngx_http_in_addr_s ngx_http_in_addr_t; /* STUB */ #include +#include #include #include #include @@ -33,8 +35,8 @@ typedef struct ngx_http_in_addr_s ngx_http_in_addr_t; #endif -typedef struct { - u_int connection; +struct ngx_http_log_ctx_s { + ngx_uint_t connection; /* * we declare "action" as "char *" because the actions are usually @@ -45,18 +47,23 @@ typedef struct { char *action; ngx_str_t *client; ngx_http_request_t *request; -} ngx_http_log_ctx_t; +}; #define ngx_http_get_module_ctx(r, module) r->ctx[module.ctx_index] #define ngx_http_get_module_err_ctx(r, module) \ (r->err_ctx ? r->err_ctx[module.ctx_index] : r->ctx[module.ctx_index]) +/* STUB */ #define ngx_http_create_ctx(r, cx, module, size, error) \ do { \ ngx_test_null(cx, ngx_pcalloc(r->pool, size), error); \ r->ctx[module.ctx_index] = cx; \ } while (0) +/**/ + +#define ngx_http_set_ctx(r, c, module) \ + r->ctx[module.ctx_index] = c; #define ngx_http_delete_ctx(r, module) \ r->ctx[module.ctx_index] = NULL; @@ -80,7 +87,8 @@ void ngx_http_close_request(ngx_http_request_t *r, int error); void ngx_http_close_connection(ngx_connection_t *c); -ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r); +ngx_int_t ngx_http_read_client_request_body(ngx_http_request_t *r, + ngx_http_client_body_handler_pt post_handler); ngx_int_t ngx_http_send_header(ngx_http_request_t *r); ngx_int_t ngx_http_special_response_handler(ngx_http_request_t *r, int error); -- cgit