Merge branch 'bmk/inets/httpc/expire_data_cookie_parsing_error/OTP-9433' into bmk/inets/inets571_integration

3 files changed, 41 insertions, 4 deletions

diff --git a/lib/inets/src/http_client/httpc_cookie.erl b/lib/inets/src/http_client/httpc_cookie.erl
index 4d61f82b5a..e6e6c8cc81 100644
--- a/lib/inets/src/http_client/httpc_cookie.erl
+++ b/lib/inets/src/http_client/httpc_cookie.erl
@@ -375,10 +375,15 @@ cookie_attributes([{"max-age", Value}| Attributes], Cookie) ->
 				Cookie#http_cookie{max_age = ExpireTime});
 %% Backwards compatibility with netscape cookies
 cookie_attributes([{"expires", Value}| Attributes], Cookie) ->
-    Time = http_util:convert_netscapecookie_date(Value),
-    ExpireTime = calendar:datetime_to_gregorian_seconds(Time),
-    cookie_attributes(Attributes, 
-		      Cookie#http_cookie{max_age = ExpireTime});
+    try http_util:convert_netscapecookie_date(Value) of
+	Time ->
+	    ExpireTime = calendar:datetime_to_gregorian_seconds(Time),
+	    cookie_attributes(Attributes, 
+			      Cookie#http_cookie{max_age = ExpireTime})
+    catch 
+	_:_ ->
+	    cookie_attributes(Attributes, Cookie)
+    end;
 cookie_attributes([{"path", Value}| Attributes], Cookie) ->
     cookie_attributes(Attributes, 
 		      Cookie#http_cookie{path = Value});
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 5511ed388d..973600d7be 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -104,6 +104,22 @@ convert_netscapecookie_date([_D,_A,_Y, $ ,
     Sec       = list_to_integer([S1,S2]),
     {{Year,Month,Day},{Hour,Min,Sec}};
 
+%% Example: Tue Jan 01 08:00:01 2036 GMT
+convert_netscapecookie_date([_D,_A,_Y, $ ,
+			     M,O,N, $ ,
+			     D1,D2, $ ,
+			     H1,H2, $:,
+			     M1,M2, $:,
+			     S1,S2, $ ,
+			     Y1,Y2,Y3,Y4, $ |_Rest]) -> 
+    Year  = list_to_integer([Y1,Y2,Y3,Y4]),
+    Day   = list_to_integer([D1,D2]),
+    Month = convert_month([M,O,N]),
+    Hour  = list_to_integer([H1,H2]),
+    Min   = list_to_integer([M1,M2]),
+    Sec   = list_to_integer([S1,S2]),
+    {{Year,Month,Day},{Hour,Min,Sec}};
+
 %% Sloppy...
 convert_netscapecookie_date([_D,_A,_Y, $,, _SP,
                              D1,D2,_DA,
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 8b0fcb185d..301bc2d58a 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,10 +18,18 @@
 
 {"%VSN%",
  [
+  {"5.7", 
+   [
+    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.6", 
    [
     {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, 
     {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
+    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util, soft_purge, soft_purge, []}, 
     {update, httpc_handler, soft, soft_purge, soft_purge, []}, 
     {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, 
     {update, ftp, soft, soft_purge, soft_purge, []}
@@ -49,10 +57,18 @@
   } 
  ],
  [
+  {"5.7", 
+   [
+    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"5.6", 
    [
     {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, 
     {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
+    {load_module, httpc_cookie, soft_purge, soft_purge, [http_util]}, 
+    {load_module, http_util, soft_purge, soft_purge, []}, 
     {update, httpc_handler, soft, soft_purge, soft_purge, []}, 
     {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, 
     {update, ftp, soft, soft_purge, soft_purge, []}