MFH: fix #29683 (headers_list() returns empty array)

diff --git a/NEWS b/NEWS
index aee549593ec267f1c2a301faa5ceb6a4c49655b4..63d66b1eb9fb7f65a3b3b6cb8867dbfeb6512554 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -156,6 +156,7 @@ PHP                                                                        NEWS
   handler). (Tony)
 - Fixed bug #29971 (variables_order behaviour). (Dmitry)
 - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry)
+- Fixed bug #29683 (headers_list() returns empty array). (Tony)
 - Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez)
 - Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia)
 - Fixed bug #29210 (Function: is_callable - no support for private and

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 6eed907128fdcbd8358e4e53cc2e4ca494519f86..74707ce7f2b5e05a5f2a238fdb1173b19332ea9b 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 bffacba13b0b8f0f3b756766a0aa13355078f230..02615ff8b6b62f335e0b618f83685a51dd704228 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 785f8647fcb058d8879a8cf18c43c2319d279c46..ad4e93bd490463e81b59b8205127b4ebda24e6bd 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 7b916d7e389d94d0548d818d11f1f519ddb1ab59..9b3d80c4f455ec6c279281f04ba80ce7a247e46c 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;
 }
 /* }}} */