diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-04-26 09:52:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-04-26 09:52:47 +0000 |
| commit | 7f7846d8208c9179b7632eddc4a3165b3b10afbb (patch) | |
| tree | d3255703d466de2d0e9199cad9186b227798d7cc /src/http/modules | |
| parent | 5026d3799b88b715bfe12c836d4263e861822cad (diff) | |
| download | nginx-release-0.3.42.tar.gz nginx-release-0.3.42.zip | |
nginx-0.3.42-RELEASE importrelease-0.3.42
*) Feature: the "bind" option of the "listen" directive in IMAP/POP3
proxy.
*) Bugfix: if the same capture in the "rewrite" directive was used more
then once.
*) Bugfix: the $sent_http_content_type, $sent_http_content_length,
$sent_http_last_modified, $sent_http_connection,
$sent_http_keep_alive, and $sent_http_transfer_encoding variables
were not written to access log.
*) Bugfix: the $sent_http_cache_control returned value of the single
"Cache-Control" response header line.
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_rewrite_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c index 37266a4d8..c557314ee 100644 --- a/src/http/modules/ngx_http_rewrite_module.c +++ b/src/http/modules/ngx_http_rewrite_module.c @@ -395,7 +395,7 @@ ngx_http_rewrite(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) regex->size = sc.size; regex->args = sc.args; - if (sc.variables == 0) { + if (sc.variables == 0 && !sc.dup_capture) { regex->lengths = NULL; } diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 15cb0c34c..dba3639df 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -734,6 +734,19 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) ngx_buf_t *b; ngx_chain_t *cl; +#if 1 + b = NULL; + for (cl = ctx->out; cl; cl = cl->next) { + if (cl->buf == b) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + "the same buf was used in ssi"); + ngx_debug_point(); + return NGX_ERROR; + } + b = cl->buf; + } +#endif + rc = ngx_http_next_body_filter(r, ctx->out); if (ctx->busy == NULL) { |