scottmac Thu Dec 11 01:21:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/session session.c
Log:
MFH Fix bug #35975 - Session cookie expires date format isn't the most
compatible. Sync to that of setcookie().
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.18&r2=1.417.2.8.2.40.2.19&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.18
php-src/ext/session/session.c:1.417.2.8.2.40.2.19
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.18 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/session.c Thu Dec 11 01:21:35 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.18 2008/12/09 14:03:58 bjori Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.19 2008/12/11 01:21:35 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
