nginx-0.1.16-RELEASE importrelease-0.1.16

    *) Bugfix: if the response were transferred by chunks, then on the HEAD
       request the final chunk was issued.

    *) Bugfix: the "Connection: keep-alive" header were issued, even if the
       keepalive_timeout directive forbade the keep-alive use.

    *) Bugfix: the errors in the ngx_http_fastcgi_module caused the
       segmentation faults.

    *) Bugfix: the compressed response encrypted by SSL may not transferred
       complete.

    *) Bugfix: the TCP-specific TCP_NODELAY, TCP_NOPSUH, and TCP_CORK
       options, are not used for the unix domain sockets.

    *) Feature: the rewrite directive supports the arguments rewriting.

    *) Bugfix: the response code 400 was returned for the POST request with
       the "Content-Length: 0" header; the bug had appeared in 0.1.14.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index b7198cd7f..d9c5c59bc 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -86,9 +86,15 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
     /* pid#tid */
     p = ngx_sprintf(p, "%P#" NGX_TID_T_FMT ": ", ngx_log_pid, ngx_log_tid);
 
+    if (log->connection) {
+        p = ngx_sprintf(p, "*%ui ", log->connection);
+    }
+
+#if 0
     if (log->data && *(int *) log->data != -1) {
         p = ngx_sprintf(p, "*%ud ", *(u_int *) log->data);
     }
+#endif
 
 #if (NGX_HAVE_VARIADIC_MACROS)
 
@@ -137,7 +143,7 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
     }
 
     if (level != NGX_LOG_DEBUG && log->handler) {
-        p = log->handler(log->data, p, last - p);
+        p = log->handler(log, p, last - p);
     }
 
     ngx_log_write(log, errstr, p - errstr);