Mercurial > hg > nginx
comparison src/http/modules/ngx_http_scgi_module.c @ 4050:36d2cd2e361d stable-1.0
Merge of r4016:
Fix ignored headers handling in fastcgi/scgi/uwsgi.
The bug had appeared in r3561 (fastcgi), r3638 (scgi), r3567 (uwsgi).
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 29 Aug 2011 14:13:46 +0000 |
| parents | 2d062c031fff |
| children | 9d59a8eda373 |
comparison
equal
deleted
inserted
replaced
| 4049:01855743e3f6 | 4050:36d2cd2e361d |
|---|---|
| 559 | 559 |
| 560 allocated = 0; | 560 allocated = 0; |
| 561 lowcase_key = NULL; | 561 lowcase_key = NULL; |
| 562 | 562 |
| 563 if (scf->header_params) { | 563 if (scf->header_params) { |
| 564 ignored = ngx_palloc(r->pool, scf->header_params * sizeof(void *)); | 564 n = 0; |
| 565 part = &r->headers_in.headers.part; | |
| 566 | |
| 567 while (part) { | |
| 568 n += part->nelts; | |
| 569 part = part->next; | |
| 570 } | |
| 571 | |
| 572 ignored = ngx_palloc(r->pool, n * sizeof(void *)); | |
| 565 if (ignored == NULL) { | 573 if (ignored == NULL) { |
| 566 return NGX_ERROR; | 574 return NGX_ERROR; |
| 567 } | 575 } |
| 568 } | 576 } |
| 569 | 577 |