cvs: php-src(PHP_5_2) /ext/session session.c

kalle Wed Aug 6 21:28:39 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/session session.c Log: Backport fix for #45406 - Patch by oleg dot grenrus at dynamoid dot com http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.43&r2=1.417.2.8.2.44&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.43 php-src/ext/session/session.c:1.417.2.8.2.44 --- php-src/ext/session/session.c:1.417.2.8.2.43 Wed Jun 11 07:46:43 2008 +++ php-src/ext/session/session.c Wed Aug 6 21:28:38 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.43 2008/06/11 07:46:43 dmitry Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.44 2008/08/06 21:28:38 kalle Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1925,6 +1925,21 @@ } } + if (PS(serializer) == NULL) { + char *value; + + 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); }