diff options
author | Anatol Belski <ab@php.net> | 2014-01-17 03:31:38 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-01-17 03:31:38 +0100 |
commit | 14e371e7d4ee7328f0261a8fbf2b29f0c742a91b (patch) | |
tree | 328aa7d47b9cd01604acd26a6b66469fb4d475de /ext/session | |
parent | 9799816e0cb3552f179cdc6c44ab2a9c99cfca7e (diff) | |
parent | a218a8b9174e5daf8b34c4cb3eca23977e7f66cf (diff) | |
download | php-git-14e371e7d4ee7328f0261a8fbf2b29f0c742a91b.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
forked the test for bug #66481
Diffstat (limited to 'ext/session')
-rw-r--r-- | ext/session/tests/bug66481-win32.phpt | 17 | ||||
-rw-r--r-- | ext/session/tests/bug66481.phpt | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/ext/session/tests/bug66481-win32.phpt b/ext/session/tests/bug66481-win32.phpt new file mode 100644 index 0000000000..cf06cb6b95 --- /dev/null +++ b/ext/session/tests/bug66481-win32.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #66481: Calls to session_name() segfault when session.name is null, Windows. +--INI-- +session.name= +--SKIPIF-- +<?php include('skipif.inc'); ?> +<?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only"); ?> +--FILE-- +<?php + +var_dump(session_name("foo")); +var_dump(session_name("bar")); +--EXPECTF-- +Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0 +string(9) "PHPSESSID" +string(3) "foo" +PHP Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0 diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt index cf6ad6a8d6..5525ae8a38 100644 --- a/ext/session/tests/bug66481.phpt +++ b/ext/session/tests/bug66481.phpt @@ -4,6 +4,7 @@ Bug #66481: Calls to session_name() segfault when session.name is null. session.name= --SKIPIF-- <?php include('skipif.inc'); ?> +<?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?> --FILE-- <?php |