summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2008-12-11 01:21:35 +0000
committerScott MacVicar <scottmac@php.net>2008-12-11 01:21:35 +0000
commit2ea67808735fcfbda252f309880c4e659220087d (patch)
tree4bd803555d324ab2552cd7c26928e15dac6da847
parent38b1e4c702011cffd197760a856575e2a85b8ccd (diff)
downloadphp-git-2ea67808735fcfbda252f309880c4e659220087d.tar.gz
MFH Fix bug #35975 - Session cookie expires date format isn't the most compatible. Sync to that of setcookie().
-rw-r--r--ext/session/session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index 30afb88cfa..9173be37fb 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -40,7 +40,7 @@
#include "ext/standard/md5.h"
#include "ext/standard/sha1.h"
#include "ext/standard/php_var.h"
-#include "ext/standard/datetime.h"
+#include "ext/date/php_date.h"
#include "ext/standard/php_lcg.h"
#include "ext/standard/url_scanner_ex.h"
#include "ext/standard/php_rand.h" /* for RAND_MAX */
@@ -1257,7 +1257,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */
t = tv.tv_sec + PS(cookie_lifetime);
if (t > 0) {
- date_fmt = php_std_date(t TSRMLS_CC);
+ date_fmt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, t, 0 TSRMLS_CC);
smart_str_appends(&ncookie, COOKIE_EXPIRES);
smart_str_appends(&ncookie, date_fmt);
efree(date_fmt);