FYI: PHP_5_2 is not dead. You should always merge bug fixes to that branch too..
--Jani
Kalle Sommer Nielsen kirjoitti:
kalle Mon Aug 4 06:18:27 2008 UTC
Modified files:
/php-src/ext/session session.c
Log:
Fixes #45406 - Patch by oleg dot grenrus at dynamoid dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.486&r2=1.487&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.486 php-src/ext/session/session.c:1.487
--- php-src/ext/session/session.c:1.486 Sat Aug 2 04:40:44 2008
+++ php-src/ext/session/session.c Mon Aug 4 06:18:27 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.486 2008/08/02 04:40:44 felipe Exp $ */
+/* $Id: session.c,v 1.487 2008/08/04 06:18:27 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1877,14 +1877,24 @@
if (value) {
PS(mod) = _php_find_ps_module(value TSRMLS_CC);
}
+ }
+
+ if (PS(serializer) == NULL) {
+ char *value;
- if (!PS(mod)) {
- /* current status is unusable */
- PS(session_status) = php_session_disabled;
- return SUCCESS;
+ value = zend_ini_string("session.serialize_handler",
sizeof("session.serialize_handler"), 0);
+ if(value) {
+ PS(serializer) = _php_find_ps_serializer(value
TSRMLS_CC);
}
}
+ if (PS(mod) == NULL || PS(serializer) == NULL) {
+ /* current status is unusable */
+ PS(session_status) = php_session_disabled;
+
+ return SUCCESS;
+ }
+
if (PS(auto_start)) {
php_session_start(TSRMLS_C);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
