diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
| commit | d039a2e193c9172e4f415b9304222e81804a69d0 (patch) | |
| tree | 4571d4da7950e9464e788a4d68dc5111167de52c /src/http/ngx_http_log_handler.c | |
| parent | 174db74f2309e28c0e2b54e89b9e08afff187c7c (diff) | |
| download | nginx-d039a2e193c9172e4f415b9304222e81804a69d0.tar.gz nginx-d039a2e193c9172e4f415b9304222e81804a69d0.zip | |
nginx-0.1.21-RELEASE importrelease-0.1.21
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
Diffstat (limited to 'src/http/ngx_http_log_handler.c')
| -rw-r--r-- | src/http/ngx_http_log_handler.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/http/ngx_http_log_handler.c b/src/http/ngx_http_log_handler.c index 0d031fe0d..148246f64 100644 --- a/src/http/ngx_http_log_handler.c +++ b/src/http/ngx_http_log_handler.c @@ -135,7 +135,8 @@ static ngx_str_t ngx_http_combined_fmt = ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = { { ngx_string("addr"), INET_ADDRSTRLEN - 1, NULL, NULL, ngx_http_log_addr }, - { ngx_string("conn"), NGX_INT32_LEN, NULL, NULL, ngx_http_log_connection }, + { ngx_string("conn"), NGX_ATOMIC_T_LEN, NULL, NULL, + ngx_http_log_connection }, { ngx_string("pipe"), 1, NULL, NULL, ngx_http_log_pipe }, { ngx_string("time"), sizeof("28/Sep/1970:12:00:00 +0600") - 1, NULL, NULL, ngx_http_log_time }, @@ -143,13 +144,13 @@ ngx_http_log_op_name_t ngx_http_log_fmt_ops[] = { { ngx_string("status"), 3, NULL, NULL, ngx_http_log_status }, { ngx_string("length"), NGX_OFF_T_LEN, NULL, NULL, ngx_http_log_length }, { ngx_string("apache_length"), NGX_OFF_T_LEN, - NULL, NULL, ngx_http_log_apache_length }, + NULL, NULL, ngx_http_log_apache_length }, { ngx_string("request_length"), NGX_SIZE_T_LEN, - NULL, NULL, ngx_http_log_request_length }, + NULL, NULL, ngx_http_log_request_length }, { ngx_string("request"), 0, NULL, - ngx_http_log_request_getlen, - ngx_http_log_request }, + ngx_http_log_request_getlen, + ngx_http_log_request }, { ngx_string("i"), 0, ngx_http_log_header_in_compile, ngx_http_log_header_in_getlen, |