ZVAL_STRING(&args[0], (char*)save_path);
ZVAL_STRING(&args[1], (char*)session_name);
- zend_try {
- ps_call_handler(&PSF(open), 2, args, &retval);
- } zend_catch {
- PS(session_status) = php_session_none;
- if (!Z_ISUNDEF(retval)) {
- zval_ptr_dtor(&retval);
- }
- zend_bailout();
- } zend_end_try();
-
+ ps_call_handler(&PSF(open), 2, args, &retval);
PS(mod_user_implemented) = 1;
FINISH;
#include "php_session.h"
#define PS_SANITY_CHECK \
- if (PS(session_status) != php_session_active) { \
- php_error_docref(NULL, E_WARNING, "Session is not active"); \
- RETURN_FALSE; \
- } \
if (PS(default_mod) == NULL) { \
php_error_docref(NULL, E_CORE_ERROR, "Cannot call default session handler"); \
RETURN_FALSE; \
{
char *save_path = NULL, *session_name = NULL;
size_t save_path_len, session_name_len;
- int ret;
PS_SANITY_CHECK;
}
PS(mod_user_is_open) = 1;
-
- zend_try {
- ret = PS(default_mod)->s_open(&PS(mod_data), save_path, session_name);
- } zend_catch {
- PS(session_status) = php_session_none;
- zend_bailout();
- } zend_end_try();
-
- RETVAL_BOOL(SUCCESS == ret);
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_open(&PS(mod_data), save_path, session_name));
}
/* }}} */
Wraps the old close handler */
PHP_METHOD(SessionHandler, close)
{
- int ret;
-
PS_SANITY_CHECK_IS_OPEN;
// don't return on failure, since not closing the default handler
zend_parse_parameters_none();
PS(mod_user_is_open) = 0;
-
- zend_try {
- ret = PS(default_mod)->s_close(&PS(mod_data));
- } zend_catch {
- PS(session_status) = php_session_none;
- zend_bailout();
- } zend_end_try();
-
- RETVAL_BOOL(SUCCESS == ret);
+ RETVAL_BOOL(SUCCESS == PS(default_mod)->s_close(&PS(mod_data)));
}
/* }}} */
# include "ext/hash/php_hash.h"
#endif
-#define PHP_SESSION_API 20150121
+#define PHP_SESSION_API 20160121
#include "php_version.h"
#define PHP_SESSION_VERSION PHP_VERSION
#define APPLY_TRANS_SID (PS(use_trans_sid) && !PS(use_only_cookies))
static void php_session_send_cookie(void);
-static void php_session_abort(void);
/* Dispatched by RINIT and by php_session_destroy */
static inline void php_rinit_session_globals(void) /* {{{ */
{
/* Do NOT init PS(mod_user_names) here! */
- /* TODO: These could be moved to MINIT and removed. These should be initialized by php_rshutdown_session_globals() always when execution is finished. */
PS(id) = NULL;
PS(session_status) = php_session_none;
PS(mod_data) = NULL;
zend_string_release(PS(id));
PS(id) = NULL;
}
-
if (PS(session_vars)) {
zend_string_release(PS(session_vars));
PS(session_vars) = NULL;
}
-
- /* User save handlers may end up directly here by misuse, bugs in user script, etc. */
- /* Set session status to prevent error while restoring save handler INI value. */
- PS(session_status) = php_session_none;
}
/* }}} */
{
zend_string *val = NULL;
- PS(session_status) = php_session_active;
-
if (!PS(mod)) {
- PS(session_status) = php_session_disabled;
php_error_docref(NULL, E_ERROR, "No storage module chosen - failed to initialize session");
return;
}
if (PS(mod)->s_open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE
/* || PS(mod_data) == NULL */ /* FIXME: open must set valid PS(mod_data) with success */
) {
- php_session_abort();
php_error_docref(NULL, E_ERROR, "Failed to initialize storage module: %s (path: %s)", PS(mod)->s_name, PS(save_path));
return;
}
/* If there is no ID, use session module to create one */
- if (!PS(id) || !ZSTR_VAL(PS(id))[0]) {
- if (PS(id)) {
- zend_string_release(PS(id));
- }
+ if (!PS(id)) {
PS(id) = PS(mod)->s_create_sid(&PS(mod_data));
if (!PS(id)) {
- php_session_abort();
php_error_docref(NULL, E_ERROR, "Failed to create session ID: %s (path: %s)", PS(mod)->s_name, PS(save_path));
return;
}
}
php_session_reset_id();
+ PS(session_status) = php_session_active;
/* GC must be done before read */
php_session_gc();
/* Read data */
php_session_track_init();
if (PS(mod)->s_read(&PS(mod_data), PS(id), &val, PS(gc_maxlifetime)) == FAILURE) {
- php_session_abort();
/* Some broken save handler implementation returns FAILURE for non-existent session ID */
/* It's better to raise error for this, but disabled error for better compatibility */
- php_error_docref(NULL, E_WARNING, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path));
- return;
+ /*
+ php_error_docref(NULL, E_NOTICE, "Failed to read session data: %s (path: %s)", PS(mod)->s_name, PS(save_path));
+ */
}
if (PS(session_vars)) {
zend_string_release(PS(session_vars));
PHPAPI int php_session_register_serializer(const char *name, zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)) /* {{{ */
{
- int ret = FAILURE;
+ int ret = -1;
int i;
for (i = 0; i < MAX_SERIALIZERS; i++) {
ps_serializers[i].encode = encode;
ps_serializers[i].decode = decode;
ps_serializers[i + 1].name = NULL;
- ret = SUCCESS;
+ ret = 0;
break;
}
}
PHPAPI int php_session_register_module(ps_module *ptr) /* {{{ */
{
- int ret = FAILURE;
+ int ret = -1;
int i;
for (i = 0; i < MAX_MODULES; i++) {
if (!ps_modules[i]) {
ps_modules[i] = ptr;
- ret = SUCCESS;
+ ret = 0;
break;
}
}
php_session_cache_limiter_t *lim;
if (PS(cache_limiter)[0] == '\0') return 0;
- if (PS(session_status) != php_session_active) return -1;
if (SG(headers_sent)) {
const char *output_start_filename = php_output_get_start_filename();
int output_start_lineno = php_output_get_start_lineno();
- php_session_abort();
if (output_start_filename) {
php_error_docref(NULL, E_WARNING, "Cannot send session cache limiter - headers already sent (output started at %s:%d)", output_start_filename, output_start_lineno);
} else {
static void php_session_flush(int write) /* {{{ */
{
if (PS(session_status) == php_session_active) {
- php_session_save_current_state(write);
PS(session_status) = php_session_none;
+ php_session_save_current_state(write);
}
}
/* }}} */
static void php_session_abort(void) /* {{{ */
{
if (PS(session_status) == php_session_active) {
+ PS(session_status) = php_session_none;
if (PS(mod_data) || PS(mod_user_implemented)) {
PS(mod)->s_close(&PS(mod_data));
}
- PS(session_status) = php_session_none;
}
}
/* }}} */
return;
}
- if (PS(session_status) != php_session_active) {
- php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - session is not active");
+ if (SG(headers_sent) && PS(use_cookies)) {
+ php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - headers already sent");
RETURN_FALSE;
}
- if (SG(headers_sent) && PS(use_cookies)) {
- php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - headers already sent");
+ if (PS(session_status) != php_session_active) {
+ php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - session is not active");
RETURN_FALSE;
}
zend_string_release(PS(id));
PS(id) = PS(mod)->s_create_sid(&PS(mod_data));
if (!PS(id)) {
- PS(mod)->s_close(&PS(mod_data));
PS(session_status) = php_session_none;
php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create session ID by collision: %s (path: %s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
}
/* Read is required to make new session data at this point. */
if (PS(mod)->s_read(&PS(mod_data), PS(id), &data, PS(gc_maxlifetime)) == FAILURE) {
- PS(mod)->s_close(&PS(mod_data));
PS(session_status) = php_session_none;
php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failed to create(read) session ID: %s (path: %s)", PS(mod)->s_name, PS(save_path));
RETURN_FALSE;
RETURN_FALSE;
}
+ if (PS(id) && !(ZSTR_LEN(PS(id)))) {
+ php_error_docref(NULL, E_WARNING, "Cannot start session with empty session ID");
+ RETURN_FALSE;
+ }
+
/* set options */
if (options) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(options), num_idx, str_idx, value) {
print "I live\n";
?>
--EXPECTF--
-Warning: session_start(): Failed to read session data: files (path: 123;:/really%scompletely:::/invalid;;,23123;213) in %s on line %d
+Warning: session_write_close(): Failed to write session data (files). Please verify that the current setting of session.save_path is correct (123;:/really%scompletely:::/invalid;;,23123;213) in %s on line %d
I live
$x->gc(1);
?>
--EXPECTF--
-Warning: SessionHandler::gc(): Session is not active in %s on line %d
+Warning: SessionHandler::gc(): Parent session handler is not open in %s on line %d
session_write_close();
echo "um, hi\n";
-/*
-FIXME: Since session module try to write/close session data in
-RSHUTDOWN, write() is executed twices. This is caused by undefined
-function error and zend_bailout(). Current session module codes
-depends on this behavior. These codes should be modified to remove
-multiple write().
-*/
-
?>
--EXPECTF--
write: goodbye cruel world
-write: goodbye cruel world
close: goodbye cruel world
session_write_close();
echo "um, hi\n";
-/*
-FIXME: Something wrong. It should try to close after error, otherwise session
-may keep "open" state.
-*/
-
?>
--EXPECTF--
write: goodbye cruel world
#1 %s(%d): session_write_close()
#2 {main}
thrown in %s on line %d
-
return strlen($ext);
}
-function open ($save_path, $session_name) {
+function open ($save_path, $session_name) {
return true;
-}
+}
-function close() {
+function close() {
return true;
-}
+}
-function read ($id) {
- return '';
-}
+function read ($id) {
+}
-function write ($id, $sess_data) {
+function write ($id, $sess_data) {
ob_start("output_html");
echo "laruence";
ob_end_flush();
return true;
-}
+}
-function destroy ($id) {
- return true;
-}
+function destroy ($id) {
+}
-function gc ($maxlifetime) {
- return true;
-}
+function gc ($maxlifetime) {
+ return true;
+}
-session_set_save_handler ("open", "close", "read", "write", "destroy", "gc");
+session_set_save_handler ("open", "close", "read", "write", "destroy", "gc");
session_start();
--EXPECTF--
8
(new SessionHandler)->create_sid();
--EXPECTF--
-Warning: SessionHandler::create_sid(): Session is not active in %s on line %d
-
+Fatal error: SessionHandler::create_sid(): Cannot call default session handler in %s on line %d
--SKIPIF--
<?php include('skipif.inc'); ?>
--INI--
-session.use_strict_mode=0
-session.hash_function=1
-session.hash_bits_per_character=4
--FILE--
<?php
-// Empty session ID may happen by browser bugs
-
// Could also be set with a cookie like "PHPSESSID=; path=/"
session_id('');
-// Start the session with empty string should result in new session ID
+// Will still start the session and return true
var_dump(session_start());
-// Returns newly created session ID
+// Returns an empty string
var_dump(session_id());
?>
--EXPECTF--
-bool(true)
-string(40) "%s"
+Warning: session_start(): Cannot start session with empty session ID in %s on line %d
+bool(false)
+string(0) ""
+++ /dev/null
---TEST--
-Bug #69111 (Crash in SessionHandler::read())
---INI--
-session.save_path=
-session.save_handler=files
-session.name=PHPSESSID
---SKIPIF--
-<?php include('skipif.inc'); ?>
---FILE--
-<?php
-$sh = new SessionHandler;
-session_set_save_handler($sh);
-
-$savePath = ini_get('session.save_path');
-$sessionName = ini_get('session.name');
-
-// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data.
-
-$sh->open($savePath, $sessionName);
-$sh->write("foo", "bar");
-$sh->read($id);
-$sh->gc(1245);
-$sh->close();
-?>
---EXPECTF--
-Warning: SessionHandler::open(): Session is not active in %s on line 10
-
-Warning: SessionHandler::write(): Session is not active in %s on line 11
-
-Notice: Undefined variable: id in %s on line 12
-
-Warning: SessionHandler::read(): Session is not active in %s on line 12
-
-Warning: SessionHandler::gc(): Session is not active in %s on line 13
-
-Warning: SessionHandler::close(): Session is not active in %s on line 14
\ No newline at end of file
+++ /dev/null
---TEST--
-Bug #70133 (Extended SessionHandler::read is ignoring $session_id when calling parent)
---SKIPIF--
-<?php include('skipif.inc'); ?>
---INI--
-session.save_handler=files
-session.save_path=
-session.use_strict_mode=0
---FILE--
-<?php
-
-class CustomReadHandler extends \SessionHandler {
-
- public function read($session_id) {
- return parent::read('mycustomsession');
- }
-}
-
-ob_start();
-
-session_set_save_handler(new CustomReadHandler(), true);
-
-session_id('mycustomsession');
-session_start();
-$_SESSION['foo'] = 'hoge';
-var_dump(session_id());
-session_commit();
-
-session_id('otherid');
-session_start();
-var_dump($_SESSION);
-var_dump(session_id());
-
-?>
---EXPECT--
-string(15) "mycustomsession"
-array(1) {
- ["foo"]=>
- string(4) "hoge"
-}
-string(7) "otherid"
+++ /dev/null
---TEST--
-Bug #71186 session.hash_function - algorithm changes
---SKIPIF--
-<?php include('skipif.inc'); ?>
---INI--
-session.hash_function=sha512
-session.save_handler=files
---FILE--
-<?php
-ob_start();
-ini_set('session.use_strict_mode', 1);
-
-session_start();
-$orig = session_id();
-session_regenerate_id();
-$new = session_id();
-var_dump(strlen($orig),strlen($new));
-session_commit();
-
-ini_set('session.hash_function','sha1');
-session_id('invalid');
-session_start();
-$orig = session_id();
-session_regenerate_id();
-$new = session_id();
-var_dump(strlen($orig),strlen($new));
-?>
---EXPECT--
-int(128)
-int(128)
-int(40)
-int(40)
--EXPECTF--
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
-Warning: Unknown: Failed to read session data: files (path: ) in Unknown on line 0
+Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to write session data (files). Please verify that the current setting of session.save_path is correct () in Unknown on line 0
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
-Warning: Unknown: Failed to read session data: files (path: ) in Unknown on line 0
+Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to write session data (files). Please verify that the current setting of session.save_path is correct () in Unknown on line 0
string(%d) "%s"
string(5) "/blah"
Warning: session_start(): open(%sblah%e%s, O_RDWR) failed: No such file or directory (2) in %s on line %d
-
-Warning: session_start(): Failed to read session data: files (path: %sblah) in %s on line %d
-bool(false)
+bool(true)
string(5) "/blah"
-
-Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
-bool(false)
+bool(true)
string(5) "/blah"
Done
string(5) "/blah"
Warning: session_start(): open(%s, O_RDWR) failed: No such file or directory (2) in %s on line %d
-
-Warning: session_start(): Failed to read session data: files (path: %sblah) in %s on line %d
-bool(false)
+bool(true)
string(5) "/blah"
-
-Warning: session_destroy(): Trying to destroy uninitialized session in %s on line %d
-bool(false)
+bool(true)
string(5) "/blah"
Done
}
public function read($id) {
- return (string)@file_get_contents($this->path . $id);
+ return @file_get_contents($this->path . $id);
}
public function write($id, $data) {
$handler = new MySession6;
session_set_save_handler($handler);
-var_dump(session_start());
+session_start();
var_dump(session_id(), ini_get('session.save_handler'), $_SESSION);
*** Testing session_set_save_handler() : incomplete implementation ***
Warning: SessionHandler::read(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
-
-Warning: SessionHandler::close(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
-
-Warning: session_start(): Failed to read session data: user (%s) in %ssession_set_save_handler_class_005.php on line %d
-bool(false)
string(%d) "%s"
string(4) "user"
array(0) {
}
+
+Warning: SessionHandler::write(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
+
+Warning: session_write_close(): Failed to write session data %s in %ssession_set_save_handler_class_005.php on line %d
+
+Warning: SessionHandler::close(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
$oldHandler = ini_get('session.save_handler');
$handler = new MySession;
session_set_save_handler($handler);
-var_dump(session_start());
+session_start();
var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i, $_SESSION);
Read %s
Warning: SessionHandler::read(): Parent session handler is not open in %s on line %d
-
-Warning: SessionHandler::close(): Parent session handler is not open in %s on line %d
-
-Warning: session_start(): Failed to read session data: user (%s) in %s on line %d
-bool(false)
string(%d) "%s"
string(5) "files"
string(4) "user"
int(2)
array(0) {
}
+
+Warning: SessionHandler::write(): Parent session handler is not open in Unknown on line 0
+
+Warning: session_write_close(): Failed to write session data %s in %s on line %d
+
+Warning: SessionHandler::close(): Parent session handler is not open in Unknown on line 0
ob_start();
-/*
+/*
* Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true])
* Description : Sets user-level session storage functions
- * Source code : ext/session/session.c
+ * Source code : ext/session/session.c
*/
echo "*** Testing session_set_save_handler() function: class with create_sid ***\n";
}
public function read($id) {
- return (string)@file_get_contents($this->path . $id);
+ return @file_get_contents($this->path . $id);
}
public function write($id, $data) {
}
public function read($id) {
- return (string)@file_get_contents($this->path . $id);
+ return @file_get_contents($this->path . $id);
}
public function write($id, $data) {
session_set_save_handler("callback", "callback", "callback", "callback", "echo", "callback");
session_set_save_handler("callback", "callback", "callback", "callback", "callback", "echo");
session_set_save_handler("callback", "callback", "callback", "callback", "callback", "callback");
-var_dump(session_start());
+session_start();
ob_end_flush();
?>
--EXPECTF--
Warning: session_set_save_handler(): Argument 5 is not a valid callback in %s on line %d
Warning: session_set_save_handler(): Argument 6 is not a valid callback in %s on line %d
-
-Warning: session_start(): Failed to read session data: user (%s) in %s on line %d
-bool(false)
}
public function read($id) {
- return (string)@file_get_contents($this->path . $id);
+ return @file_get_contents($this->path . $id);
}
public function write($id, $data) {
}
public function read($id) {
- return (string)@file_get_contents($this->path . $id);
+ return @file_get_contents($this->path . $id);
}
public function write($id, $data) {
?>
--EXPECTF--
-Warning: SessionHandler::open(): Session is not active in %s on line 5
-
-Warning: SessionHandler::open(): Session is not active in %s on line 6
-
-Warning: SessionHandler::open(): Session is not active in %s on line 7
-
-Warning: SessionHandler::open(): Session is not active in %s on line 8
Done!
projects / php / commitdiff