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.

22 files changed, 360 insertions, 206 deletions

diff --git a/auto/sources b/auto/sources
index bd9259a51..c4aec701c 100644
--- a/auto/sources
+++ b/auto/sources
@@ -262,7 +262,7 @@ HTTP_DEPS="src/http/ngx_http.h \
            src/http/ngx_http_script.h \
            src/http/ngx_http_upstream.h \
            src/http/ngx_http_busy_lock.h \
-           src/http/ngx_http_log_module.h"
+           src/http/modules/ngx_http_log_module.h"
 
 HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_core_module.c \
@@ -272,7 +272,7 @@ HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_header_filter_module.c \
            src/http/ngx_http_write_filter_module.c \
            src/http/ngx_http_copy_filter_module.c \
-           src/http/ngx_http_log_module.c \
+           src/http/modules/ngx_http_log_module.c \
            src/http/ngx_http_request_body.c \
            src/http/ngx_http_variables.c \
            src/http/ngx_http_script.c \
diff --git a/auto/threads b/auto/threads
index d72614b21..2bf85b65f 100644
--- a/auto/threads
+++ b/auto/threads
@@ -50,7 +50,7 @@ case $USE_THREADS in
                 CORE_LIBS="$CORE_LIBS -pthread"
             ;;
 
-            FreeBSD:5*)
+            FreeBSD:[567]*)
                 have=NGX_THREADS . auto/have
                 CORE_SRCS="$CORE_SRCS $PTHREAD_SRCS"
                 CORE_LIBS="$CORE_LIBS -lc_r"
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 542fda2d3..8d65445eb 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -34,6 +34,12 @@ http {
             index  index.html index.htm;
         }
 
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
         # deny access to .htaccess files
         #
         #location ~ /\.ht {
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index 8f0abd6b8..99134ef45 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,52 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.3.6" date="24.10.2005">
+
+<change type="change">
+<para lang="ru">
+IMAP/POP3 ÐÒÏËÓÉ ÔÅÐÅÒØ ÎÅ ÐÅÒÅÄÁ£Ô ÓÅÒ×ÅÒÕ Á×ÔÏÒÉÚÁÃÉÉ ÐÕÓÔÏÊ ÌÏÇÉÎ.
+</para>
+<para lang="en">
+now the IMAP/POP3 proxy do not send the empty login to authorization server.
+</para>
+</change>
+
+<change type="feature">
+<para lang="ru">
+ÄÉÒÅËÔÉ×Á log_format ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÅÒÅÍÅÎÎÙÅ × ×ÉÄÅ $name.
+</para>
+<para lang="en">
+the "log_format" supports the variables in the $name form.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ ÈÏÔÑ ÂÙ × ÏÄÎÏÍ ÓÅÒ×ÅÒÅ ÎÅ ÂÙÌÏ ÏÐÉÓÁÎÏ ÎÉ ÏÄÎÏÊ ÄÉÒÅËÔÉ×Ù listen, ÔÏ
+nginx ÎÅ ÓÌÕÛÁÌ ÎÁ 80 ÐÏÒÔÕ;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.3.3.
+</para>
+<para lang="en">
+if at least in one server was no the "listen" directive, then nginx did not
+listen on the 80 port;
+bug appeared in 0.3.3.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÅÓÌÉ × ÄÉÒÅËÔÉ×Å proxy_pass ÏÔÓÕÔÓÔ×Ï×ÁÌ URI, ÔÏ ×ÓÅÇÄÁ ÉÓÐÏÌØÚÏ×ÁÌÓÑ ÐÏÒÔ 80.
+</para>
+<para lang="en">
+if the URI part is omitted in "proxy_pass" directive, the the 80 port was
+always used.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.3.5" date="21.10.2005">
 
 <change type="bugfix">
@@ -449,7 +495,7 @@ bug appeared in 0.2.2.
 
 <change type="feature">
 <para lang="ru">
-ËÏÍÁÎÄÁ config errmsg × ÍÏÄÕÌÅ ngx_http_sssi_module.
+ËÏÍÁÎÄÁ config errmsg × ÍÏÄÕÌÅ ngx_http_ssi_module.
 </para>
 <para lang="en">
 the "config errmsg" command of the ngx_http_ssi_module.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 879c25fb8..5a3593d35 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.5"
+#define NGINX_VER          "nginx/0.3.6"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index 94f816bff..2e3466954 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -367,9 +367,8 @@ ngx_configure_listening_socket(ngx_cycle_t *cycle)
                 == -1)
             {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-                              "setsockopt(SO_RCVBUF) %V failed, ignored",
-                              &ls[i].addr_text);
-                return;
+                              "setsockopt(SO_RCVBUF, %d) %V failed, ignored",
+                              ls[i].rcvbuf, &ls[i].addr_text);
             }
         }
 
