com php-src: Merge branch 'PHP-7.0': ext/session/tests/bug69111.phpt
| From: | Anatol Belski | Date: | Fri, 29 Jan 2016 20:07:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0': ext/session/tests/bug69111.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90820@lists.php.net to get a copy of this message | ||
Commit: 58b2344759121a332a135415d05df9335a00532f
Author: Anatol Belski <ab@php.net> Fri, 29 Jan 2016 21:07:19 +0100
Parents: 1a9402c6ec7cbb98c8774bebdd7f576d6b822a7d 6891e6abdf3c29caa465aefe80587de1db3a91ff
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58b2344759121a332a135415d05df9335a00532f
Log:
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "refix #69111 and one related test"
Revert "fix yet another leak"
add XFAIL
Revert "refix #69111 and one related test"
Revert "fix tests"
Revert "fix leak in 7.0"
add XFAIL
Revert "fix leak in 5.6"
Conflicts:
ext/session/tests/rfc1867_sid_invalid.phpt
Bugs:
https://bugs.php.net/69111
Changed paths:
MM ext/session/tests/bug69111.phpt
Diff:
diff --cc ext/session/tests/bug69111.phpt
index f5def0e,70f3a19..4b65c02
--- a/ext/session/tests/bug69111.phpt
+++ b/ext/session/tests/bug69111.phpt
@@@ -1,10 -1,8 +1,12 @@@
--TEST--
-Bug #69111 Crash in SessionHandler::read()
+Bug #69111 (Crash in SessionHandler::read())
+--INI--
+session.save_path=
+session.save_handler=files
+session..name=PHPSESSID
--SKIPIF--
+ --XFAIL--
+ It is still a leak
<?php include('skipif.inc'); ?>
--FILE--
<?php
@@@ -18,19 -16,8 +20,19 @@@ $sessionName = ini_get('session.name')
$sh->open($savePath, $sessionName);
$sh->write("foo", "bar");
-var_dump($sh->read(@$id));
+$sh->read($id);
+$sh->gc(1245);
+$sh->close();
?>
--EXPECTF--
-Warning: SessionHandler::read(): The session id is too long or contains illegal characters, valid
characters are a-z, A-Z, 0-9 and '-,' in %sbug69111.php on line %d
-bool(false)
+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
++Warning: SessionHandler::close(): Session is not active in %s on line 14