]> granicus.if.org Git - php/commitdiff
Fix bug #35975 - Session cookie expires date format isn't the most compatible. Sync...
authorScott MacVicar <scottmac@php.net>
Thu, 11 Dec 2008 01:20:58 +0000 (01:20 +0000)
committerScott MacVicar <scottmac@php.net>
Thu, 11 Dec 2008 01:20:58 +0000 (01:20 +0000)
ext/session/session.c

index f4d67b32063f25e99ca24dd2eb5b009c2d948f9d..e9169b8f0f8ba44a92b69ef510b048ec837d48cb 100644 (file)
@@ -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);