diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-05-15 08:17:08 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-05-15 08:17:08 +0000 |
| commit | 633aff55410ddaea32fb28547b5655c8f7bffc11 (patch) | |
| tree | de4b2691be1326b827c563a2a6f5ebbc7c9c45ad | |
| parent | 727109283d60b296bb0dbf91dcf4a0996a42b286 (diff) | |
| download | php-git-633aff55410ddaea32fb28547b5655c8f7bffc11.tar.gz | |
Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in "Status:" header)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -10,6 +10,8 @@ PHP NEWS - Fixed altering $this via argument named "this". (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed segfault in strripos(). (Tony, Joxean Koret) +- Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in + "Status:" header). (Dmitry) - Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob) - Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia) - Fixed bug #41351 (Invalid opcode with foreach ($a[] as $b)). (Dmitry, Tony) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 473a074231..b59a3994aa 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -331,7 +331,16 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) } } else { - len = slprintf(buf, sizeof(buf), "Status: %d\r\n", SG(sapi_headers).http_response_code); + char *s; + + if (SG(sapi_headers).http_status_line && + (s = strchr(SG(sapi_headers).http_status_line, ' ')) != 0 && + (s - SG(sapi_headers).http_status_line) >= 5 && + strncasecmp(SG(sapi_headers).http_status_line, "HTTP/", 5) == 0) { + len = slprintf(buf, sizeof(buf), "Status:%s\r\n", s); + } else { + len = slprintf(buf, sizeof(buf), "Status: %d\r\n", SG(sapi_headers).http_response_code); + } } PHPWRITE_H(buf, len); |