diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2017-07-01 03:31:22 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2017-07-01 03:32:54 +0900 |
| commit | a2d766503aed619493386a9b4ef8190be62b36f7 (patch) | |
| tree | b8a4bbc6df8488d8075082adfb214c9d29bfe4a6 /ext/session | |
| parent | 66e5dc5b9b3ca5cf935be7211a821d51d1556890 (diff) | |
| download | php-git-a2d766503aed619493386a9b4ef8190be62b36f7.tar.gz | |
Fixed bug #74514 5 session functions incorrectly warn when calling in read-only/getter mode
Diffstat (limited to 'ext/session')
| -rw-r--r-- | ext/session/session.c | 10 | ||||
| -rw-r--r-- | ext/session/tests/bug74514.phpt | 34 |
2 files changed, 39 insertions, 5 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 7bc3a49abf..70f56a3ade 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1762,7 +1762,7 @@ static PHP_FUNCTION(session_name) RETURN_FALSE; } - if (SG(headers_sent)) { + if (name && SG(headers_sent)) { php_error_docref(NULL, E_WARNING, "Cannot change session name when headers already sent"); RETURN_FALSE; } @@ -1793,7 +1793,7 @@ static PHP_FUNCTION(session_module_name) RETURN_FALSE; } - if (SG(headers_sent)) { + if (name && SG(headers_sent)) { php_error_docref(NULL, E_WARNING, "Cannot change save handler module when headers already sent"); RETURN_FALSE; } @@ -2004,7 +2004,7 @@ static PHP_FUNCTION(session_save_path) RETURN_FALSE; } - if (SG(headers_sent)) { + if (name && SG(headers_sent)) { php_error_docref(NULL, E_WARNING, "Cannot change save path when headers already sent"); RETURN_FALSE; } @@ -2232,7 +2232,7 @@ static PHP_FUNCTION(session_cache_limiter) RETURN_FALSE; } - if (SG(headers_sent)) { + if (limiter && SG(headers_sent)) { php_error_docref(NULL, E_WARNING, "Cannot change cache limiter when headers already sent"); RETURN_FALSE; } @@ -2263,7 +2263,7 @@ static PHP_FUNCTION(session_cache_expire) RETURN_LONG(PS(cache_expire)); } - if (SG(headers_sent)) { + if (expires && SG(headers_sent)) { php_error_docref(NULL, E_WARNING, "Cannot change cache expire when headers already sent"); RETURN_FALSE; } diff --git a/ext/session/tests/bug74514.phpt b/ext/session/tests/bug74514.phpt new file mode 100644 index 0000000000..f7c8d46998 --- /dev/null +++ b/ext/session/tests/bug74514.phpt @@ -0,0 +1,34 @@ +--TEST-- +Bug #74514 5 session functions incorrectly warn when calling in read-only/getter mode. +--SKIPIF-- +<?php +include('skipif.inc'); +?> +--FILE-- +<?php +/* +CLI ignores HTTP headers at all, i.e. does not output any HTTP headers, +but it still uses SG(headers_sent). + +CLI works as Web server, so SG(headers_sent) cannot be ignored nor changed. +Therefore, once HTTP header is considered as sent, these functions emits +'headers already sent' errors if they try to set new values. + +Older PHPs(<7.2) did not care about this misuse on Web SAPI. +*/ +var_dump(session_name('foo')); +var_dump(session_name()); +var_dump(session_module_name()); +var_dump(session_save_path()); +var_dump(session_cache_limiter()); +var_dump(session_cache_expire()); +?> +===DONE=== +--EXPECT-- +string(9) "PHPSESSID" +string(3) "foo" +string(5) "files" +string(0) "" +string(7) "nocache" +int(180) +===DONE=== |