diff options
Diffstat (limited to 'ext/session')
| -rw-r--r-- | ext/session/mod_files.c | 2 | ||||
| -rw-r--r-- | ext/session/session.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 1665ba53aa..053c617dec 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -266,7 +266,7 @@ PS_OPEN_FUNC(files) if (*save_path == '\0') { /* if save path is an empty string, determine the temporary dir */ - save_path = php_get_temporary_directory(); + save_path = php_get_temporary_directory(TSRMLS_C); if (php_check_open_basedir(save_path TSRMLS_CC)) { return FAILURE; diff --git a/ext/session/session.c b/ext/session/session.c index a3be9a78c2..54bc6436ad 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1154,6 +1154,7 @@ static int php_session_cache_limiter(TSRMLS_D) /* {{{ */ #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" @@ -1201,6 +1202,9 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */ smart_str_appends(&ncookie, COOKIE_EXPIRES); smart_str_appends(&ncookie, date_fmt); efree(date_fmt); + + smart_str_appends(&ncookie, COOKIE_MAX_AGE); + smart_str_append_long(&ncookie, PS(cookie_lifetime)); } } |