details: http://hg.nginx.org/nginx/rev/f01ab2dbcfdc
branches:
changeset: 6480:f01ab2dbcfdc
user: Sergey Kandaurov <pluknet@nginx.com>
date: Thu Mar 31 02:33:57 2016 +0300
description:
Fixed logging.

diffstat:

src/core/nginx.c | 2 +-
src/core/ngx_cycle.c | 6 +++---
src/core/ngx_file.c | 4 ++--
src/core/ngx_slab.c | 3 ++-
src/event/modules/ngx_epoll_module.c | 2 +-
src/event/ngx_event.c | 2 +-
src/event/ngx_event_openssl.c | 4 ++--
src/event/ngx_event_openssl_stapling.c | 2 +-
src/event/ngx_event_pipe.c | 2 +-
src/http/modules/ngx_http_auth_basic_module.c | 2 +-
src/http/modules/ngx_http_auth_request_module.c | 4 ++--
src/http/modules/ngx_http_chunked_filter_module.c | 2 +-
src/http/modules/ngx_http_fastcgi_module.c | 6 +++---
src/http/modules/ngx_http_gzip_filter_module.c | 4 ++--
src/http/modules/ngx_http_image_filter_module.c | 2 +-
src/http/modules/ngx_http_limit_conn_module.c | 4 ++--
src/http/modules/ngx_http_map_module.c | 2 +-
src/http/modules/ngx_http_memcached_module.c | 2 +-
src/http/modules/ngx_http_proxy_module.c | 8 ++++----
src/http/modules/ngx_http_range_filter_module.c | 2 +-
src/http/modules/ngx_http_ssi_filter_module.c | 8 ++++----
src/http/modules/ngx_http_sub_filter_module.c | 2 +-
src/http/modules/ngx_http_upstream_ip_hash_module.c | 2 +-
src/http/ngx_http_request.c | 12 ++++++------
src/http/ngx_http_script.c | 2 +-
src/http/ngx_http_write_filter_module.c | 2 +-
src/http/v2/ngx_http_v2.c | 2 +-
src/mail/ngx_mail_auth_http_module.c | 2 +-
src/mail/ngx_mail_proxy_module.c | 2 +-
src/os/unix/ngx_file_aio_read.c | 2 +-
src/os/unix/ngx_files.c | 2 +-
src/os/unix/ngx_linux_aio_read.c | 2 +-
src/os/unix/ngx_linux_sendfile_chain.c | 2 +-
src/os/unix/ngx_process_cycle.c | 10 +++++-----
src/os/unix/ngx_readv_chain.c | 2 +-
src/os/unix/ngx_recv.c | 4 ++--
src/os/unix/ngx_send.c | 2 +-
src/os/unix/ngx_udp_recv.c | 4 ++--
src/stream/ngx_stream_limit_conn_module.c | 4 ++--
39 files changed, 67 insertions(+), 66 deletions(-)

diffs (706 lines):

diff -r dc92298b1852 -r f01ab2dbcfdc src/core/nginx.c
--- a/src/core/nginx.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/core/nginx.c Thu Mar 31 02:33:57 2016 +0300
@@ -1510,7 +1510,7 @@ ngx_load_module(ngx_conf_t *cf, ngx_comm
return NGX_CONF_ERROR;
}

- ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%i",
+ ngx_log_debug2(NGX_LOG_DEBUG_CORE, cf->log, 0, "module: %s i:%ui",
module->name, module->index);
}

diff -r dc92298b1852 -r f01ab2dbcfdc src/core/ngx_cycle.c
--- a/src/core/ngx_cycle.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/core/ngx_cycle.c Thu Mar 31 02:33:57 2016 +0300
@@ -1313,7 +1313,7 @@ ngx_clean_old_cycles(ngx_event_t *ev)
if (cycle[i]->connections[n].fd != (ngx_socket_t) -1) {
found = 1;

- ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%d", n);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "live fd:%ui", n);

break;
}
@@ -1324,13 +1324,13 @@ ngx_clean_old_cycles(ngx_event_t *ev)
continue;
}

- ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %d", i);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "clean old cycle: %ui", i);

ngx_destroy_pool(cycle[i]->pool);
cycle[i] = NULL;
}

- ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %d", live);
+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "old cycles status: %ui", live);

if (live) {
ngx_add_timer(ev, 30000);
diff -r dc92298b1852 -r f01ab2dbcfdc src/core/ngx_file.c
--- a/src/core/ngx_file.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/core/ngx_file.c Thu Mar 31 02:33:57 2016 +0300
@@ -841,7 +841,7 @@ ngx_copy_file(u_char *from, u_char *to,

if ((size_t) n != len) {
ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
- ngx_read_fd_n " has read only %z of %uz from %s",
+ ngx_read_fd_n " has read only %z of %O from %s",
n, size, from);
goto failed;
}
@@ -856,7 +856,7 @@ ngx_copy_file(u_char *from, u_char *to,

if ((size_t) n != len) {
ngx_log_error(NGX_LOG_ALERT, cf->log, 0,
- ngx_write_fd_n " has written only %z of %uz to %s",
+ ngx_write_fd_n " has written only %z of %O to %s",
n, size, to);
goto failed;
}
diff -r dc92298b1852 -r f01ab2dbcfdc src/core/ngx_slab.c
--- a/src/core/ngx_slab.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/core/ngx_slab.c Thu Mar 31 02:33:57 2016 +0300
@@ -392,7 +392,8 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *p

done:

- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0, "slab alloc: %p", p);
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, ngx_cycle->log, 0,
+ "slab alloc: %p", (void *) p);

return (void *) p;
}
diff -r dc92298b1852 -r f01ab2dbcfdc src/event/modules/ngx_epoll_module.c
--- a/src/event/modules/ngx_epoll_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/event/modules/ngx_epoll_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -902,7 +902,7 @@ ngx_epoll_eventfd_handler(ngx_event_t *e
events = io_getevents(ngx_aio_ctx, 1, 64, event, &ts);

ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
- "io_getevents: %l", events);
+ "io_getevents: %d", events);

if (events > 0) {
ready -= events;
diff -r dc92298b1852 -r f01ab2dbcfdc src/event/ngx_event.c
--- a/src/event/ngx_event.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/event/ngx_event.c Thu Mar 31 02:33:57 2016 +0300
@@ -525,7 +525,7 @@ ngx_event_module_init(ngx_cycle_t *cycle
(void) ngx_atomic_cmp_set(ngx_connection_counter, 0, 1);

ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "counter: %p, %d",
+ "counter: %p, %uA",
ngx_connection_counter, *ngx_connection_counter);

ngx_temp_number = (ngx_atomic_t *) (shared + 2 * cl);
diff -r dc92298b1852 -r f01ab2dbcfdc src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/event/ngx_event_openssl.c Thu Mar 31 02:33:57 2016 +0300
@@ -1596,7 +1596,7 @@ ngx_ssl_send_chain(ngx_connection_t *c,
}

ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "SSL buf copy: %d", size);
+ "SSL buf copy: %z", size);

ngx_memcpy(buf->last, in->buf->pos, size);

@@ -1668,7 +1668,7 @@ ngx_ssl_write(ngx_connection_t *c, u_cha

ngx_ssl_clear_error(c->log);

- ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %d", size);
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL to write: %uz", size);

n = SSL_write(c->ssl->connection, data, size);

diff -r dc92298b1852 -r f01ab2dbcfdc src/event/ngx_event_openssl_stapling.c
--- a/src/event/ngx_event_openssl_stapling.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/event/ngx_event_openssl_stapling.c Thu Mar 31 02:33:57 2016 +0300
@@ -1219,7 +1219,7 @@ ngx_ssl_ocsp_create_request(ngx_ssl_ocsp

ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
"ssl ocsp request length %z, escape %d",
- base64.len, escape);
+ base64.len, (int) escape);

len = sizeof("GET ") - 1 + ctx->uri.len + sizeof("/") - 1
+ base64.len + 2 * escape + sizeof(" HTTP/1.0" CRLF) - 1
diff -r dc92298b1852 -r f01ab2dbcfdc src/event/ngx_event_pipe.c
--- a/src/event/ngx_event_pipe.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/event/ngx_event_pipe.c Thu Mar 31 02:33:57 2016 +0300
@@ -660,7 +660,7 @@ ngx_event_pipe_write_to_downstream(ngx_e
flush:

ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
- "pipe write: out:%p, f:%d", out, flush);
+ "pipe write: out:%p, f:%ui", out, flush);

