diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-04-21 12:06:44 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-04-21 12:06:44 +0000 |
commit | 4ecb4d721de0d6ddc34dfff4dce294415b64b04b (patch) | |
tree | fe9970fbe823741145cee16261003083b31e949d /src/http/modules/ngx_http_fastcgi_module.c | |
parent | 7d2d90ce71669e5a5ccb91386d0529df39b1c804 (diff) | |
download | nginx-release-0.3.41.tar.gz nginx-release-0.3.41.zip |
nginx-0.3.41-RELEASE importrelease-0.3.41
*) Feature: the -v switch.
*) Bugfix: the segmentation fault may occurred if the SSI page has
remote subrequests.
*) Bugfix: in FastCGI handling.
*) Bugfix: if the perl modules path was not set using
--with-perl_modules_path=PATH or the "perl_modules", then the
segmentation fault was occurred.
Diffstat (limited to 'src/http/modules/ngx_http_fastcgi_module.c')
-rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index f901a5223..ff5511804 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -1173,6 +1173,11 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf) if (f->type == NGX_HTTP_FASTCGI_STDERR) { if (f->length) { + + if (f->pos == f->last) { + break; + } + line.data = f->pos; if (f->pos + f->length <= f->last) { @@ -1212,6 +1217,10 @@ ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf) /* f->type == NGX_HTTP_FASTCGI_STDOUT */ + if (f->pos == f->last) { + break; + } + if (p->free) { b = p->free->buf; p->free = p->free->next; |