@@ -379,9 +378,8 @@ ngx_configure_listening_socket(ngx_cycle_t *cycle)
                 == -1)
             {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
-                              "setsockopt(SO_SNDBUF) %V failed, ignored",
-                              &ls[i].addr_text);
-                return;
+                              "setsockopt(SO_SNDBUF, %d) %V failed, ignored",
+                              ls[i].sndbuf, &ls[i].addr_text);
             }
         }
 
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index 60a40eca4..4be55fdb5 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -452,7 +452,23 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
         }
     }
 
-    if (u->port_text.data == NULL) {
+    if (u->port_text.data) {
+
+        if (u->port_text.len == 0) {
+            u->port_text.len = &url->data[i] - u->port_text.data;
+
+            if (u->port_text.len == 0) {
+                return "invalid port";
+            }
+        }
+
+        port = ngx_atoi(u->port_text.data, u->port_text.len);
+
+        if (port == NGX_ERROR || port < 1 || port > 65536) {
+            return "invalid port";
+        }
+
+    } else {
         port = ngx_atoi(url->data, url->len);
 
         if (port == NGX_ERROR) {
@@ -464,18 +480,6 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u)
 
         u->port_text = *url;
         u->wildcard = 1;
-
-    } else {
-        if (u->port_text.len == 0) {
-            u->default_port = 1;
-            return NULL;
-        }
-
-        port = ngx_atoi(u->port_text.data, u->port_text.len);
-
-        if (port == NGX_ERROR || port < 1 || port > 65536) {
-            return "invalid port";
-        }
     }
 
     u->port = (in_port_t) port;
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index 1e7229114..03d956d5d 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -212,12 +212,12 @@ ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
 
         last = ctx->output_filter(ctx->filter_ctx, out);
 
-        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
-        last_out = &out;
-
-        if (last == NGX_ERROR) {
+        if (last == NGX_ERROR || last == NGX_DONE) {
             return last;
         }
+
+        ngx_chain_update_chains(&ctx->free, &ctx->busy, &out, ctx->tag);
+        last_out = &out;
     }
 }
 
diff --git a/src/http/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 617d46a7f..6e7772e56 100644
--- a/src/http/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -83,6 +83,7 @@ static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
+static ngx_int_t ngx_http_log_init(ngx_cycle_t *cycle);
 
 
 static ngx_command_t  ngx_http_log_commands[] = {
@@ -126,7 +127,7 @@ ngx_module_t  ngx_http_log_module = {
     ngx_http_log_commands,                 /* module directives */
     NGX_HTTP_MODULE,                       /* module type */
     NULL,                                  /* init master */
-    NULL,                                  /* init module */
+    ngx_http_log_init,                     /* init module */
     NULL,                                  /* init process */
     NULL,                                  /* init thread */
     NULL,                                  /* exit thread */
@@ -140,8 +141,14 @@ static ngx_str_t http_access_log = ngx_string(NGX_HTTP_LOG_PATH);
 
 
 static ngx_str_t ngx_http_combined_fmt =
-    ngx_string("%addr - - [%time] \"%request\" %status %apache_length "
-               "\"%{Referer}i\" \"%{User-Agent}i\"");
+#if 0
+    ngx_string("$remote_addr - $remote_user [%time] "
+               "\"$request\" %status %apache_length "
+               "\"$http_referer\" \"$http_user_agent\"");
+#endif
+    ngx_string("%addr - - [%time] "
+               "\"%request\" %status %apache_length "
+               "\"%{referer}i\" \"%{user-agent}i\"");
 
 
 ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = {
@@ -824,7 +831,7 @@ ngx_http_log_create_main_conf(ngx_conf_t *cf)
     }
 
     if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t))
-                                                                  == NGX_ERROR)
+        == NGX_ERROR)
     {
         return NGX_CONF_ERROR;
     }
@@ -836,6 +843,9 @@ ngx_http_log_create_main_conf(ngx_conf_t *cf)
         return NGX_CONF_ERROR;
     }
 
+    value->len = 0;
+    value->data = NULL;
+
     value = ngx_array_push(cf->args);
     if (value == NULL) {
         return NGX_CONF_ERROR;
@@ -853,7 +863,7 @@ ngx_http_log_create_main_conf(ngx_conf_t *cf)
 
     rc = ngx_http_log_set_format(cf, NULL, conf);
     if (rc != NGX_CONF_OK) {
-        return NULL;
+        return NGX_CONF_ERROR;
     }
 
     return conf;
@@ -993,10 +1003,10 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_log_main_conf_t *lmcf = conf;
 
-    ngx_uint_t                  s, f, invalid;
-    u_char                     *data, *p, *fname;
+    u_char                     *data, *p, *fname, ch;
     size_t                      i, len, fname_len;
-    ngx_str_t                  *value, arg, *a;
+    ngx_str_t                  *value, var, arg, *a;
+    ngx_uint_t                  s, f, bracket;
     ngx_http_log_op_t          *op;
     ngx_http_log_fmt_t         *fmt;
     ngx_http_log_op_name_t     *name;
@@ -1024,11 +1034,9 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         return NGX_CONF_ERROR;
     }
 
-    invalid = 0;
-    data = NULL;
     arg.data = NULL;
 