if (out == NULL) {

diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_auth_basic_module.c
--- a/src/http/modules/ngx_http_auth_basic_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_auth_basic_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -298,7 +298,7 @@ ngx_http_auth_basic_crypt_handler(ngx_ht
&encrypted);

ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "rc: %d user: \"%V\" salt: \"%s\"",
+ "rc: %i user: \"%V\" salt: \"%s\"",
rc, &r->headers_in.user, passwd->data);

if (rc == NGX_OK) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_auth_request_module.c
--- a/src/http/modules/ngx_http_auth_request_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_auth_request_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -168,7 +168,7 @@ ngx_http_auth_request_handler(ngx_http_r
}

ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "auth request unexpected status: %d", ctx->status);
+ "auth request unexpected status: %ui", ctx->status);

return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -219,7 +219,7 @@ ngx_http_auth_request_done(ngx_http_requ
ngx_http_auth_request_ctx_t *ctx = data;

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "auth request done s:%d", r->headers_out.status);
+ "auth request done s:%ui", r->headers_out.status);

ctx->done = 1;
ctx->status = r->headers_out.status;
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_chunked_filter_module.c
--- a/src/http/modules/ngx_http_chunked_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_chunked_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -121,7 +121,7 @@ ngx_http_chunked_body_filter(ngx_http_re

for ( ;; ) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http chunk: %d", ngx_buf_size(cl->buf));
+ "http chunk: %O", ngx_buf_size(cl->buf));

size += ngx_buf_size(cl->buf);

diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -1653,7 +1653,7 @@ ngx_http_fastcgi_process_header(ngx_http
&& f->type != NGX_HTTP_FASTCGI_STDERR)
{
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "upstream sent unexpected FastCGI record: %d",
+ "upstream sent unexpected FastCGI record: %ui",
f->type);

return NGX_HTTP_UPSTREAM_INVALID_HEADER;
@@ -1834,7 +1834,7 @@ ngx_http_fastcgi_process_header(ngx_http
rc = ngx_http_parse_header_line(r, &u->buffer, 1);

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http fastcgi parser: %d", rc);
+ "http fastcgi parser: %i", rc);

if (rc == NGX_AGAIN) {
break;
@@ -2505,7 +2505,7 @@ ngx_http_fastcgi_non_buffered_filter(voi

for (cl = u->out_bufs; cl; cl = cl->next) {
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http fastcgi in memory %p-%p %uz",
+ "http fastcgi in memory %p-%p %O",
cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));

if (buf->last == cl->buf->pos) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_gzip_filter_module.c
--- a/src/http/modules/ngx_http_gzip_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_gzip_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -1009,14 +1009,14 @@ ngx_http_gzip_filter_alloc(void *opaque,
ctx->allocated -= alloc;

ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
- "gzip alloc: n:%ud s:%ud a:%ud p:%p",
+ "gzip alloc: n:%ud s:%ud a:%ui p:%p",
items, size, alloc, p);

return p;
}

ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
- "gzip filter failed to use preallocated memory: %ud of %ud",
+ "gzip filter failed to use preallocated memory: %ud of %ui",
items * size, ctx->allocated);

p = ngx_palloc(ctx->request->pool, items * size);
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_image_filter_module.c
--- a/src/http/modules/ngx_http_image_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_image_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -737,7 +737,7 @@ ngx_http_image_size(ngx_http_request_t *
}

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "image size: %d x %d", width, height);
+ "image size: %d x %d", (int) width, (int) height);

ctx->width = width;
ctx->height = height;
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_limit_conn_module.c
--- a/src/http/modules/ngx_http_limit_conn_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_limit_conn_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -232,7 +232,7 @@ ngx_http_limit_conn_handler(ngx_http_req
}

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "limit conn: %08XD %d", node->key, lc->conn);
+ "limit conn: %08Xi %d", node->key, lc->conn);

ngx_shmtx_unlock(&shpool->mutex);

