# HG changeset patch # User Igor Sysoev # Date 1072114044 0 # Node ID 5adc2b75f8a5d7a01c58e3fb0e6e10688ee49c26 # Parent e0c502f15852ece7ee100ec7f35835112a8736b9 nginx-0.0.1-2003-12-22-20:27:24 import diff --git a/auto/os/freebsd b/auto/os/freebsd --- 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 --- 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", 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 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -620,7 +620,7 @@ static void ngx_http_process_request_hea } 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