-    for (s = 2; s < cf->args->nelts && !invalid; s++) {
+    for (s = 2; s < cf->args->nelts; s++) {
 
         i = 0;
 
@@ -1045,8 +1053,7 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 i++;
 
                 if (i == value[s].len) {
-                    invalid = 1;
-                    break;
+                    goto invalid;
                 }
 
                 if (value[s].data[i] == '{') {
@@ -1061,8 +1068,7 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                     arg.len = &value[s].data[i] - arg.data;
 
                     if (i == value[s].len || arg.len == 0) {
-                        invalid = 1;
-                        break;
+                        goto invalid;
                     }
 
                     i++;
@@ -1083,8 +1089,7 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 fname_len = &value[s].data[i] - fname;
 
                 if (fname_len == 0) {
-                    invalid = 1;
-                    break;
+                    goto invalid;
                 }
 
                 for (name = ngx_http_log_fmt_ops; name->run; name++) {
@@ -1135,14 +1140,71 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                 }
 
                 if (name->name.len == 0) {
-                    invalid = 1;
+                    goto invalid;
+                }
+
+            } else if (value[s].data[i] == '$') {
+
+                if (++i == value[s].len) {
+                    goto invalid;
+                }
+
+                if (value[s].data[i] == '{') {
+                    bracket = 1;
+
+                    if (++i == value[s].len) {
+                        goto invalid;
+                    }
+
+                    var.data = &value[s].data[i];
+
+                } else {
+                    bracket = 0;
+                    var.data = &value[s].data[i];
+                }
+
+                for (var.len = 0; i < value[s].len; i++, var.len++) {
+                    ch = value[s].data[i];
+
+                    if (ch == '}' && bracket) {
+                        i++;
+                        bracket = 0;
+                        break;
+                    }
+
+                    if ((ch >= 'A' && ch <= 'Z')
+                        || (ch >= 'a' && ch <= 'z')
+                        || (ch >= '0' && ch <= '9')
+                        || ch == '_')
+                    {
+                        continue;
+                    }
+
                     break;
                 }
 
+                if (bracket) {
+                    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                                       "the closing bracket in \"%V\" "
+                                       "variable is missing", &var);
+                    return NGX_CONF_ERROR;
+                }
+
+                if (var.len == 0) {
+                    goto invalid;
+                }
+
+                if (ngx_http_log_variable_compile(cf, op, &var) != NGX_OK) {
+                    return NGX_CONF_ERROR;
+                }
+
             } else {
                 i++;
 
-                while (i < value[s].len && value[s].data[i] != '%') {
+                while (i < value[s].len
+                       && value[s].data[i] != '$'
+                       && value[s].data[i] != '%')
+                {
                     i++;
                 }
 
@@ -1178,11 +1240,24 @@ ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         }
     }
 
-    if (invalid) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid parameter \"%s\"", data);
-        return NGX_CONF_ERROR;
-    }
-
     return NGX_CONF_OK;
+
+invalid:
+
+    ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data);
+
+    return NGX_CONF_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_log_init(ngx_cycle_t *cycle)
+{
+    ngx_http_core_main_conf_t  *cmcf;
+
+    cmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_core_module);
+
+    cmcf->log_handler = ngx_http_log_handler;
+
+    return NGX_OK;
 }
diff --git a/src/http/ngx_http_log_module.h b/src/http/modules/ngx_http_log_module.h
index c414bc4ac..c414bc4ac 100644
--- a/src/http/ngx_http_log_module.h
+++ b/src/http/modules/ngx_http_log_module.h
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index af82b0e8b..80de6910c 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -229,9 +229,8 @@ ngx_module_t  ngx_http_ssi_filter_module = {
 };
 
 
-static ngx_int_t (*ngx_http_next_header_filter) (ngx_http_request_t *r);
-static ngx_int_t (*ngx_http_next_body_filter) (ngx_http_request_t *r,
-    ngx_chain_t *in);
+static ngx_http_output_header_filter_pt  ngx_http_next_header_filter;
+static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
 
 static u_char ngx_http_ssi_string[] = "<!--";
@@ -407,6 +406,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_buf_t               *b;
     ngx_chain_t             *cl;
     ngx_table_elt_t         *param;
+    ngx_connection_t        *c;
     ngx_http_ssi_ctx_t      *ctx;
     ngx_http_ssi_conf_t     *conf;
     ngx_http_ssi_param_t    *prm;
@@ -650,7 +650,15 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                     }
                 }
 
-                if (cmd->handler(r, ctx, params) == NGX_OK) {
+                c = r->connection;
+
+                rc = cmd->handler(r, ctx, params);
+
+                if (c->closed) {
+                    return NGX_DONE;
+                }
+
+                if (rc == NGX_OK) {
                     continue;
                 }
             }
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index 2afdcf670..c251273d2 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -70,21 +70,12 @@ static ngx_http_output_body_filter_pt    ngx_http_next_filter;
 static ngx_int_t
 ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
