From: Scott MacVicar <scottmac@php.net>
Date: Thu, 11 Dec 2008 01:20:58 +0000 (+0000)
Subject: Fix bug #35975 - Session cookie expires date format isn't the most compatible. Sync... 
X-Git-Tag: php-5.4.0alpha1~191^2~4836
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86fe80b580886b71b2b1e5009bf83c59c98dbbaa;p=php

Fix bug #35975 - Session cookie expires date format isn't the most compatible. Sync to that of setcookie().
---

diff --git a/ext/session/session.c b/ext/session/session.c
index f4d67b3206..e9169b8f0f 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -42,7 +42,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 */
@@ -1175,7 +1175,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);