@@ -351,7 +351,7 @@ ngx_http_limit_conn_cleanup(void *data)
ngx_shmtx_lock(&shpool->mutex);

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0,
- "limit conn cleanup: %08XD %d", node->key, lc->conn);
+ "limit conn cleanup: %08Xi %d", node->key, lc->conn);

lc->conn--;

diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_map_module.c
--- a/src/http/modules/ngx_http_map_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_map_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -141,7 +141,7 @@ ngx_http_map_variable(ngx_http_request_t
*v = *value;

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http map: \"%v\" \"%v\"", &val, v);
+ "http map: \"%V\" \"%v\"", &val, v);

return NGX_OK;
}
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_memcached_module.c
--- a/src/http/modules/ngx_http_memcached_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_memcached_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -523,7 +523,7 @@ ngx_http_memcached_filter(void *data, ss
cl->buf->tag = u->output.tag;

ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
- "memcached filter bytes:%z size:%z length:%z rest:%z",
+ "memcached filter bytes:%z size:%z length:%O rest:%z",
bytes, b->last - b->pos, u->length, ctx->rest);

if (bytes <= (ssize_t) (u->length - NGX_HTTP_MEMCACHED_END)) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -1559,7 +1559,7 @@ ngx_http_proxy_body_output_filter(void *

for ( ;; ) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "proxy output chunk: %d", ngx_buf_size(cl->buf));
+ "proxy output chunk: %O", ngx_buf_size(cl->buf));

size += ngx_buf_size(cl->buf);

@@ -1917,7 +1917,7 @@ ngx_http_proxy_input_filter_init(void *d
}

ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http proxy filter init s:%d h:%d c:%d l:%O",
+ "http proxy filter init s:%ui h:%d c:%d l:%O",
u->headers_in.status_n, ctx->head, u->headers_in.chunked,
u->headers_in.content_length_n);

@@ -2125,7 +2125,7 @@ ngx_http_proxy_chunked_filter(ngx_event_
}

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http proxy chunked state %d, length %d",
+ "http proxy chunked state %ui, length %O",
ctx->chunked.state, p->length);

if (b) {
@@ -2299,7 +2299,7 @@ ngx_http_proxy_non_buffered_chunked_filt

for (cl = u->out_bufs; cl; cl = cl->next) {
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http proxy in memory %p-%p %uz",
+ "http proxy in memory %p-%p %O",
cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf));

if (buf->last == cl->buf->pos) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_range_filter_module.c
--- a/src/http/modules/ngx_http_range_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_range_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -207,7 +207,7 @@ ngx_http_range_header_filter(ngx_http_re
if_range_time = ngx_parse_http_time(if_range->data, if_range->len);

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http ir:%d lm:%d",
+ "http ir:%T lm:%T",
if_range_time, r->headers_out.last_modified_time);

if (if_range_time != r->headers_out.last_modified_time) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_ssi_filter_module.c
--- a/src/http/modules/ngx_http_ssi_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_ssi_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -468,12 +468,12 @@ ngx_http_ssi_body_filter(ngx_http_reques
while (ctx->pos < ctx->buf->last) {

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "saved: %d state: %d", ctx->saved, ctx->state);
+ "saved: %uz state: %ui", ctx->saved, ctx->state);

rc = ngx_http_ssi_parse(r, ctx);

ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "parse: %d, looked: %d %p-%p",
+ "parse: %i, looked: %uz %p-%p",
rc, ctx->looked, ctx->copy_start, ctx->copy_end);

if (rc == NGX_ERROR) {
@@ -485,7 +485,7 @@ ngx_http_ssi_body_filter(ngx_http_reques
if (ctx->output) {

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "saved: %d", ctx->saved);
+ "saved: %uz", ctx->saved);

if (ctx->saved) {

@@ -1911,7 +1911,7 @@ ngx_http_ssi_regex_match(ngx_http_reques

if (rc < NGX_REGEX_NO_MATCHED) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
- ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"",
+ ngx_regex_exec_n " failed: %d on \"%V\" using \"%V\"",
rc, str, pattern);
return NGX_HTTP_SSI_ERROR;
}
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_sub_filter_module.c
--- a/src/http/modules/ngx_http_sub_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_sub_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -341,7 +341,7 @@ ngx_http_sub_body_filter(ngx_http_reques
rc = ngx_http_sub_parse(r, ctx);

ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "parse: %d, looked: \"%V\" %p-%p",
+ "parse: %i, looked: \"%V\" %p-%p",
rc, &ctx->looked, ctx->copy_start, ctx->copy_end);

if (rc == NGX_ERROR) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/modules/ngx_http_upstream_ip_hash_module.c
--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -199,7 +199,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p
}

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
- "get ip hash peer, hash: %ui %04XA", p, m);
+ "get ip hash peer, hash: %ui %04XL", p, (uint64_t) m);

