tony2001 Mon Jun 20 08:46:52 2005 EDT
Modified files: (Branch: PHP_5_0)
/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:
MFH: fix #29683 (headers_list() returns empty array)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.435&r2=1.1760.2.436&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.435 php-src/NEWS:1.1760.2.436
--- php-src/NEWS:1.1760.2.435 Fri Jun 17 12:37:07 2005
+++ php-src/NEWS Mon Jun 20 08:46:51 2005
@@ -156,6 +156,7 @@
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
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.1&r2=1.10.2.2&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.10.2.1
php-src/sapi/apache/mod_php5.c:1.10.2.2
--- php-src/sapi/apache/mod_php5.c:1.10.2.1 Thu May 19 12:06:38 2005
+++ php-src/sapi/apache/mod_php5.c Mon Jun 20 08:46:52 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.10.2.1 2005/05/19 16:06:38 rasmus Exp $ */
+/* $Id: mod_php5.c,v 1.10.2.2 2005/06/20 12:46:52 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.125.2.3&r2=1.125.2.4&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3
php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4
--- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3 Mon Apr 11 11:39:21 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Mon Jun 20 08:46:52 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.125.2.3 2005/04/11 15:39:21 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.125.2.4 2005/06/20 12:46:52 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.40.2.8&r2=1.40.2.9&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.9
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8 Fri Apr 8 16:34:03 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jun 20 08:46:52 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.8 2005/04/08 20:34:03 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.9 2005/06/20 12:46:52 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.4.2.1&r2=1.4.2.2&ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1
php-src/sapi/apache_hooks/mod_php5.c:1.4.2.2
--- php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1 Fri Apr 22 05:14:29 2005
+++ php-src/sapi/apache_hooks/mod_php5.c Mon Jun 20 08:46:52 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.4.2.1 2005/04/22 09:14:29 tony2001 Exp $ */
+/* $Id: mod_php5.c,v 1.4.2.2 2005/06/20 12:46:52 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
