diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2010-02-05 18:59:05 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2010-02-05 18:59:05 +0000 |
| commit | 1947334023c101fb1ad455dd0e18d44dd5a2ec94 (patch) | |
| tree | e5c2e81746cfcb2c3328a2000f954809a2f6cfd9 | |
| parent | 3a239b15e94cdec8b2205e0d1f3d3cc9032db457 (diff) | |
| download | php-git-1947334023c101fb1ad455dd0e18d44dd5a2ec94.tar.gz | |
Fix bug #50940
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache/mod_php5.c | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 2 |
4 files changed, 8 insertions, 0 deletions
@@ -23,6 +23,8 @@ PHP NEWS links or invalid paths. (Pierre) - Fixed error output to stderr on Windows. (Pierre) +- Fixed bug #50940 Custom content-length set incorrectly in Apache sapis. + (Brian France, Rasmus) - Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX). (Ilia) - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation). diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index c980597841..9711e3fa70 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -196,6 +196,8 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head if (!strcasecmp(header_name, "Content-Type")) { r->content_type = pstrdup(r->pool, header_content); + } else if (!strcasecmp(header_name, "Content-Length")) { + ap_set_content_length(r, strtol(header_content, (char **)NULL, 10)); } else if (!strcasecmp(header_name, "Set-Cookie")) { table_add(r->headers_out, header_name, header_content); } else if (op == SAPI_HEADER_REPLACE) { diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 219ae15caf..c9719b5ed7 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -127,6 +127,8 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_header_op_e if (!strcasecmp(sapi_header->header, "content-type")) ctx->r->content_type = apr_pstrdup(ctx->r->pool, val); + else if (!strcasecmp(sapi_header->header, "content-length")) + ap_set_content_length(ctx->r, strtol(val, (char **)NULL, 10)); else if (op == SAPI_HEADER_REPLACE) apr_table_set(ctx->r->headers_out, sapi_header->header, val); else diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index ff63c72cef..386bef0dbc 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -119,6 +119,8 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_header_op_e efree(ctx->content_type); } ctx->content_type = estrdup(val); + } else if (!strcasecmp(sapi_header->header, "content-length")) { + ap_set_content_length(ctx->r, strtol(val, (char **)NULL, 10)); } else if (op == SAPI_HEADER_REPLACE) { apr_table_set(ctx->r->headers_out, sapi_header->header, val); } else { |