diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-06-12 10:03:14 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-06-12 10:03:14 +0100 |
| commit | 2b5d25d1fc273247b8521c4bedc80e9f6717be7f (patch) | |
| tree | 293d83d71e089fbb557f4ea10e8a6e279695bbc2 /ext/session/session.c | |
| parent | b853f99abfd823fc2752175cab58465cfc8a3eab (diff) | |
| parent | 068bf645e1c9952008e08570dad27bb03101e689 (diff) | |
| download | php-git-2b5d25d1fc273247b8521c4bedc80e9f6717be7f.tar.gz | |
Merge branch 'httponly-cookies' of https://github.com/mj/php-src
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 8051758c12..d6568bdbb5 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); |