if (peer->down) {
goto next;
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/ngx_http_request.c Thu Mar 31 02:33:57 2016 +0300
@@ -648,7 +648,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)

err = ngx_socket_errno;

- ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http recv(): %d", n);
+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http recv(): %z", n);

if (n == -1) {
if (err == NGX_EAGAIN) {
@@ -1500,7 +1500,7 @@ ngx_http_alloc_large_header_buffer(ngx_h
}

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http large header copy: %d", r->header_in->pos - old);
+ "http large header copy: %uz", r->header_in->pos - old);

new = b->start;

@@ -2264,7 +2264,7 @@ ngx_http_finalize_request(ngx_http_reque
c = r->connection;

ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
- "http finalize request: %d, \"%V?%V\" a:%d, c:%d",
+ "http finalize request: %i, \"%V?%V\" a:%d, c:%d",
rc, &r->uri, &r->args, r == c->data, r->main->count);

if (rc == NGX_DONE) {
@@ -2956,7 +2956,7 @@ ngx_http_set_keepalive(ngx_http_request_
b->last = b->start;
}

- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p %d",
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc free: %p %i",
hc->free, hc->nfree);

if (hc->free) {
@@ -2968,7 +2968,7 @@ ngx_http_set_keepalive(ngx_http_request_
hc->nfree = 0;
}

- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc busy: %p %d",
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, "hc busy: %p %i",
hc->busy, hc->nbusy);

if (hc->busy) {
@@ -3259,7 +3259,7 @@ ngx_http_lingering_close_handler(ngx_eve
do {
n = c->recv(c, buffer, NGX_HTTP_LINGERING_BUFFER_SIZE);

- ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %d", n);
+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "lingering read: %z", n);

if (n == NGX_ERROR || n == 0) {
ngx_http_close_request(r, 0);
diff -r dc92298b1852 -r f01ab2dbcfdc src/http/ngx_http_script.c
--- a/src/http/ngx_http_script.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/ngx_http_script.c Thu Mar 31 02:33:57 2016 +0300
@@ -1488,7 +1488,7 @@ ngx_http_script_file_code(ngx_http_scrip
r = e->request;

ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http script file op %p \"%V\"", code->op, &path);
+ "http script file op %p \"%V\"", (void *) code->op, &path);

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

diff -r dc92298b1852 -r f01ab2dbcfdc src/http/ngx_http_write_filter_module.c
--- a/src/http/ngx_http_write_filter_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/ngx_http_write_filter_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -174,7 +174,7 @@ ngx_http_write_filter(ngx_http_request_t
*ll = NULL;

ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
- "http write filter: l:%d f:%d s:%O", last, flush, size);
+ "http write filter: l:%ui f:%ui s:%O", last, flush, size);

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

diff -r dc92298b1852 -r f01ab2dbcfdc src/http/v2/ngx_http_v2.c
--- a/src/http/v2/ngx_http_v2.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/http/v2/ngx_http_v2.c Thu Mar 31 02:33:57 2016 +0300
@@ -2124,7 +2124,7 @@ ngx_http_v2_state_ping(ngx_http_v2_conne
}

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
- "http2 PING frame, flags: %ui", h2c->state.flags);
+ "http2 PING frame, flags: %ud", h2c->state.flags);

