sniper Wed Oct 8 06:22:52 2003 EDT
Modified files:
/php-src/ext/session session.c
Log:
- Fixed bug #25780 (ext/session: invalid session.cookie_lifetime causes crash in
win32).
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.376 php-src/ext/session/session.c:1.377
--- php-src/ext/session/session.c:1.376 Sun Sep 21 07:53:12 2003
+++ php-src/ext/session/session.c Wed Oct 8 06:22:51 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.376 2003/09/21 11:53:12 sas Exp $ */
+/* $Id: session.c,v 1.377 2003/10/08 10:22:51 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -957,13 +957,17 @@
if (PS(cookie_lifetime) > 0) {
struct timeval tv;
+ time_t t;
gettimeofday(&tv, NULL);
- date_fmt = php_std_date(tv.tv_sec + PS(cookie_lifetime) TSRMLS_CC);
+ t = tv.tv_sec + PS(cookie_lifetime);
- smart_str_appends(&ncookie, COOKIE_EXPIRES);
- smart_str_appends(&ncookie, date_fmt);
- efree(date_fmt);
+ if (t > 0) {
+ date_fmt = php_std_date(t TSRMLS_CC);
+ smart_str_appends(&ncookie, COOKIE_EXPIRES);
+ smart_str_appends(&ncookie, date_fmt);
+ efree(date_fmt);
+ }
}
if (PS(cookie_path)[0]) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
