From: Scott MacVicar <scottmac@php.net>
Date: Tue, 10 May 2011 19:09:24 +0000 (+0000)
Subject: Turns out that more than 1% of users clocks are more than a year out of date, this... 
X-Git-Tag: php-5.3.7RC1~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cab76530e7ccb9b20fac1f6304a09f87380563c2;p=php

Turns out that more than 1% of users clocks are more than a year out of date, this causes cookies to never get deleted since the date is in the future.

I can only guess its due to batteries on the motherboard being dead.
---

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 7ecf9b9ecd..edaf767463 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -115,10 +115,9 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
 		/* 
 		 * MSIE doesn't delete a cookie when you set it to a null value
 		 * so in order to force cookies to be deleted, even on MSIE, we
-		 * pick an expiry date 1 year and 1 second in the past
+		 * pick an expiry date in the past
 		 */
-		time_t t = time(NULL) - 31536001;
-		dt = 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);
+		dt = php_format_date("D, d-M-Y H:i:s T", sizeof("D, d-M-Y H:i:s T")-1, 1, 0 TSRMLS_CC);
 		snprintf(cookie, len + 100, "Set-Cookie: %s=deleted; expires=%s", name, dt);
 		efree(dt);
 	} else {