From: Yasuo Ohgaki <yohgaki@php.net>
Date: Fri, 11 Nov 2016 03:52:17 +0000 (+0900)
Subject: Revert "Protect class based session save handler"
X-Git-Tag: php-7.1.0~3^2~35^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=186ff85588abc609bdd3438386887f70ad5c4f9d;p=php

Revert "Protect class based session save handler"

This reverts commit d1be861aee1287e8ecb04b72d93b9749ab67706e.
---

diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c
index 595338d299..b132552faf 100644
--- a/ext/session/mod_user_class.c
+++ b/ext/session/mod_user_class.c
@@ -53,7 +53,6 @@ PHP_METHOD(SessionHandler, open)
 	}
 
 	PS(mod_user_is_open) = 1;
-	PS(in_save_handler) = 1;
 
 	zend_try {
 		ret = PS(default_mod)->s_open(&PS(mod_data), save_path, session_name);
@@ -62,7 +61,6 @@ PHP_METHOD(SessionHandler, open)
 		zend_bailout();
 	} zend_end_try();
 
-	PS(in_save_handler) = 0;
 	RETVAL_BOOL(SUCCESS == ret);
 }
 /* }}} */
@@ -80,7 +78,6 @@ PHP_METHOD(SessionHandler, close)
 	zend_parse_parameters_none();
 
 	PS(mod_user_is_open) = 0;
-	PS(in_save_handler) = 1;
 
 	zend_try {
 		ret = PS(default_mod)->s_close(&PS(mod_data));
@@ -89,7 +86,6 @@ PHP_METHOD(SessionHandler, close)
 		zend_bailout();
 	} zend_end_try();
 
-	PS(in_save_handler) = 0;
 	RETVAL_BOOL(SUCCESS == ret);
 }
 /* }}} */
@@ -120,7 +116,6 @@ PHP_METHOD(SessionHandler, read)
 PHP_METHOD(SessionHandler, write)
 {
 	zend_string *key, *val;
-	zend_bool ret;
 
 	PS_SANITY_CHECK_IS_OPEN;
 
@@ -128,11 +123,7 @@ PHP_METHOD(SessionHandler, write)
 		return;
 	}
 
-	PS(in_save_handler) = 1;
-	ret = PS(default_mod)->s_write(&PS(mod_data), key, val, PS(gc_maxlifetime));
-	PS(in_save_handler) = 0;
-
-	RETURN_BOOL(SUCCESS == ret);
+	RETURN_BOOL(SUCCESS == PS(default_mod)->s_write(&PS(mod_data), key, val, PS(gc_maxlifetime)));
 }
 /* }}} */
 
@@ -141,7 +132,6 @@ PHP_METHOD(SessionHandler, write)
 PHP_METHOD(SessionHandler, destroy)
 {
 	zend_string *key;
-	zend_bool ret;
 
 	PS_SANITY_CHECK_IS_OPEN;
 
@@ -149,11 +139,7 @@ PHP_METHOD(SessionHandler, destroy)
 		return;
 	}
 
-	PS(in_save_handler) = 1;
-	ret = PS(default_mod)->s_destroy(&PS(mod_data), key);
-	PS(in_save_handler) = 0;
-
-	RETURN_BOOL(SUCCESS == ret);
+	RETURN_BOOL(SUCCESS == PS(default_mod)->s_destroy(&PS(mod_data), key));
 }
 /* }}} */
 
@@ -170,12 +156,9 @@ PHP_METHOD(SessionHandler, gc)
 		return;
 	}
 
-	PS(in_save_handler) = 1;
 	if (PS(default_mod)->s_gc(&PS(mod_data), maxlifetime, &nrdels) == FAILURE) {
-		PS(in_save_handler) = 0;
 		RETURN_FALSE;
 	}
-	PS(in_save_handler) = 0;
 	RETURN_LONG(nrdels);
 }
 /* }}} */
@@ -192,9 +175,7 @@ PHP_METHOD(SessionHandler, create_sid)
 	    return;
 	}
 
-	PS(in_save_handler) = 1;
 	id = PS(default_mod)->s_create_sid(&PS(mod_data));
-	PS(in_save_handler) = 0;
 
 	RETURN_STR(id);
 }
@@ -222,7 +203,6 @@ PHP_METHOD(SessionHandler, validateId)
 PHP_METHOD(SessionHandler, updateTimestamp)
 {
 	zend_string *key, *val;
-	zend_bool ret;
 
 	PS_SANITY_CHECK_IS_OPEN;
 
@@ -230,11 +210,7 @@ PHP_METHOD(SessionHandler, updateTimestamp)
 		return;
 	}
 
-	PS(in_save_handler) = 1;
-	ret = PS(default_mod)->s_write(&PS(mod_data), key, val, PS(gc_maxlifetime));
-	PS(in_save_handler) = 0;
-
 	/* Legacy save handler may not support update_timestamp API. Just write. */
-	RETVAL_BOOL(SUCCESS == ret);
+	RETVAL_BOOL(SUCCESS == PS(default_mod)->s_write(&PS(mod_data), key, val, PS(gc_maxlifetime)));
 }
 /* }}} */