diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-06-20 12:46:34 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-06-20 12:46:34 +0000 |
| commit | 8be61d707fbc1c819cd4eebb5d90b0a6d4aeaf97 (patch) | |
| tree | 694f718b7e33800677d1736d082d038c8d40a82c | |
| parent | 6f3b02cba430ce01150b6bb298158878ce633415 (diff) | |
| download | php-git-8be61d707fbc1c819cd4eebb5d90b0a6d4aeaf97.tar.gz | |
fix #29683 (headers_list() returns empty array)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/apache/mod_php5.c | 4 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 | ||||
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 4 |
5 files changed, 5 insertions, 12 deletions
@@ -34,6 +34,7 @@ PHP NEWS PHP). (Marcus) - Fixed bug #31256 (PHP_EVAL_LIBLINE configure macro does not handle -pthread). (Jani) +- Fixed bug #29683 (headers_list() returns empty array). (Tony) - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut) - Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056 (strtotime() related bugs). (Derick) diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 98c3d73b29..41484308c9 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -199,9 +199,7 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header->header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index f92fdad0ec..6f92f7c35a 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -128,9 +128,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_str else apr_table_add(ctx->r->headers_out, sapi_header->header, val); - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index d7f18f1131..72b181371b 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -112,9 +112,7 @@ php_apache_sapi_header_handler(sapi_header_struct *sapi_header,sapi_headers_stru apr_table_add(ctx->r->headers_out, sapi_header->header, val); } - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 298e0470c5..ebb4f8a340 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -340,9 +340,7 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header->header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ |