File 0121-When-a-non-DST-time-is-passed-to-the-httpd... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0121-When-a-non-DST-time-is-passed-to-the-httpd_util-rfc1.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Currently displaying revision 6a6e740c0161086d7407fd293e77c355 , Show latest

From ffd6bb83f541091d169a0fa556f4c6d307b9b043 Mon Sep 17 00:00:00 2001
From: Martin Cox <me@mar.tin.cx>
Date: Wed, 5 Apr 2017 22:26:55 +0100
Subject: [PATCH 1/2] When a non-DST time is passed to the
 httpd_util:rfc1123_date/1 function, it causes a case-clause error, as the
 calender:local_time_to_universal_time_dst/1 can return an empty list, which
 is not currently handled.

When called with an invalid DST time:
1> httpd_util:rfc1123_date({{2017, 03, 26},{1, 0, 0}}).
   ** exception error: no case clause matching []
      in function  httpd_util:rfc1123_date/1 (httpd_util.erl, line 334)

To alleviate this, simply add a clause to handle the empty list and return the
original time in the expected rfc1123 format. This is the approach of other
modules which make use of the calender:local_time_to_universal_time_dst/1
function. The formatted date is then returned without error:

2> httpd_util:rfc1123_date({{2017, 03, 26},{1, 0, 0}}).
   "Sun, 26 Mar 2017 01:00:00 GMT"
---
 lib/inets/src/http_server/httpd_util.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index a647f04dd..4f771015a 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -333,7 +333,9 @@ rfc1123_date(LocalTime) ->
     {{YYYY,MM,DD},{Hour,Min,Sec}} = 
 	case calendar:local_time_to_universal_time_dst(LocalTime) of
 	    [Gmt]   -> Gmt;
-	    [_,Gmt] -> Gmt
+	    [_,Gmt] -> Gmt;
+        % Should not happen, but handle the empty list to prevent an error.
+        [] -> LocalTime
 	end,
     DayNumber = calendar:day_of_the_week({YYYY,MM,DD}),
     lists:flatten(
-- 
2.12.2

Places

File 0121-When-a-non-DST-time-is-passed-to-the-httpd_util-rfc1.patch of Package erlang (Revision 6a6e740c0161086d7407fd293e77c355)

Places