if (h2c->state.flags & NGX_HTTP_V2_ACK_FLAG) {
return ngx_http_v2_state_skip(h2c, pos, end);
diff -r dc92298b1852 -r f01ab2dbcfdc src/mail/ngx_mail_auth_http_module.c
--- a/src/mail/ngx_mail_auth_http_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/mail/ngx_mail_auth_http_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -431,7 +431,7 @@ ngx_mail_auth_http_ignore_status_line(ng
}

ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
- "auth http server &V sent invalid response",
+ "auth http server %V sent invalid response",
ctx->peer.name);
ngx_close_connection(ctx->peer.connection);
ngx_destroy_pool(ctx->pool);
diff -r dc92298b1852 -r f01ab2dbcfdc src/mail/ngx_mail_proxy_module.c
--- a/src/mail/ngx_mail_proxy_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/mail/ngx_mail_proxy_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -935,7 +935,7 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
do_write = ev->write ? 1 : 0;

ngx_log_debug3(NGX_LOG_DEBUG_MAIL, ev->log, 0,
- "mail proxy handler: %d, #%d > #%d",
+ "mail proxy handler: %ui, #%d > #%d",
do_write, src->fd, dst->fd);

for ( ;; ) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_file_aio_read.c
--- a/src/os/unix/ngx_file_aio_read.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_file_aio_read.c Thu Mar 31 02:33:57 2016 +0300
@@ -84,7 +84,7 @@ ngx_file_aio_read(ngx_file_t *file, u_ch
}

ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
- "aio complete:%d @%O:%z %V",
+ "aio complete:%d @%O:%uz %V",
ev->complete, offset, size, &file->name);

if (ev->complete) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_files.c
--- a/src/os/unix/ngx_files.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_files.c Thu Mar 31 02:33:57 2016 +0300
@@ -176,7 +176,7 @@ ngx_thread_read_handler(void *data, ngx_
#endif

ngx_log_debug4(NGX_LOG_DEBUG_CORE, log, 0,
- "pread: %z (err: %i) of %uz @%O",
+ "pread: %z (err: %d) of %uz @%O",
n, ctx->err, ctx->size, ctx->offset);
}

diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_linux_aio_read.c
--- a/src/os/unix/ngx_linux_aio_read.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_linux_aio_read.c Thu Mar 31 02:33:57 2016 +0300
@@ -73,7 +73,7 @@ ngx_file_aio_read(ngx_file_t *file, u_ch
}

ngx_log_debug4(NGX_LOG_DEBUG_CORE, file->log, 0,
- "aio complete:%d @%O:%z %V",
+ "aio complete:%d @%O:%uz %V",
ev->complete, offset, size, &file->name);

if (ev->complete) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_linux_sendfile_chain.c
--- a/src/os/unix/ngx_linux_sendfile_chain.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_linux_sendfile_chain.c Thu Mar 31 02:33:57 2016 +0300
@@ -451,7 +451,7 @@ again:
#endif

ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0,
- "sendfile: %z (err: %i) of %uz @%O",
+ "sendfile: %z (err: %d) of %uz @%O",
n, ctx->err, ctx->size, file->file_pos);

if (ctx->err == NGX_EINTR) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_process_cycle.c
--- a/src/os/unix/ngx_process_cycle.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_process_cycle.c Thu Mar 31 02:33:57 2016 +0300
@@ -145,7 +145,7 @@ ngx_master_process_cycle(ngx_cycle_t *cy
}

ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "termination cycle: %d", delay);
+ "termination cycle: %M", delay);

itv.it_interval.tv_sec = 0;
itv.it_interval.tv_usec = 0;
@@ -438,7 +438,7 @@ ngx_pass_open_channel(ngx_cycle_t *cycle
}

ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0,
- "pass channel s:%d pid:%P fd:%d to s:%i pid:%P fd:%d",
+ "pass channel s:%i pid:%P fd:%d to s:%i pid:%P fd:%d",
ch->slot, ch->pid, ch->fd,
i, ngx_processes[i].pid,
ngx_processes[i].channel[0]);
@@ -492,7 +492,7 @@ ngx_signal_worker_processes(ngx_cycle_t
for (i = 0; i < ngx_last_process; i++) {

ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "child: %d %P e:%d t:%d d:%d r:%d j:%d",
+ "child: %i %P e:%d t:%d d:%d r:%d j:%d",
i,
ngx_processes[i].pid,
ngx_processes[i].exiting,
@@ -570,7 +570,7 @@ ngx_reap_children(ngx_cycle_t *cycle)
for (i = 0; i < ngx_last_process; i++) {

ngx_log_debug7(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "child: %d %P e:%d t:%d d:%d r:%d j:%d",
+ "child: %i %P e:%d t:%d d:%d r:%d j:%d",
i,
ngx_processes[i].pid,
ngx_processes[i].exiting,
@@ -1047,7 +1047,7 @@ ngx_channel_handler(ngx_event_t *ev)
}

ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,
- "channel command: %d", ch.command);
+ "channel command: %ui", ch.command);

switch (ch.command) {

diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_readv_chain.c
--- a/src/os/unix/ngx_readv_chain.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_readv_chain.c Thu Mar 31 02:33:57 2016 +0300
@@ -101,7 +101,7 @@ ngx_readv_chain(ngx_connection_t *c, ngx
}

ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "readv: %d, last:%d", vec.nelts, iov->iov_len);
+ "readv: %ui, last:%uz", vec.nelts, iov->iov_len);

