IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.3.49-RELEASE import

Browse Source 
*) Bugfix: in the "set" directive.

    *) Bugfix: if two or more FastCGI subrequests was in SSI, then first
       subrequest output was included instead of second and following
       subrequests.
This commit is contained in:
Igor Sysoev 2006-05-31 14:11:45 +00:00
parent e50ef56c96
commit af3b7ea9ad
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,32 @@
<title lang="en">nginx changelog</title>
<changes ver="0.3.49" date="31.05.2006">
<change type="bugfix">
<para lang="ru">
× ÄÉÒÅËÔÉ×Å set.
</para>
<para lang="en">
in the "set" directive.
</para>
</change>
<change type="bugfix">
<para lang="ru">
ÐÒÉ ×ËÌÀÞÅÎÉÉ × ssi Ä×ÕÈ É ÂÏÌÅÅ ÐÏÄÚÁÐÒÏÓÏ×, ÏÂÒÁÂÁÔÙ×ÁÅÍÙÈ ÞÅÒÅÚ FastCGI,
×ÍÅÓÔÏ ×Ù×ÏÄÁ ×ÔÏÒÏÇÏ É ÏÓÔÁÌØÎÙÈ ÐÏÄÚÁÐÒÏÓÏ× × ÏÔ×ÅÔ ×ËÌÀÞÁÌÓÑ ×Ù×ÏÄ
ÐÅÒ×ÏÇÏ ÐÏÄÚÁÐÒÏÓÁ.
</para>
<para lang="en">
if two or more FastCGI subrequests was in SSI, then first subrequest output
was included instead of second and following subrequests.
</para>
</change>
</changes>
<changes ver="0.3.48" date="29.05.2006">
<change type="change">

2
src/core/nginx.h
View File

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

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

@ -1476,7 +1476,7 @@ ngx_http_fastcgi_add_variables(ngx_conf_t *cf)
ngx_http_variable_t *var;
var = ngx_http_add_variable(cf, &ngx_http_fastcgi_script_name,
NGX_HTTP_VAR_NOHASH);
NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHABLE);
if (var == NULL) {
return NGX_ERROR;
}

4
src/http/ngx_http_script.c
View File

@ -501,7 +501,7 @@ ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e)
&& (e->request->quoted_uri || e->request->plus_in_uri))
{
return e->captures[code->n + 1] - e->captures[code->n]
+ ngx_escape_uri(NULL,
+ 2 * ngx_escape_uri(NULL,
&e->line.data[e->captures[code->n]],
e->captures[code->n + 1] - e->captures[code->n],
NGX_ESCAPE_ARGS);
@ -1016,9 +1016,11 @@ ngx_http_script_complex_value_code(ngx_http_script_engine_t *e)
ngx_memzero(&le, sizeof(ngx_http_script_engine_t));
le.ip = code->lengths->elts;
le.line = e->line;
le.request = e->request;
le.captures = e->captures;
le.ncaptures = e->ncaptures;
le.quote = e->quote;
for (len = 0; *(uintptr_t *) le.ip; len += lcode(&le)) {
lcode = *(ngx_http_script_len_code_pt *) le.ip;