tony2001 Mon Jun 20 08:46:35 2005 EDT
Modified files:
/php-src NEWS
/php-src/sapi/apache mod_php5.c
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
/php-src/sapi/apache_hooks mod_php5.c
Log:
fix #29683 (headers_list() returns empty array)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1939&r2=1.1940&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1939 php-src/NEWS:1.1940
--- php-src/NEWS:1.1939 Mon Jun 20 04:47:51 2005
+++ php-src/NEWS Mon Jun 20 08:46:32 2005
@@ -34,6 +34,7 @@
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)
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.15&r2=1.16&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.15 php-src/sapi/apache/mod_php5.c:1.16
--- php-src/sapi/apache/mod_php5.c:1.15 Thu May 19 11:57:45 2005
+++ php-src/sapi/apache/mod_php5.c Mon Jun 20 08:46:34 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.15 2005/05/19 15:57:45 rasmus Exp $ */
+/* $Id: mod_php5.c,v 1.16 2005/06/20 12:46:34 tony2001 Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -199,9 +199,7 @@
*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;
}
/* }}} */
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.134&r2=1.135&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.134
php-src/sapi/apache2filter/sapi_apache2.c:1.135
--- php-src/sapi/apache2filter/sapi_apache2.c:1.134 Fri Apr 8 16:32:13 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Mon Jun 20 08:46:34 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.134 2005/04/08 20:32:13 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.135 2005/06/20 12:46:34 tony2001 Exp $ */
#include <fcntl.h>
@@ -128,9 +128,7 @@
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
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.54&r2=1.55&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.54
php-src/sapi/apache2handler/sapi_apache2.c:1.55
--- php-src/sapi/apache2handler/sapi_apache2.c:1.54 Fri Apr 8 16:32:14 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jun 20 08:46:34 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.54 2005/04/08 20:32:14 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.55 2005/06/20 12:46:34 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -112,9 +112,7 @@
apr_table_add(ctx->r->headers_out, sapi_header->header, val);
}
- sapi_free_header(sapi_header);
-
- return 0;
+ return SAPI_HEADER_ADD;
}
static int
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.9
php-src/sapi/apache_hooks/mod_php5.c:1.10
--- php-src/sapi/apache_hooks/mod_php5.c:1.9 Tue Apr 19 07:41:04 2005
+++ php-src/sapi/apache_hooks/mod_php5.c Mon Jun 20 08:46:34 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.9 2005/04/19 11:41:04 sniper Exp $ */
+/* $Id: mod_php5.c,v 1.10 2005/06/20 12:46:34 tony2001 Exp $ */
#include "php_apache_http.h"
@@ -340,9 +340,7 @@
*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;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