do {
n = readv(c->fd, (struct iovec *) vec.elts, vec.nelts);
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_recv.c
--- a/src/os/unix/ngx_recv.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_recv.c Thu Mar 31 02:33:57 2016 +0300
@@ -52,7 +52,7 @@ ngx_unix_recv(ngx_connection_t *c, u_cha
n = recv(c->fd, buf, size, 0);

ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "recv: fd:%d %d of %d", c->fd, n, size);
+ "recv: fd:%d %z of %uz", c->fd, n, size);

if (n >= 0) {
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -139,7 +139,7 @@ ngx_unix_recv(ngx_connection_t *c, u_cha
n = recv(c->fd, buf, size, 0);

ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "recv: fd:%d %d of %d", c->fd, n, size);
+ "recv: fd:%d %z of %uz", c->fd, n, size);

if (n == 0) {
rev->ready = 0;
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_send.c
--- a/src/os/unix/ngx_send.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_send.c Thu Mar 31 02:33:57 2016 +0300
@@ -34,7 +34,7 @@ ngx_unix_send(ngx_connection_t *c, u_cha
n = send(c->fd, buf, size, 0);

ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "send: fd:%d %d of %d", c->fd, n, size);
+ "send: fd:%d %z of %uz", c->fd, n, size);

if (n > 0) {
if (n < (ssize_t) size) {
diff -r dc92298b1852 -r f01ab2dbcfdc src/os/unix/ngx_udp_recv.c
--- a/src/os/unix/ngx_udp_recv.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/os/unix/ngx_udp_recv.c Thu Mar 31 02:33:57 2016 +0300
@@ -25,7 +25,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u
n = recv(c->fd, buf, size, 0);

ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "recv: fd:%d %d of %d", c->fd, n, size);
+ "recv: fd:%d %z of %uz", c->fd, n, size);

if (n >= 0) {
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
@@ -83,7 +83,7 @@ ngx_udp_unix_recv(ngx_connection_t *c, u
n = recv(c->fd, buf, size, 0);

ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "recv: fd:%d %d of %d", c->fd, n, size);
+ "recv: fd:%d %z of %uz", c->fd, n, size);

if (n >= 0) {
return n;
diff -r dc92298b1852 -r f01ab2dbcfdc src/stream/ngx_stream_limit_conn_module.c
--- a/src/stream/ngx_stream_limit_conn_module.c Thu Mar 31 02:33:55 2016 +0300
+++ b/src/stream/ngx_stream_limit_conn_module.c Thu Mar 31 02:33:57 2016 +0300
@@ -220,7 +220,7 @@ ngx_stream_limit_conn_handler(ngx_stream
}

ngx_log_debug2(NGX_LOG_DEBUG_STREAM, s->connection->log, 0,
- "limit conn: %08XD %d", node->key, lc->conn);
+ "limit conn: %08Xi %d", node->key, lc->conn);

ngx_shmtx_unlock(&shpool->mutex);

@@ -340,7 +340,7 @@ ngx_stream_limit_conn_cleanup(void *data
ngx_shmtx_lock(&shpool->mutex);

ngx_log_debug2(NGX_LOG_DEBUG_STREAM, lccln->shm_zone->shm.log, 0,
- "limit conn cleanup: %08XD %d", node->key, lc->conn);
+ "limit conn cleanup: %08Xi %d", node->key, lc->conn);

lc->conn--;


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel