File 0288-inets-Fix-an-upcoming-warning-that-would-break-the-b.patch of Package erlang
From 6d3e20f940efa8383cee7123ac6bfdcf92e0aa15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Thu, 4 Feb 2021 11:38:26 +0100
Subject: [PATCH 08/10] inets: Fix an upcoming warning that would break the
build
---
lib/inets/src/http_lib/http_util.erl | 24 +++++++++++-----------
lib/inets/src/http_server/httpd_util.erl | 26 ++++++++++++------------
lib/inets/src/http_server/mod_auth.erl | 2 +-
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 5577b00cc8..b380068af9 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -123,12 +123,12 @@ convert_netscapecookie_date([_D,_A,_Y, $ ,
{{Year,Month,Day},{Hour,Min,Sec}};
%% Sloppy...
-convert_netscapecookie_date([_D,_A,_Y, $,, _SP,
- D1,D2,_DA,
- M,O,N,_DA,
- Y1,Y2,Y3,Y4,_SP,
- H1,H2,_Col,
- M1,M2,_Col,
+convert_netscapecookie_date([_D,_A,_Y, $,, SP,
+ D1,D2,DA,
+ M,O,N,DA,
+ Y1,Y2,Y3,Y4,SP,
+ H1,H2,Col,
+ M1,M2,Col,
S1,S2|_Rest]) ->
Year=list_to_integer([Y1,Y2,Y3,Y4]),
Day=list_to_integer([D1,D2]),
@@ -138,12 +138,12 @@ convert_netscapecookie_date([_D,_A,_Y, $,, _SP,
Sec=list_to_integer([S1,S2]),
{{Year,Month,Day},{Hour,Min,Sec}};
-convert_netscapecookie_date([_D,_A,_Y, _SP,
- D1,D2,_DA,
- M,O,N,_DA,
- Y1,Y2,Y3,Y4,_SP,
- H1,H2,_Col,
- M1,M2,_Col,
+convert_netscapecookie_date([_D,_A,_Y, SP,
+ D1,D2,DA,
+ M,O,N,DA,
+ Y1,Y2,Y3,Y4,SP,
+ H1,H2,Col,
+ M1,M2,Col,
S1,S2|_Rest]) ->
Year=list_to_integer([Y1,Y2,Y3,Y4]),
Day=list_to_integer([D1,D2]),
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index c17a47e76e..21656fe164 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -260,7 +260,7 @@ convert_rfc850_date(DateStr) ->
convert_rfc850_date([D1,D2,_,
M,O,N,_,
- Y1,Y2|_Rest],[H1,H2,_Col,M1,M2,_Col,S1,S2|_Rest2])->
+ Y1,Y2|_Rest],[H1,H2,Col,M1,M2,Col,S1,S2|_Rest2])->
Year=list_to_integer([50,48,Y1,Y2]),
Day=list_to_integer([D1,D2]),
Month = http_util:convert_month([M,O,N]),
@@ -269,12 +269,12 @@ convert_rfc850_date([D1,D2,_,
Sec=list_to_integer([S1,S2]),
{ok,{{Year,Month,Day},{Hour,Min,Sec}}}.
-convert_ascii_date([_D,_A,_Y,_SP,
- M,O,N,_SP,
- D1,D2,_SP,
- H1,H2,_Col,
- M1,M2,_Col,
- S1,S2,_SP,
+convert_ascii_date([_D,_A,_Y,SP,
+ M,O,N,SP,
+ D1,D2,SP,
+ H1,H2,Col,
+ M1,M2,Col,
+ S1,S2,SP,
Y1,Y2,Y3,Y4| _Rest])->
Year=list_to_integer([Y1,Y2,Y3,Y4]),
Day=case D1 of
@@ -289,12 +289,12 @@ convert_ascii_date([_D,_A,_Y,_SP,
Sec=list_to_integer([S1,S2]),
{ok,{{Year,Month,Day},{Hour,Min,Sec}}}.
-convert_rfc1123_date([_D,_A,_Y,_C,_SP,
- D1,D2,_SP,
- M,O,N,_SP,
- Y1,Y2,Y3,Y4,_SP,
- H1,H2,_Col,
- M1,M2,_Col,
+convert_rfc1123_date([_D,_A,_Y,_C,SP,
+ D1,D2,SP,
+ M,O,N,SP,
+ Y1,Y2,Y3,Y4,SP,
+ H1,H2,Col,
+ M1,M2,Col,
S1,S2|_Rest]) ->
Year=list_to_integer([Y1,Y2,Y3,Y4]),
Day=list_to_integer([D1,D2]),
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 89d6e966cb..8115aa7d5a 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -292,7 +292,7 @@ update_password(Port, Dir, Old, New, New)->
update_password(Addr, Port, Dir, Old, New, New) when is_list(New) ->
mod_auth_server:update_password(Addr, Port, Dir, Old, New);
-update_password(_Addr, _Port, _Dir, _Old, _New, _New) ->
+update_password(_Addr, _Port, _Dir, _Old, New, New) ->
{error, badtype};
update_password(_Addr, _Port, _Dir, _Old, _New, _New1) ->
{error, notqeual}.
--
2.26.2
