From: Kalle Sommer Nielsen <kalle@php.net>
Date: Mon, 4 Aug 2008 06:18:27 +0000 (+0000)
Subject: Fixes #45406 - Patch by oleg dot grenrus at dynamoid dot com
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~883
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32db74f2e005013803d67cf6cffd965be428f77f;p=php

Fixes #45406 - Patch by oleg dot grenrus at dynamoid dot com
---

diff --git a/ext/session/session.c b/ext/session/session.c
index b1b8127124..985730851f 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1877,14 +1877,24 @@ static PHP_RINIT_FUNCTION(session)
 		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);
 	}