tony2001 Mon Aug 28 19:57:57 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
/php-src NEWS
Log:
MFH: make sure ext/standard is down before ext/session (fixes #38534)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.21&r2=1.725.2.31.2.22&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.21
php-src/ext/standard/basic_functions.c:1.725.2.31.2.22
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.21 Mon Aug 28
18:58:47 2006
+++ php-src/ext/standard/basic_functions.c Mon Aug 28 19:57:57 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.21 2006/08/28 18:58:47 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.22 2006/08/28 19:57:57 tony2001 Exp $
*/
#include "php.h"
#include "php_streams.h"
@@ -3800,9 +3800,15 @@
PHP_INI_ENTRY_EX("safe_mode_allowed_env_vars",
SAFE_MODE_ALLOWED_ENV_VARS, PHP_INI_SYSTEM, OnUpdateSafeModeAllowedEnvVars,
NULL)
PHP_INI_END()
+static zend_module_dep standard_deps[] = {
+ ZEND_MOD_OPTIONAL("session")
+ {NULL, NULL, NULL}
+};
zend_module_entry basic_functions_module = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER_EX,
+ NULL,
+ standard_deps,
"standard", /* extension name */
basic_functions, /* function list */
PHP_MINIT(basic), /* process startup */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.222&r2=1.2027.2.547.2.223&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.222 php-src/NEWS:1.2027.2.547.2.223
--- php-src/NEWS:1.2027.2.547.2.222 Mon Aug 28 17:15:03 2006
+++ php-src/NEWS Mon Aug 28 19:57:57 2006
@@ -11,6 +11,8 @@
low). (Dmitry)
- Fixed bug #38535 (memory corruption in pdo_pgsql driver on error retrieval
inside a failed query executed via query() method). (Ilia)
+- Fixed bug #38534 (segfault when calling setlocale() in userspace session
+ handler). (Tony)
- Fixed bug #38524 (strptime() does not initialize the internal date storage
structure). (Ilia)
- Fixed bug #38511, #38473, #38263 (Fixed session extension request shutdown
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
