Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/session/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -1497,10 +1497,10 @@ static zend_result php_session_send_cookie(void) /* {{{ */
php_session_remove_cookie(); /* remove already sent session ID cookie */
/* 'replace' must be 0 here, else a previous Set-Cookie
header, probably sent with setcookie() will be replaced! */
sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
zend_result result = sapi_add_header_ex(estrndup(ZSTR_VAL(ncookie.s), ZSTR_LEN(ncookie.s)), ZSTR_LEN(ncookie.s), 0, 0);
smart_str_free(&ncookie);

return SUCCESS;
return result;
}
/* }}} */

Expand Down
31 changes: 31 additions & 0 deletions ext/session/tests/session_start_cookie_header_rejected.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
session_start() when the SAPI rejects the session cookie header
--INI--
session.save_handler=files
session.name=PHPSESSID
session.gc_probability=0
--EXTENSIONS--
session
--FILE--
<?php

ob_start();

set_error_handler(function (int $errno, string $errstr): bool {
echo "handler: ", $errstr, PHP_EOL;
if (session_status() === PHP_SESSION_ACTIVE) {
session_destroy();
}
return true;
});

session_set_cookie_params(['path' => "/\r\nX-Injected: yes"]);

var_dump(session_start());
var_dump(session_status() === PHP_SESSION_NONE);

?>
--EXPECT--
handler: Header may not contain more than a single header, new line detected
bool(false)
bool(true)
Loading