nginx-0.0.1-2003-12-22-20:27:24 import

diff --git a/auto/os/freebsd b/auto/os/freebsd
index 415fcba5a9a8cb36ea3bda981186a6c0e7b2e562..b26b6399fb46d8377df5213c1a59b5ec1277e570 100644 (file)
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -25,7 +25,7 @@ fi
 if [ \( $version -lt 500000 -a $version -ge 410000 \) \
      -o $version -ge 500011 ]
 then
-    CFLAGS="$CFLAGS -D HAVE_KQUEUE=1"
+    CFLAGS="$CFLAGS -D HAVE_KQUEUE=1 -D HAVE_CLEAR_EVENT=1"
     CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
     EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
 fi

diff --git a/src/http/ngx_http_log_handler.c b/src/http/ngx_http_log_handler.c
index caef967507d8e91740b5ab6a8402fbb590f306d1..ecdd0795491563b858f4c07a9798b7775d714a68 100644 (file)
--- a/src/http/ngx_http_log_handler.c
+++ b/src/http/ngx_http_log_handler.c
@@ -100,7 +100,7 @@ static char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
 
 static ngx_str_t ngx_http_combined_fmt =
     ngx_string("%addr - - [%time] \"%request\" %status %apache_length "
-               "\"%{Referer}i\" %{User-Agent}i\"");
+               "\"%{Referer}i\" \"%{User-Agent}i\"");
 
 
 ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = {

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 9408fc8e3784c2afc5795f5f67d4efb55453e5f4..6a5fa981113cbbdee855c12f6459e3fca53ab0b6 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -620,7 +620,7 @@ static void ngx_http_process_request_headers(ngx_event_t *rev)
             }
 
             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "http header: \"%s: %s\"'",
+                           "http header: \"%s: %s\"",
                            h->key.data, h->value.data);
 
             if (cscf->large_client_header