r4239 clarify recent HTTP timestamp fix
authorDenis Ovsienko <infrastation@yandex.ru>
Sat, 19 Feb 2011 10:19:33 +0000 (10:19 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Sat, 19 Feb 2011 10:19:33 +0000 (10:19 +0000)
ChangeLog
wwwroot/render_image.php

index 0889290523c62f0bfcb6f5f8e2a2e8f37c8815cd..d1225adcc21e27e477b8687064e5258941337370 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,6 @@
        bugfix: delete container relationships when an object is deleted (#398)
        bugfix: SQL syntax error in some versions of MySQL+PDO
        bugfix: image caching was broken with some browsers
->>>>>>> .r4237
 0.19.0 2011-02-12
        new feature: IPv6 support, except of LivePTR, NAT and SLB functionality (by Alexey Andriyanov)
        new feature: cable ID column for links (#328, by Giovani Zamboni and Jens Weibler)
index c1ab288646ee57af4202baeb794ff690c8046fd6..9d14fb1bb71d899358880c7dba9c401591ff35be 100644 (file)
@@ -87,6 +87,9 @@ function HTTPDateToUnixTime ($string)
        );
 
        $formats = array();
+       # RFC2616 dictates exchanged timestamps to be in GMT TZ, and RFC822
+       # (which RFC1123 relies on) explicitly defines, that "GMT" is equivalent
+       # to "-0000" and "+0000".
        $formats['rfc1123'] = '/^(Sun|Mon|Tue|Wed|Thu|Fri|Sat), (\d{2}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{4}) (\d{2}):(\d{2}):(\d{2}) (?:GMT|[-+]0000)$/';
        $formats['rfc850'] = '/^(Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday), (\d{2})-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d{2}) (\d{2}):(\d{2}):(\d{2}) (?:GMT|[-+]0000)$/';
        $formats['asctime'] = '/^(Sun|Mon|Tue|Wed|Thu|Fri|Sat) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{2}|\d{1}) (\d{2}):(\d{2}):(\d{2}) (\d{4})$/';