-    ngx_int_t                     rc;
     ngx_output_chain_ctx_t       *ctx;
     ngx_http_copy_filter_conf_t  *conf;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "copy filter: \"%V\"", &r->uri);
 
-    if (r->connection->closed) {
-        rc = ngx_http_next_filter(r, in);
-
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "copy closed filter: %i \"%V\"", rc, &r->uri);
-        return rc;
-    }
-
     ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
 
     if (ctx == NULL) {
@@ -111,12 +102,9 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     }
 
-    rc = ngx_output_chain(ctx, in);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "copy filter: %i \"%V\"", rc, &r->uri);
+    /* the request pool may be already destroyed after ngx_output_chain()*/
 
-    return rc;
+    return ngx_output_chain(ctx, in);
 }
 
 
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 21224d389..a12a1344d 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1172,8 +1172,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
 
     ngx_http_handler(sr);
 
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http subrequest \"%V\" done", uri);
+    /* the request pool may be already destroyed */
 
     return NGX_OK;
 }
@@ -1231,27 +1230,38 @@ ngx_http_internal_redirect(ngx_http_request_t *r,
 }
 
 
-#if 0       /* STUB: test the delay http handler */
-
-ngx_int_t
-ngx_http_delay_handler(ngx_http_request_t *r)
+ngx_http_cleanup_t *
+ngx_http_cleanup_add(ngx_http_request_t *r, size_t size)
 {
-    static int  on;
+    ngx_http_cleanup_t  *cln;
 
-    if (on++ == 0) {
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "http set delay");
-        ngx_add_timer(r->connection->write, 10000);
-        return NGX_AGAIN;
+    r = r->main;
+
+    cln = ngx_palloc(r->pool, sizeof(ngx_http_cleanup_t));
+    if (cln == NULL) {
+        return NULL;
     }
 
-    r->connection->write->timedout = 0;
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "http reset delay");
-    return NGX_DECLINED;
-}
+    if (size) {
+        cln->data = ngx_palloc(r->pool, size);
+        if (cln->data == NULL) {
+            return NULL;
+        }
 
-#endif
+    } else {
+        cln->data = NULL;
+    }
+
+    cln->handler = NULL;
+    cln->next = r->cleanup;
+
+    r->cleanup = cln;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http cleanup add: %p", cln);
+
+    return cln;
+}
 
 
 static char *
@@ -1665,7 +1675,8 @@ ngx_http_core_create_main_conf(ngx_conf_t *cf)
     }
 
     if (ngx_array_init(&cmcf->servers, cf->pool, 4,
-                       sizeof(ngx_http_core_srv_conf_t *)) == NGX_ERROR)
+                       sizeof(ngx_http_core_srv_conf_t *))
+        == NGX_ERROR)
     {
         return NGX_CONF_ERROR;
     }
@@ -1767,6 +1778,10 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
         ls->port = (getuid() == 0) ? 80 : 8000;
 #endif
         ls->family = AF_INET;
