nginx-0.3.6-RELEASE importrelease-0.3.6

    *) Change: now the IMAP/POP3 proxy do not send the empty login to
       authorization server.

    *) Feature: the "log_format" supports the variables in the $name form.

    *) Bugfix: if at least in one server was no the "listen" directive,
       then nginx did not listen on the 80 port; the bug had appeared in
       0.3.3.

    *) Bugfix: if the URI part is omitted in "proxy_pass" directive, the
       the 80 port was always used.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 8dbf0bac1..40a328c32 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -125,7 +125,7 @@ typedef struct {
 typedef struct {
     ngx_str_t                         name;
     ngx_uint_t                        offset;
-} ngx_http_header0_t;
+} ngx_http_header_out_t;
 
 
 typedef struct {
@@ -238,6 +238,17 @@ typedef struct {
 } ngx_http_connection_t;
 
 
+typedef void (*ngx_http_cleanup_pt)(void *data);
+
+typedef struct ngx_http_cleanup_s  ngx_http_cleanup_t;
+
+struct ngx_http_cleanup_s {
+    ngx_http_cleanup_pt   handler;
+    void                 *data;
+    ngx_http_cleanup_t   *next;
+};
+
+
 typedef struct ngx_http_postponed_request_s  ngx_http_postponed_request_t;
 
 struct ngx_http_postponed_request_s {
@@ -325,6 +336,8 @@ struct ngx_http_request_s {
 
     ngx_http_log_handler_pt           log_handler;
 
+    ngx_http_cleanup_t               *cleanup;
+
     unsigned                          http_state:4;
 
     /* URI with "/." and on Win32 with "//" */
@@ -401,8 +414,8 @@ struct ngx_http_request_s {
 };
 
 
-extern ngx_http_header_t   ngx_http_headers_in[];
-extern ngx_http_header0_t   ngx_http_headers_out[];
+extern ngx_http_header_t       ngx_http_headers_in[];
+extern ngx_http_header_out_t   ngx_http_headers_out[];
 
 
 #endif /* _NGX_HTTP_REQUEST_H_INCLUDED_ */