mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 14:56:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.3.51-RELEASE import

Browse Source 
*) Bugfix: the "<" symbols might disappeared some conditions in the
       SSI; the bug had appeared in 0.3.50.
This commit is contained in:
Igor Sysoev 2006-06-30 12:19:32 +00:00
parent ac0e7bc27f
commit e240762c6c
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/xml/nginx/changes.xml
View File

@ -9,6 +9,22 @@
<title lang="en">nginx changelog</title>
<changes ver="0.3.51" date="30.06.2006">
<change type="bugfix">
<para lang="ru">
при некоторых условиях в SSI мог пропадать символы "&lt;";
ошибка появилась в 0.3.50.
</para>
<para lang="en">
the "&lt;" symbols might disappeared some conditions in the SSI;
bug appeared in 0.3.50.
</para>
</change>
</changes>
<changes ver="0.3.50" date="28.06.2006">
<change type="change">
@ -48,7 +64,7 @@ and FastCGI mode.
<change type="bugfix">
<para lang="ru">
символ "\" в парах "\"" и "\'" в SSI командах убирался только, если
символ "\" в парах "\"" и "\'" в SSI командах убирался, только если
ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÌÓÑ ÓÉÍ×ÏÌ "$".
</para>
<para lang="en">
@ -71,7 +87,7 @@ in the SSI after inclusion.
<change type="bugfix">
<para lang="ru">
ÅÓÌÉ × ÚÁÇÏÌÏ×ËÅ ÏÔ×ÅÔÁ ÂÙÌÁ ÓÔÒÏËÁ <nobr>"Content-Length: 0",</nobr>
при использовании небуферизированного проксировании не закрывалось соединение
то при использовании небуферизированного проксировании не закрывалось соединение
Ó ËÌÉÅÎÔÏÍ.
</para>
<para lang="en">

2
src/core/nginx.h
View File

@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
#define NGINX_VER "nginx/0.3.50"
#define NGINX_VER "nginx/0.3.51"
#define NGINX_VAR "NGINX"
#define NGX_OLDPID_EXT ".oldbin"

2
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -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);
}

4
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -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;

1
src/http/ngx_http_upstream.c
View File

@ -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;
}
}