fix #29683 (headers_list() returns empty array)

diff --git a/NEWS b/NEWS
index bbf85618de010ae632a7e42d87ab4dc2262674b8..a8ee9b013d270c723807371947482b4edcc25a76 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 98c3d73b29e6cd46d9e2f6e82379e8754c383dbc..41484308c948e3499a2c3f5b71e27d334aa2c19f 100644 (file)
--- 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 f92fdad0ec6d9b3ea07749e66f2500f4efdeca7d..6f92f7c35a48969554b12c4812081cc1646e6aeb 100644 (file)
--- 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 d7f18f113109d5cac6d528b0f0484bedab2c25dd..72b181371b17c4f5c8a45765ca2cbccac52022eb 100644 (file)
--- 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 298e0470c5c4ca57377023dc7a067d6ba1665802..ebb4f8a3408b8cd6caafc240d1f5cf27e71ea334 100644 (file)
--- 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;
 }
 /* }}} */