moriyoshi Sat Mar 5 11:41:13 2005 EDT
Modified files:
/php-src NEWS
/php-src/main php_content_types.c php_content_types.h SAPI.c
Log:
- Fixed bug #32109 ($_POST is not populated in multithreaded environment).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1845&r2=1.1846&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1845 php-src/NEWS:1.1846
--- php-src/NEWS:1.1845 Wed Mar 2 13:28:31 2005
+++ php-src/NEWS Sat Mar 5 11:41:13 2005
@@ -67,6 +67,8 @@
- Fixed bug with raw_post_data not getting set. (Brian)
- Fixed bug in mysql::client_version(). (Georg)
- Fixed ZTS destruction. (Marcus)
+- Fixed bug #32109 ($_POST is not populated in multithreaded environment).
+ (Moriyoshi)
- Fixed bug #31478 (segfault with empty() / isset()). (Moriyoshi)
- Fixed bug #31033 (php:function(string, nodeset) with xsl:key crashes PHP).
(Rob)
http://cvs.php.net/diff.php/php-src/main/php_content_types.c?r1=1.30&r2=1.31&ty=u
Index: php-src/main/php_content_types.c
diff -u php-src/main/php_content_types.c:1.30
php-src/main/php_content_types.c:1.31
--- php-src/main/php_content_types.c:1.30 Mon Feb 21 10:14:02 2005
+++ php-src/main/php_content_types.c Sat Mar 5 11:41:13 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_content_types.c,v 1.30 2005/02/21 15:14:02 moriyoshi Exp $ */
+/* $Id: php_content_types.c,v 1.31 2005/03/05 16:41:13 moriyoshi Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -74,7 +74,6 @@
*/
int php_startup_sapi_content_types(TSRMLS_D)
{
- sapi_register_post_entries(php_post_entries TSRMLS_CC);
sapi_register_default_post_reader(php_default_post_reader);
sapi_register_treat_data(php_default_treat_data);
sapi_register_input_filter(php_default_input_filter);
@@ -82,6 +81,16 @@
}
/* }}} */
+/* {{{ php_setup_sapi_content_types
+ */
+int php_setup_sapi_content_types(TSRMLS_D)
+{
+ sapi_register_post_entries(php_post_entries TSRMLS_CC);
+
+ return SUCCESS;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/diff.php/php-src/main/php_content_types.h?r1=1.10&r2=1.11&ty=u
Index: php-src/main/php_content_types.h
diff -u php-src/main/php_content_types.h:1.10
php-src/main/php_content_types.h:1.11
--- php-src/main/php_content_types.h:1.10 Mon Feb 21 10:14:02 2005
+++ php-src/main/php_content_types.h Sat Mar 5 11:41:13 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_content_types.h,v 1.10 2005/02/21 15:14:02 moriyoshi Exp $ */
+/* $Id: php_content_types.h,v 1.11 2005/03/05 16:41:13 moriyoshi Exp $ */
#ifndef PHP_CONTENT_TYPES_H
#define PHP_CONTENT_TYPES_H
@@ -26,5 +26,6 @@
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler);
int php_startup_sapi_content_types(TSRMLS_D);
+int php_setup_sapi_content_types(TSRMLS_D);
#endif /* PHP_CONTENT_TYPES_H */
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.196&r2=1.197&ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.196 php-src/main/SAPI.c:1.197
--- php-src/main/SAPI.c:1.196 Tue Feb 22 00:07:37 2005
+++ php-src/main/SAPI.c Sat Mar 5 11:41:13 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.c,v 1.196 2005/02/22 05:07:37 moriyoshi Exp $ */
+/* $Id: SAPI.c,v 1.197 2005/03/05 16:41:13 moriyoshi Exp $ */
#include <ctype.h>
#include <sys/stat.h>
@@ -61,6 +61,7 @@
{
memset(sapi_globals, 0, sizeof(*sapi_globals));
zend_hash_init_ex(&sapi_globals->known_post_content_types, 5, NULL,
NULL, 1, 0);
+ php_setup_sapi_content_types(TSRMLS_C);
}
static void sapi_globals_dtor(sapi_globals_struct *sapi_globals TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
