diff options
| author | Anatol Belski <ab@php.net> | 2014-07-02 10:30:36 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-02 10:30:36 +0200 |
| commit | e98d429cc329d13a0451ad7ce11f93bd7d54d1a8 (patch) | |
| tree | 04512f8c29a0384501fb8de123a55a871d7c431f /ext/session/session.c | |
| parent | 84876850ff3e50ee7b85abc7261bdf9038d65e4b (diff) | |
| parent | 088eedfaa186e79f6f86b814f50efc947350bf88 (diff) | |
| download | php-git-e98d429cc329d13a0451ad7ce11f93bd7d54d1a8.tar.gz | |
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: (25 commits)
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
Fix https://github.com/krakjoe/phpdbg/issues/91
Update copyright year to 2014
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Fixed bug #67399 (putenv with empty variable may lead to crash)
Remove superfluous echos.
Remove usage of pointless COOKIE_SET_COOKIE constant.
Test
Added support for parsing ssl certificates using GeneralizedTime format.
Fix align indentation
...
Conflicts:
ext/standard/head.c
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index c746805668..cd88d3e22b 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -51,6 +51,7 @@ #include "ext/standard/php_smart_str.h" #include "ext/standard/url.h" #include "ext/standard/basic_functions.h" +#include "ext/standard/head.h" #include "mod_files.h" #include "mod_user.h" @@ -1289,14 +1290,6 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */ * Cookie Management * ********************* */ -#define COOKIE_SET_COOKIE "Set-Cookie: " -#define COOKIE_EXPIRES "; expires=" -#define COOKIE_MAX_AGE "; Max-Age=" -#define COOKIE_PATH "; path=" -#define COOKIE_DOMAIN "; domain=" -#define COOKIE_SECURE "; secure" -#define COOKIE_HTTPONLY "; HttpOnly" - /* * Remove already sent session ID cookie. * It must be directly removed from SG(sapi_header) because sapi_add_header_ex() @@ -1362,7 +1355,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */ e_session_name = php_url_encode(PS(session_name), strlen(PS(session_name)), NULL); e_id = php_url_encode(PS(id), strlen(PS(id)), NULL); - smart_str_appends(&ncookie, COOKIE_SET_COOKIE); + smart_str_appends(&ncookie, "Set-Cookie: "); smart_str_appends(&ncookie, e_session_name); smart_str_appendc(&ncookie, '='); smart_str_appends(&ncookie, e_id); |