Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_module.c @ 4662:979e0f5b196d stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4616: r->state fix. Added r->state reset on fastcgi/scgi/uwsgi request start. Failing to do so results in problems if 400 or 414 requests are redirected to fastcgi/scgi/uwsgi upstream, as well as after invalid headers got from upstream. This was already fixed for proxy in r3478, but fastcgi (the only affected protocol at that time) was missed. Reported by Matthieu Tourne.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 04 Jun 2012 10:54:48 +0000
parents 834049edae24
children 5a44d638cd27 05beaa2d87b3
comparison
equal deleted inserted replaced
4661:eb565752dd8e 4662:979e0f5b196d
432 u->create_request = ngx_http_scgi_create_request; 432 u->create_request = ngx_http_scgi_create_request;
433 u->reinit_request = ngx_http_scgi_reinit_request; 433 u->reinit_request = ngx_http_scgi_reinit_request;
434 u->process_header = ngx_http_scgi_process_status_line; 434 u->process_header = ngx_http_scgi_process_status_line;
435 u->abort_request = ngx_http_scgi_abort_request; 435 u->abort_request = ngx_http_scgi_abort_request;
436 u->finalize_request = ngx_http_scgi_finalize_request; 436 u->finalize_request = ngx_http_scgi_finalize_request;
437 r->state = 0;
437 438
438 u->buffering = scf->upstream.buffering; 439 u->buffering = scf->upstream.buffering;
439 440
440 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); 441 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t));
441 if (u->pipe == NULL) { 442 if (u->pipe == NULL) {
841 status->count = 0; 842 status->count = 0;
842 status->start = NULL; 843 status->start = NULL;
843 status->end = NULL; 844 status->end = NULL;
844 845
845 r->upstream->process_header = ngx_http_scgi_process_status_line; 846 r->upstream->process_header = ngx_http_scgi_process_status_line;
847 r->state = 0;
846 848
847 return NGX_OK; 849 return NGX_OK;
848 } 850 }
849 851
850 852