Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssi_filter_module.c @ 6480:f01ab2dbcfdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed logging.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 31 Mar 2016 02:33:57 +0300
parents e491b26fa5a1
children 293413010217
comparison
equal deleted inserted replaced
6479:dc92298b1852 6480:f01ab2dbcfdc
466 b = NULL; 466 b = NULL;
467 467
468 while (ctx->pos < ctx->buf->last) { 468 while (ctx->pos < ctx->buf->last) {
469 469
470 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 470 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
471 "saved: %d state: %d", ctx->saved, ctx->state); 471 "saved: %uz state: %ui", ctx->saved, ctx->state);
472 472
473 rc = ngx_http_ssi_parse(r, ctx); 473 rc = ngx_http_ssi_parse(r, ctx);
474 474
475 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 475 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
476 "parse: %d, looked: %d %p-%p", 476 "parse: %i, looked: %uz %p-%p",
477 rc, ctx->looked, ctx->copy_start, ctx->copy_end); 477 rc, ctx->looked, ctx->copy_start, ctx->copy_end);
478 478
479 if (rc == NGX_ERROR) { 479 if (rc == NGX_ERROR) {
480 return rc; 480 return rc;
481 } 481 }
483 if (ctx->copy_start != ctx->copy_end) { 483 if (ctx->copy_start != ctx->copy_end) {
484 484
485 if (ctx->output) { 485 if (ctx->output) {
486 486
487 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 487 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
488 "saved: %d", ctx->saved); 488 "saved: %uz", ctx->saved);
489 489
490 if (ctx->saved) { 490 if (ctx->saved) {
491 491
492 if (ctx->free) { 492 if (ctx->free) {
493 cl = ctx->free; 493 cl = ctx->free;
1909 1909
1910 rc = ngx_regex_exec(rgc.regex, str, captures, n); 1910 rc = ngx_regex_exec(rgc.regex, str, captures, n);
1911 1911
1912 if (rc < NGX_REGEX_NO_MATCHED) { 1912 if (rc < NGX_REGEX_NO_MATCHED) {
1913 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, 1913 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
1914 ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"", 1914 ngx_regex_exec_n " failed: %d on \"%V\" using \"%V\"",
1915 rc, str, pattern); 1915 rc, str, pattern);
1916 return NGX_HTTP_SSI_ERROR; 1916 return NGX_HTTP_SSI_ERROR;
1917 } 1917 }
1918 1918
1919 if (rc == NGX_REGEX_NO_MATCHED) { 1919 if (rc == NGX_REGEX_NO_MATCHED) {