From: Yasuo Ohgaki <yohgaki@php.net>
Date: Wed, 6 Mar 2002 00:26:38 +0000 (+0000)
Subject: Raise error when session module failed to open or read
X-Git-Tag: php-4.2.0RC1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b17fd6031041ae30c40a93e2dfa234f7f9d624c2;p=php

Raise error when session module failed to open or read
---

diff --git a/ext/session/session.c b/ext/session/session.c
index a15ca9fe06..00b10d174a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -553,14 +553,18 @@ static void php_session_initialize(TSRMLS_D)
 	char *val;
 	int vallen;
 	
-	if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE) {
-		php_error(E_ERROR, "Failed to initialize session module");
+	if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name) TSRMLS_CC) == FAILURE) {
+		PS(session_status) = php_session_disabled;
+		php_error(E_WARNING, "Failed to initialize session module");
 		return;
 	}
-	if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
-		php_session_decode(val, vallen TSRMLS_CC);
-		efree(val);
+	if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == FAILURE) {
+		PS(session_status) = php_session_disabled;
+		php_error(E_WARNING, "Failed to read session data");
+		return;
 	}
+	php_session_decode(val, vallen TSRMLS_CC);
+	efree(val);
 }