diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-06-30 12:19:32 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-06-30 12:19:32 +0000 |
| commit | e240762c6cc6600025a35b78aab4ef739906598b (patch) | |
| tree | c74ac9ed40a3aab5d876067d950103080e0f8c9f /src/http | |
| parent | ac0e7bc27fc575820b0b0b338b822ea2752a29d3 (diff) | |
| download | nginx-e240762c6cc6600025a35b78aab4ef739906598b.tar.gz nginx-e240762c6cc6600025a35b78aab4ef739906598b.zip | |
nginx-0.3.51-RELEASE importrelease-0.3.51
*) Bugfix: the "<" symbols might disappeared some conditions in the
SSI; the bug had appeared in 0.3.50.
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c index 635e6c521..b467e4dc2 100644 --- a/src/http/modules/ngx_http_charset_filter_module.c +++ b/src/http/modules/ngx_http_charset_filter_module.c @@ -217,7 +217,7 @@ ngx_http_charset_header_filter(ngx_http_request_t *r) if (charset == NGX_HTTP_NO_CHARSET) { ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, "unknown charset \"%V\" to override", - &r->headers_out.override_charset); + r->headers_out.override_charset); return ngx_http_next_header_filter(r); } diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 63c2dd138..5a65a03e8 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -942,7 +942,9 @@ ngx_http_ssi_parse(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx) case ssi_sharp_state: switch (ch) { case '#': - ctx->saved = 0; + if (p - ctx->pos < 4) { + ctx->saved = 0; + } looked = 0; state = ssi_precommand_state; break; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index cf9d27b70..a8c557a6e 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1273,6 +1273,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u) if (clf->fd == r->request_body->temp_file->file.fd) { cl->handler(clf); cl->handler = NULL; + r->request_body->temp_file->file.fd = NGX_INVALID_FILE; break; } } |