forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing handlers implementing SessionHandlerInterface don't require create_sid(). SessionHandler still includes the method so the default mod can be called, but now implements both interfaces. Also added several more tests for this feature.
- Loading branch information
Showing
9 changed files
with
480 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| --TEST-- | ||
| Test session_set_save_handler() function: class with create_sid | ||
| --INI-- | ||
| session.save_handler=files | ||
| session.name=PHPSESSID | ||
| --SKIPIF-- | ||
| <?php include('skipif.inc'); ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| 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 | ||
| */ | ||
|
|
||
| echo "*** Testing session_set_save_handler() function: class with create_sid ***\n"; | ||
|
|
||
| class MySession2 extends SessionHandler { | ||
| public $path; | ||
|
|
||
| public function open($path, $name) { | ||
| if (!$path) { | ||
| $path = sys_get_temp_dir(); | ||
| } | ||
| $this->path = $path . '/u_sess_' . $name; | ||
| return true; | ||
| } | ||
|
|
||
| public function close() { | ||
| return true; | ||
| } | ||
|
|
||
| public function read($id) { | ||
| return @file_get_contents($this->path . $id); | ||
| } | ||
|
|
||
| public function write($id, $data) { | ||
| return file_put_contents($this->path . $id, $data); | ||
| } | ||
|
|
||
| public function destroy($id) { | ||
| @unlink($this->path . $id); | ||
| } | ||
|
|
||
| public function gc($maxlifetime) { | ||
| foreach (glob($this->path . '*') as $filename) { | ||
| if (filemtime($filename) + $maxlifetime < time()) { | ||
| @unlink($filename); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public function create_sid() { | ||
| return parent::create_sid(); | ||
| } | ||
| } | ||
|
|
||
| $handler = new MySession2; | ||
| session_set_save_handler($handler); | ||
| session_start(); | ||
|
|
||
| $_SESSION['foo'] = "hello"; | ||
|
|
||
| var_dump(session_id(), ini_get('session.save_handler'), $_SESSION); | ||
|
|
||
| session_write_close(); | ||
| session_unset(); | ||
|
|
||
| session_start(); | ||
| var_dump($_SESSION); | ||
|
|
||
| session_write_close(); | ||
| session_unset(); | ||
|
|
||
| --EXPECTF-- | ||
| *** Testing session_set_save_handler() function: class with create_sid *** | ||
| string(%d) "%s" | ||
| string(4) "user" | ||
| array(1) { | ||
| ["foo"]=> | ||
| string(5) "hello" | ||
| } | ||
| array(1) { | ||
| ["foo"]=> | ||
| string(5) "hello" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| --TEST-- | ||
| Test session_set_save_handler() function: class with create_sid | ||
| --INI-- | ||
| session.save_handler=files | ||
| session.name=PHPSESSID | ||
| --SKIPIF-- | ||
| <?php include('skipif.inc'); ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| 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 | ||
| */ | ||
|
|
||
| echo "*** Testing session_set_save_handler() function: class with create_sid ***\n"; | ||
|
|
||
| class MySession2 extends SessionHandler { | ||
| public $path; | ||
|
|
||
| public function open($path, $name) { | ||
| if (!$path) { | ||
| $path = sys_get_temp_dir(); | ||
| } | ||
| $this->path = $path . '/u_sess_' . $name; | ||
| return true; | ||
| } | ||
|
|
||
| public function close() { | ||
| return true; | ||
| } | ||
|
|
||
| public function read($id) { | ||
| return @file_get_contents($this->path . $id); | ||
| } | ||
|
|
||
| public function write($id, $data) { | ||
| return file_put_contents($this->path . $id, $data); | ||
| } | ||
|
|
||
| public function destroy($id) { | ||
| @unlink($this->path . $id); | ||
| } | ||
|
|
||
| public function gc($maxlifetime) { | ||
| foreach (glob($this->path . '*') as $filename) { | ||
| if (filemtime($filename) + $maxlifetime < time()) { | ||
| @unlink($filename); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public function create_sid() { | ||
| return 'my_sid'; | ||
| } | ||
| } | ||
|
|
||
| $handler = new MySession2; | ||
| session_set_save_handler($handler); | ||
| session_start(); | ||
|
|
||
| $_SESSION['foo'] = "hello"; | ||
|
|
||
| var_dump(session_id(), ini_get('session.save_handler'), $_SESSION); | ||
|
|
||
| session_write_close(); | ||
| session_unset(); | ||
|
|
||
| session_start(); | ||
| var_dump($_SESSION); | ||
|
|
||
| session_write_close(); | ||
| session_unset(); | ||
|
|
||
| --EXPECTF-- | ||
| *** Testing session_set_save_handler() function: class with create_sid *** | ||
| string(%d) "my_sid" | ||
| string(4) "user" | ||
| array(1) { | ||
| ["foo"]=> | ||
| string(5) "hello" | ||
| } | ||
| array(1) { | ||
| ["foo"]=> | ||
| string(5) "hello" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.