Mercurial > hg > nginx

comparison src/http/ngx_http_spdy.c @ 5507:a30bba3c72e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SPDY: fixed format specifiers in logging.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 14 Jan 2014 16:24:45 +0400
parents 916cb6d28f6a
children 9053fdcea4b7
comparison
equal deleted inserted replaced
5506:64af0f7c4dcd 5507:a30bba3c72e8
482 fn = frame->next; 482 fn = frame->next;
483 frame->next = out; 483 frame->next = out;
484 out = frame; 484 out = frame;
485 485
486 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0, 486 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
487 "spdy frame out: %p sid:%ui prio:%ui bl:%ui size:%uz", 487 "spdy frame out: %p sid:%ui prio:%ui bl:%d size:%uz",
488 out, out->stream ? out->stream->id : 0, out->priority, 488 out, out->stream ? out->stream->id : 0, out->priority,
489 out->blocked, out->size); 489 out->blocked, out->size);
490 } 490 }
491 491
492 cl = c->send_chain(c, cl, 0); 492 cl = c->send_chain(c, cl, 0);
523 out->priority = NGX_SPDY_HIGHEST_PRIORITY; 523 out->priority = NGX_SPDY_HIGHEST_PRIORITY;
524 break; 524 break;
525 } 525 }
526 526
527 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0, 527 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
528 "spdy frame sent: %p sid:%ui bl:%ui size:%uz", 528 "spdy frame sent: %p sid:%ui bl:%d size:%uz",
529 out, out->stream ? out->stream->id : 0, 529 out, out->stream ? out->stream->id : 0,
530 out->blocked, out->size); 530 out->blocked, out->size);
531 } 531 }
532 532
533 frame = NULL; 533 frame = NULL;
657 sc->length = ngx_spdy_frame_length(flen); 657 sc->length = ngx_spdy_frame_length(flen);
658 658
659 pos += sizeof(uint32_t); 659 pos += sizeof(uint32_t);
660 660
661 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0, 661 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, sc->connection->log, 0,
662 "spdy process frame head:%08Xd f:%ui l:%ui", 662 "spdy process frame head:%08XD f:%Xd l:%uz",
663 head, sc->flags, sc->length); 663 head, sc->flags, sc->length);
664 664
665 if (ngx_spdy_ctl_frame_check(head)) { 665 if (ngx_spdy_ctl_frame_check(head)) {
666 switch (ngx_spdy_ctl_frame_type(head)) { 666 switch (ngx_spdy_ctl_frame_type(head)) {
667 667
1478 { 1478 {
1479 #if (NGX_DEBUG) 1479 #if (NGX_DEBUG)
1480 if (end - pos > NGX_SPDY_STATE_BUFFER_SIZE) { 1480 if (end - pos > NGX_SPDY_STATE_BUFFER_SIZE) {
1481 ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0, 1481 ngx_log_error(NGX_LOG_ALERT, sc->connection->log, 0,
1482 "spdy state buffer overflow: " 1482 "spdy state buffer overflow: "
1483 "%i bytes required", end - pos); 1483 "%z bytes required", end - pos);
1484 return ngx_http_spdy_state_internal_error(sc); 1484 return ngx_http_spdy_state_internal_error(sc);
1485 } 1485 }
1486 #endif 1486 #endif
1487 1487
1488 ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE); 1488 ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE);
1727 frame->free = NULL; 1727 frame->free = NULL;
1728 1728
1729 #if (NGX_DEBUG) 1729 #if (NGX_DEBUG)
1730 if (size > NGX_SPDY_CTL_FRAME_BUFFER_SIZE - NGX_SPDY_FRAME_HEADER_SIZE) { 1730 if (size > NGX_SPDY_CTL_FRAME_BUFFER_SIZE - NGX_SPDY_FRAME_HEADER_SIZE) {
1731 ngx_log_error(NGX_LOG_ALERT, sc->pool->log, 0, 1731 ngx_log_error(NGX_LOG_ALERT, sc->pool->log, 0,
1732 "requested control frame is too big: %z", size); 1732 "requested control frame is too big: %uz", size);
1733 return NULL; 1733 return NULL;
1734 } 1734 }
1735 1735
1736 frame->stream = NULL; 1736 frame->stream = NULL;
1737 frame->size = size; 1737 frame->size = size;
2102 if (buf == NULL) { 2102 if (buf == NULL) {
2103 return NGX_ERROR; 2103 return NGX_ERROR;
2104 } 2104 }
2105 2105
2106 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 2106 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2107 "spdy large header alloc: %p %uz", 2107 "spdy large header alloc: %p %z",
2108 buf->pos, buf->end - buf->last); 2108 buf->pos, buf->end - buf->last);
2109 2109
2110 old = r->header_in->pos; 2110 old = r->header_in->pos;
2111 new = buf->pos; 2111 new = buf->pos;
2112 2112