+
+        ls->conf.backlog = -1;
+        ls->conf.rcvbuf = -1;
+        ls->conf.sndbuf = -1;
     }
 
     if (conf->server_names.nelts == 0) {
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index cf415efda..598965521 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -65,7 +65,7 @@ typedef struct {
     ngx_array_t                servers;         /* ngx_http_core_srv_conf_t */
 
     ngx_http_phase_t           phases[NGX_HTTP_LAST_PHASE];
-    ngx_array_t                index_handlers;
+    ngx_http_handler_pt        log_handler;
 
     ngx_hash_t                 headers_in_hash;
     ngx_hash_t                 variables_hash;
@@ -264,6 +264,8 @@ ngx_int_t ngx_http_subrequest(ngx_http_request_t *r,
 ngx_int_t ngx_http_internal_redirect(ngx_http_request_t *r,
     ngx_str_t *uri, ngx_str_t *args);
 
+ngx_http_cleanup_t *ngx_http_cleanup_add(ngx_http_request_t *r, size_t size);
+
 
 typedef ngx_int_t (*ngx_http_output_header_filter_pt)(ngx_http_request_t *r);
 typedef ngx_int_t (*ngx_http_output_body_filter_pt)
diff --git a/src/http/ngx_http_header_filter_module.c b/src/http/ngx_http_header_filter_module.c
index db4179091..253fc0674 100644
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -122,7 +122,7 @@ static ngx_str_t ngx_http_status_lines[] = {
 };
 
 
-ngx_http_header0_t  ngx_http_headers_out[] = {
+ngx_http_header_out_t  ngx_http_headers_out[] = {
     { ngx_string("Server"), offsetof(ngx_http_headers_out_t, server) },
     { ngx_string("Date"), offsetof(ngx_http_headers_out_t, date) },
 #if 0
diff --git a/src/http/ngx_http_postpone_filter_module.c b/src/http/ngx_http_postpone_filter_module.c
index e75e74ffc..9c56f4669 100644
--- a/src/http/ngx_http_postpone_filter_module.c
+++ b/src/http/ngx_http_postpone_filter_module.c
@@ -56,15 +56,6 @@ ngx_http_postpone_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http postpone filter \"%V\" %p", &r->uri, in);
 
-    if (r->connection->closed) {
-
-        if (r->postponed) {
-            r->postponed = r->postponed->next;
-        }
-
-        return NGX_ERROR;
-    }
-
     if (r != r->connection->data || (r->postponed && in)) {
 
         if (r->postponed) {
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 58f13c449..82f69c8d0 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -41,6 +41,7 @@ static void ngx_http_keepalive_handler(ngx_event_t *ev);
 static void ngx_http_set_lingering_close(ngx_http_request_t *r);
 static void ngx_http_lingering_close_handler(ngx_event_t *ev);
 static void ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error);
+static void ngx_http_request_done(ngx_http_request_t *r, ngx_int_t error);
 static void ngx_http_close_connection(ngx_connection_t *c);
 
 static u_char *ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len);
@@ -156,8 +157,7 @@ ngx_http_init_connection(ngx_connection_t *c)
 
     rev = c->read;
     rev->handler = ngx_http_init_request;
-
-    /* STUB: epoll edge */ c->write->handler = ngx_http_empty_handler;
+    c->write->handler = ngx_http_empty_handler;
 
 #if (NGX_STAT_STUB)
     ngx_atomic_fetch_add(ngx_stat_reading, 1);
@@ -374,7 +374,6 @@ void ngx_http_init_request(ngx_event_t *rev)
                       sizeof(ngx_table_elt_t)) == NGX_ERROR)
     {
         ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -382,7 +381,6 @@ void ngx_http_init_request(ngx_event_t *rev)
     r->ctx = ngx_pcalloc(r->pool, sizeof(void *) * ngx_http_max_module);
     if (r->ctx == NULL) {
         ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -435,7 +433,6 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
         ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
         c->timedout = 1;
         ngx_http_close_request(r, NGX_HTTP_REQUEST_TIME_OUT);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -502,7 +499,6 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
     r = c->data;
 
     ngx_http_close_request(r, NGX_HTTP_BAD_REQUEST);
-    ngx_http_close_connection(r->connection);
 
     return;
 }
@@ -530,7 +526,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
         ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
         c->timedout = 1;
         ngx_http_close_request(r, NGX_HTTP_REQUEST_TIME_OUT);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -568,7 +563,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
                 r->uri.data = ngx_palloc(r->pool, r->uri.len + 1);
                 if (r->uri.data == NULL) {
                     ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    ngx_http_close_connection(c);
                     return;
                 }
 
@@ -655,7 +649,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
                                          sizeof(ngx_table_elt_t)) == NGX_ERROR)
             {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                ngx_http_close_connection(c);
                 return;
             }
 
@@ -664,7 +657,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
                                        sizeof(ngx_table_elt_t *)) == NGX_ERROR)
             {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                ngx_http_close_connection(c);
                 return;
             }
 
@@ -694,7 +686,6 @@ ngx_http_process_request_line(ngx_event_t *rev)
 
             if (rv == NGX_ERROR) {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                ngx_http_close_connection(c);
                 return;
             }
 
@@ -739,7 +730,6 @@ ngx_http_process_request_headers(ngx_event_t *rev)
         ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
         c->timedout = 1;
         ngx_http_close_request(r, NGX_HTTP_REQUEST_TIME_OUT);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -759,7 +749,6 @@ ngx_http_process_request_headers(ngx_event_t *rev)
 
                 if (rv == NGX_ERROR) {
                     ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                    ngx_http_close_connection(c);
                     return;
                 }
 
@@ -778,7 +767,6 @@ ngx_http_process_request_headers(ngx_event_t *rev)
                                   "client sent too long header line: \"%V\"",
                                   &header);
                     ngx_http_close_request(r, NGX_HTTP_BAD_REQUEST);
-                    ngx_http_close_connection(c);
                     return;
                 }
             }
@@ -812,7 +800,6 @@ ngx_http_process_request_headers(ngx_event_t *rev)
             h = ngx_list_push(&r->headers_in.headers);
             if (h == NULL) {
                 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-                ngx_http_close_connection(c);
                 return;
             }
 
@@ -895,7 +882,6 @@ ngx_http_process_request_headers(ngx_event_t *rev)
                       "client sent invalid header line: \"%V\\r...\"",
                       &header);
         ngx_http_close_request(r, NGX_HTTP_BAD_REQUEST);
-        ngx_http_close_connection(c);
         return;
     }
 }
@@ -932,7 +918,6 @@ ngx_http_read_request_header(ngx_http_request_t *r)
 
         if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
             ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-            ngx_http_close_connection(r->connection);
             return NGX_ERROR;
         }
 
@@ -946,7 +931,6 @@ ngx_http_read_request_header(ngx_http_request_t *r)
 
     if (n == 0 || n == NGX_ERROR) {
         ngx_http_close_request(r, NGX_HTTP_BAD_REQUEST);
-        ngx_http_close_connection(r->connection);
         return NGX_ERROR;
     }
 
@@ -1152,7 +1136,6 @@ ngx_http_process_cookie(ngx_http_request_t *r, ngx_table_elt_t *h,
     }
 
     ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
-    ngx_http_close_connection(r->connection);
 
     return NGX_ERROR;
 }
@@ -1190,7 +1173,6 @@ ngx_http_process_request_header(ngx_http_request_t *r)
 
             if (cscf->restrict_host_names == NGX_HTTP_RESTRICT_HOST_CLOSE) {
                 ngx_http_close_request(r, NGX_HTTP_BAD_REQUEST);
-                ngx_http_close_connection(r->connection);
                 return NGX_ERROR;
             }
 
@@ -1432,21 +1414,36 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     ngx_http_core_loc_conf_t  *clcf;
 
     if (rc == NGX_DONE) {
-        /* r may be already destroyed when rc == NGX_DONE */
+        /* the request pool may be already destroyed */
         return;
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "http finalize request: %d, \"%V\"", rc, &r->uri);
 
-    if (r->parent
-        && (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_HTTP_NO_CONTENT))
-    {
+    if (rc == NGX_ERROR || r->connection->closed) {
+        ngx_http_close_request(r, 0);
+        return;
+    }
+
+    if (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_HTTP_NO_CONTENT) {
+
+        if (r->main == r) {
+            if (r->connection->read->timer_set) {
+                ngx_del_timer(r->connection->read);
+            }
+
+            if (r->connection->write->timer_set) {
+                ngx_del_timer(r->connection->write);
+            }
+        }
+
         ngx_http_finalize_request(r, ngx_http_special_response_handler(r, rc));
+
         return;
     }
 
-    if (r->parent || rc == NGX_AGAIN) {
+    if (r->main != r || rc == NGX_AGAIN) {
         if (ngx_http_set_write_handler(r) != NGX_OK) {
             return;
         }
@@ -1460,7 +1457,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         return;
     }
 
-    if (r->parent) {
+    if (r->main != r) {
 
         pr = r->parent;
 
@@ -1499,34 +1496,11 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         return;
     }
 
-    if (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_HTTP_NO_CONTENT) {
-
-        if (r->connection->read->timer_set) {
-            ngx_del_timer(r->connection->read);
-        }
-
-        if (r->connection->write->timer_set) {
-            ngx_del_timer(r->connection->write);
-        }
-
-        if (r->connection->closed) {
-            ngx_http_close_request(r, 0);
-            ngx_http_close_connection(r->connection);
-            return;
-        }
-
-        ngx_http_finalize_request(r, ngx_http_special_response_handler(r, rc));
-
-        return;
-    }
-
-    if (rc == NGX_ERROR || r->connection->closed) {
-        ngx_http_close_request(r, 0);
-        ngx_http_close_connection(r->connection);
+    if (rc == NGX_AGAIN) {
         return;
     }
 
-    if (rc == NGX_AGAIN || r->out) {
+    if (r->out) {
         (void) ngx_http_set_write_handler(r);
         return;
     }
@@ -1547,7 +1521,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
                        "kevent() reported about an closed connection");
 #endif
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(r->connection);
         return;
     }
 
@@ -1567,7 +1540,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
     }
 
     ngx_http_close_request(r, 0);
-    ngx_http_close_connection(r->connection);
 }
 
 
@@ -1581,10 +1553,6 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
 
     r->write_event_handler = ngx_http_writer;
 
-    if (r->connection->closed) {
-        return NGX_OK;
-    }
-
     wev = r->connection->write;
 
     if (wev->ready && wev->delayed) {
@@ -1598,7 +1566,6 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
 
     if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) {
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(r->connection);
         return NGX_ERROR;
     }
 
@@ -1626,14 +1593,7 @@ ngx_http_writer(ngx_http_request_t *r)
                           "client timed out");
             c->timedout = 1;
 
-#if 0
-            ngx_http_close_request(r->main, NGX_HTTP_REQUEST_TIME_OUT);
-            ngx_http_close_connection(c);
-#endif
-
-            c->closed = 1;
-            ngx_http_finalize_request(r, 0);
-
+            ngx_http_close_request(r, NGX_HTTP_REQUEST_TIME_OUT);
             return;
         }
 
@@ -1645,8 +1605,7 @@ ngx_http_writer(ngx_http_request_t *r)
             ngx_add_timer(wev, clcf->send_timeout);
 
             if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) {
-                ngx_http_close_request(r->main, 0);
-                ngx_http_close_connection(r->connection);
+                ngx_http_close_request(r, 0);
             }
 
             return;
@@ -1660,8 +1619,7 @@ ngx_http_writer(ngx_http_request_t *r)
             clcf = ngx_http_get_module_loc_conf(r->main, ngx_http_core_module);
 
             if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) {
-                ngx_http_close_request(r->main, 0);
-                ngx_http_close_connection(r->connection);
+                ngx_http_close_request(r, 0);
             }
 
             return;
@@ -1672,7 +1630,7 @@ ngx_http_writer(ngx_http_request_t *r)
         rc = ngx_http_postponed_handler(r);
 
         if (rc == NGX_DONE) {
-            /* r may be already destroyed when rc == NGX_DONE */
+            /* the request pool may be already destroyed */
             return;
         }
 
@@ -1691,8 +1649,7 @@ ngx_http_writer(ngx_http_request_t *r)
         }
 
         if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) {
-            ngx_http_close_request(r->main, 0);
-            ngx_http_close_connection(r->connection);
+            ngx_http_close_request(r, 0);
         }
 
         return;
@@ -1722,13 +1679,18 @@ ngx_http_postponed_handler(ngx_http_request_t *r)
 
         rc = ngx_http_output_filter(r, NULL);
 
+        if (rc == NGX_DONE) {
+            /* the request pool is already destroyed */
+            return NGX_DONE;
+        }
+
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http postponed output filter: %d", rc);
 
-        /*
-         * we treat NGX_ERROR as NGX_OK, because we need to complete
-         * all postponed requests
-         */
+        if (rc == NGX_ERROR) {
+            ngx_http_close_request(r, 0);
+            return NGX_DONE;
+        }
 
         pr = r->postponed;
 
@@ -1769,7 +1731,6 @@ ngx_http_block_read(ngx_http_request_t *r)
             == NGX_ERROR)
         {
             ngx_http_close_request(r, 0);
-            ngx_http_close_connection(r->connection);
         }
     }
 }
@@ -1832,14 +1793,12 @@ ngx_http_read_discarded_body_handler(ngx_http_request_t *r)
     if (rc == NGX_AGAIN) {
         if (ngx_handle_read_event(r->connection->read, 0) == NGX_ERROR) {
             ngx_http_close_request(r, rc);
-            ngx_http_close_connection(r->connection);
             return;
         }
     }
 
     if (rc != NGX_OK) {
         ngx_http_close_request(r, rc);
-        ngx_http_close_connection(r->connection);
     }
 }
 
@@ -1932,7 +1891,6 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
 
                 if (hc->free == NULL) {
                     ngx_http_close_request(r, 0);
-                    ngx_http_close_connection(c);
                     return;
                 }
             }
@@ -1951,7 +1909,8 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-    ngx_http_close_request(r, 0);
+    ngx_http_request_done(r, 0);
+
     c->data = hc;
 
     ngx_add_timer(rev, clcf->keepalive_timeout);
@@ -2221,7 +2180,6 @@ ngx_http_set_lingering_close(ngx_http_request_t *r)
 
     if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -2234,14 +2192,12 @@ ngx_http_set_lingering_close(ngx_http_request_t *r)
                                                                   == NGX_ERROR)
             {
                 ngx_http_close_request(r, 0);
-                ngx_http_close_connection(c);
                 return;
             }
 
         } else if (ngx_event_flags & NGX_USE_LEVEL_EVENT) {
             if (ngx_del_event(wev, NGX_WRITE_EVENT, 0) == NGX_ERROR) {
                 ngx_http_close_request(r, 0);
-                ngx_http_close_connection(c);
                 return;
             }
         }
@@ -2251,7 +2207,6 @@ ngx_http_set_lingering_close(ngx_http_request_t *r)
         ngx_connection_error(c, ngx_socket_errno,
                              ngx_shutdown_socket_n " failed");
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -2279,14 +2234,12 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
 
     if (rev->timedout) {
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(c);
         return;
     }
 
     timer = r->lingering_time - ngx_time();
     if (timer <= 0) {
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -2297,7 +2250,6 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
 
         if (n == NGX_ERROR || n == 0) {
             ngx_http_close_request(r, 0);
-            ngx_http_close_connection(c);
             return;
         }
 
@@ -2305,7 +2257,6 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
 
     if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
         ngx_http_close_request(r, 0);
-        ngx_http_close_connection(c);
         return;
     }
 
@@ -2362,10 +2313,31 @@ ngx_http_send_last(ngx_http_request_t *r)
 void
 ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error)
 {
-    ngx_log_t                 *log;
-    struct linger              linger;
-    ngx_http_log_ctx_t        *ctx;
-    ngx_http_core_loc_conf_t  *clcf;
+    ngx_connection_t    *c;
+    ngx_http_cleanup_t  *cln;
+
+    c = r->connection;
+    r = r->main;
+
+    for (cln = r->cleanup; cln; cln = cln->next) {
+        if (cln->handler) {
+            cln->handler(cln->data);
+        }
+    }
+
+    ngx_http_request_done(r, error);
+    ngx_http_close_connection(c);
+}
+
+
+void
+ngx_http_request_done(ngx_http_request_t *r, ngx_int_t error)
+{
+    ngx_log_t                  *log;
+    struct linger               linger;
+    ngx_http_log_ctx_t         *ctx;
+    ngx_http_core_loc_conf_t   *clcf;
+    ngx_http_core_main_conf_t  *cmcf;
 
     log = r->connection->log;
 
@@ -2392,7 +2364,11 @@ ngx_http_close_request(ngx_http_request_t *r, ngx_int_t error)
         r->headers_out.status = error;
     }
 
-    ngx_http_log_handler(r);
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
+    if (cmcf->log_handler) {
+        cmcf->log_handler(r);
+    }
 
     if (r->connection->timedout) {
         clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
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_ */
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 6d1bd497d..6ec9933da 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -29,6 +29,7 @@ static void ngx_http_upstream_process_body(ngx_event_t *ev);
 static void ngx_http_upstream_dummy_handler(ngx_event_t *wev);
 static void ngx_http_upstream_next(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_uint_t ft_type);
+static void ngx_http_upstream_cleanup(void *data);
 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_int_t rc);
 
@@ -223,6 +224,7 @@ ngx_http_upstream_init(ngx_http_request_t *r)
 {
     ngx_time_t                *tp;
     ngx_connection_t          *c;
+    ngx_http_cleanup_t        *cln;
     ngx_http_upstream_t       *u;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -277,7 +279,8 @@ ngx_http_upstream_init(ngx_http_request_t *r)
     u->writer.pool = r->pool;
 
     if (ngx_array_init(&u->states, r->pool, u->peer.peers->number,
-                       sizeof(ngx_http_upstream_state_t)) != NGX_OK)
+                       sizeof(ngx_http_upstream_state_t))
+        != NGX_OK)
     {
         ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
         return;
@@ -295,6 +298,16 @@ ngx_http_upstream_init(ngx_http_request_t *r)
 
     u->state->response_time = tp->sec * 1000 + tp->msec;
 
+    cln = ngx_http_cleanup_add(r, sizeof(void *));
+    if (cln == NULL) {
+        ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+        return;
+    }
+
+    cln->handler = ngx_http_upstream_cleanup;
+    cln->data = r;
+    u->cleanup = &cln->handler;
+
     ngx_http_upstream_connect(r, u);
 }
 
@@ -1379,8 +1392,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
         }
     }
 
-    if (r->connection->write->eof) {
-        r->connection->closed = 1;
+    if (r->connection->closed) {
         ngx_http_upstream_finalize_request(r, u,
                                            NGX_HTTP_CLIENT_CLOSED_REQUEST);
         return;
@@ -1426,6 +1438,18 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
 
 
 static void
+ngx_http_upstream_cleanup(void *data)
+{
+    ngx_http_request_t *r = data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "cleanup http upstream request: \"%V\"", &r->uri);
+
+    ngx_http_upstream_finalize_request(r, r->upstream, NGX_DONE);
+}
+
+
+static void
 ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     ngx_http_upstream_t *u, ngx_int_t rc)
 {
@@ -1434,6 +1458,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "finalize http upstream request: %i", rc);
 
+    *u->cleanup = NULL;
+
     if (u->state->response_time) {
         tp = ngx_timeofday();
         u->state->response_time = tp->sec * 1000 + tp->msec
@@ -1864,7 +1890,7 @@ ngx_http_upstream_log_error(ngx_http_request_t *r, u_char *buf, size_t len)
 
     p = ngx_snprintf(buf, len,
                      ", server: %V, URL: \"%V\","
-                     " upstream: %V%V%s%V",
+                     " upstream: \"%V%V%s%V\"",
                      &r->server_name,
                      &r->unparsed_uri,
                      &u->conf->schema,
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 637a38d51..d6b4a62cc 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -167,6 +167,8 @@ struct ngx_http_upstream_s {
 
     ngx_str_t                       uri;
 
+    ngx_http_cleanup_pt            *cleanup;
+
     unsigned                        cachable:1;
     unsigned                        accel:1;
 
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 7e4a79f1b..3cb3bdf5b 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -97,6 +97,9 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("document_uri"), ngx_http_variable_request,
       offsetof(ngx_http_request_t, uri), 0, 0 },
 
+    { ngx_string("request"), ngx_http_variable_request,
+      offsetof(ngx_http_request_t, request_line), 0, 0 },
+
     { ngx_string("document_root"), ngx_http_variable_document_root, 0, 0, 0 },
 
     { ngx_string("query_string"), ngx_http_variable_request,
@@ -705,7 +708,8 @@ ngx_http_variables_add_core_vars(ngx_conf_t *cf)
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 
     if (ngx_array_init(&cmcf->all_variables, cf->pool, 32,
-                       sizeof(ngx_http_variable_t)) == NGX_ERROR)
+                       sizeof(ngx_http_variable_t))
+        == NGX_ERROR)
     {
         return NGX_ERROR;
     }
diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c
index b8c5bfc04..ac5db73b4 100644
--- a/src/imap/ngx_imap_handler.c
+++ b/src/imap/ngx_imap_handler.c
@@ -355,9 +355,9 @@ ngx_imap_auth_state(ngx_event_t *rev)
         switch (s->command) {
 
         case NGX_IMAP_LOGIN:
-            if (s->args.nelts == 2) {
+            arg = s->args.elts;
 
-                arg = s->args.elts;
+            if (s->args.nelts == 2 && arg[0].len) {
 
                 s->login.len = arg[0].len;
                 s->login.data = ngx_palloc(c->pool, s->login.len);