Set minimum OTP to 18

Author: etrepum

.github/workflows/ci.yml

@@ -13,20 +13,16 @@ jobs:
         os:
           - ubuntu-latest
         otp:
-          - "24.0.2"
-          - "23.3.1"
-          - "22.3.4.9"
-          - "21.3.8.17"
+          - "24.3.3"
+          - "23.3.4.14"
+          - "22.3.4.26"
+          - "21.3.8.24"
           - "20.3.8.26"
         include:
-          - os: ubuntu-18.04
-            otp: "21.2.7"
           - os: ubuntu-18.04
             otp: "19.3.6.13"
           - os: ubuntu-18.04
             otp: "18.3.4.11"
-          - os: ubuntu-18.04
-            otp: "16.b.2.basho10"
     steps:
       - uses: actions/[email protected]
       - run: |

.travis.yml

@@ -1,5 +1,10 @@
-New version
+Version 3.0.0 released 2022-XX-XX
 
+* Minimum OTP version is now 18, which
+  allows us to remove a number of backwards
+  compatibility hacks while still supporting
+  almost 7 years of Erlang releases.
+  https://github.com/mochi/mochiweb/pull/239
 * Crashing client processes now exit with reason
   `{shutdown, Error}`. This ensures processes
   linked to the connection process are also

CHANGES.md

@@ -15,7 +15,7 @@ To create a new mochiweb using project in a specific directory:
 Information about Rebar (Erlang build tool) is available at https://github.com/rebar/rebar
 
 MochiWeb is currently tested with Erlang/OTP 18.3 through 24.0,
-but may still be compatible back to R15B-03.
+versions older than 3.0.0 may still be compatible back to R15B-03.
 
 # OTP 21.2, 21.2.1, 21.2.2 warning
 

README.md

@@ -1,13 +1,8 @@
 % -*- mode: erlang -*-
 {erl_opts, [debug_info,
-            {platform_define, "^R15", 'gen_tcp_r15b_workaround'},
-            {platform_define, "^(R14|R15|R16B-)", 'crypto_compatibility'},
-            {platform_define, "^(R14|R15|R16|17|18|19|20|21|22)", new_crypto_unavailable},
-            {platform_define, "^(R14|R15|R16B|17)", 'rand_mod_unavailable'},
-            {platform_define, "^(R14|R15|R16B|17)", 'sni_unavailable'},
-            {platform_define, "^(R14|R15|R16)", 'map_unavailable'},
-            {platform_define, "^(R14|R15|R16|17|18|19|20)", 'ssl_handshake_unavailable'},
-            {platform_define, "^21-", 'otp_21'}]}.
+            {platform_define, "^(18|19|20|21|22)", new_crypto_unavailable},
+            {platform_define, "^(18|19|20)", ssl_handshake_unavailable},
+            {platform_define, "^21-", otp_21}]}.
 {cover_enabled, true}.
 {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
 {dialyzer_opts, [{warnings, [no_return,

rebar.config

@@ -82,11 +82,6 @@
 -define(IS_WHITESPACE(C),
         (C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)).
 
--ifdef(map_unavailable).
--define(IS_MAP(_), false).
--else.
--define(IS_MAP(X), is_map(X)).
--endif.
 
 %% @type json_string() = atom | binary()
 %% @type json_number() = integer() | float()
@@ -159,14 +154,8 @@ parse_decoder_options([{format, Format} | Rest], State)
   when Format =:= struct orelse Format =:= eep18 orelse Format =:= proplist ->
     parse_decoder_options(Rest, State#decoder{object_hook=Format}).
 
--ifdef(map_unavailable).
-make_object_hook_for_map() ->
-    exit({json_decode, {bad_format, map_unavailable}}).
--else.
 make_object_hook_for_map() ->
     fun ({struct, P}) -> maps:from_list(P) end.
--endif.
-
 
 json_encode(true, _State) ->
     <<"true">>;
@@ -194,7 +183,7 @@ json_encode(Array, State) when is_list(Array) ->
     json_encode_array(Array, State);
 json_encode({array, Array}, State) when is_list(Array) ->
     json_encode_array(Array, State);
-json_encode(M, State) when ?IS_MAP(M) ->
+json_encode(M, State) when is_map(M) ->
     json_encode_map(M, State);
 json_encode({json, IoList}, _State) ->
     IoList;
@@ -223,11 +212,6 @@ json_encode_proplist(Props, State) ->
     [$, | Acc1] = lists:foldl(F, "{", Props),
     lists:reverse([$\} | Acc1]).
 
--ifdef(map_unavailable).
-json_encode_map(Bad, _State) ->
-  %% IS_MAP definition guarantees that this branch is dead
-  exit({json_encode, {bad_term, Bad}}).
--else.
 json_encode_map(Map, _State) when map_size(Map) =:= 0 ->
     <<"{}">>;
 json_encode_map(Map, State) ->
@@ -238,7 +222,6 @@ json_encode_map(Map, State) ->
           end,
     [$, | Acc1] = maps:fold(F, "{", Map),
     lists:reverse([$\} | Acc1]).
--endif.
 
 json_encode_string(A, State) when is_atom(A) ->
     json_encode_string(atom_to_binary(A, latin1), State);
@@ -977,8 +960,6 @@ utf8_non_character_test_() ->
     [{"roundtrip escaped", ?_assertEqual(S, decode(encode(S)))},
      {"roundtrip utf8", ?_assertEqual(S, decode((encoder([{utf8, true}]))(S)))}].
 
--ifndef(map_unavailable).
-
 decode_map_test() ->
     Json = "{\"var1\": 3, \"var2\": {\"var3\": 7}}",
     M = #{<<"var1">> => 3,<<"var2">> => #{<<"var3">> => 7}},
@@ -992,5 +973,3 @@ encode_empty_map_test() ->
     ?assertEqual(<<"{}">>, encode(#{})).
 
 -endif.
-
--endif.

src/mochijson2.erl

@@ -1,7 +1,7 @@
 %% This is generated from src/mochiweb.app.src
 {application, mochiweb,
  [{description, "MochiMedia Web Server"},
-  {vsn, "2.22.0"},
+  {vsn, "3.0.0"},
   {modules, []},
   {registered, []},
   {env, []},

src/mochiweb.app.src

@@ -43,16 +43,6 @@
 
 -define(DEFAULTS, [{name, ?MODULE}, {port, 8888}]).
 
--ifdef(gen_tcp_r15b_workaround).
-
-r15b_workaround() -> false.
-
--else.
-
-r15b_workaround() -> false.
-
--endif.
-
 parse_options(Options) ->
     {loop, HttpLoop} = proplists:lookup(loop, Options),
     Loop = {?MODULE, loop, [HttpLoop]},
@@ -177,17 +167,10 @@ handle_invalid_msg_request(Msg, Socket, Opts) ->
 -spec handle_invalid_msg_request(term(), term(), term(),
 				 term(), term()) -> no_return().
 
-handle_invalid_msg_request(Msg, Socket, Opts, Request,
+handle_invalid_msg_request(_Msg, Socket, Opts, Request,
 			   RevHeaders) ->
-    case {Msg, r15b_workaround()} of
-      {{tcp_error, _, emsgsize}, true} ->
-	  %% R15B02 returns this then closes the socket, so close and exit
-	  mochiweb_socket:close(Socket),
-         exit({shutdown, {tcp_error, emsgsize}});
-      _ ->
-	  handle_invalid_request(Socket, Opts, Request,
-				 RevHeaders)
-    end.
+    handle_invalid_request(Socket, Opts, Request,
+                RevHeaders).
 
 -spec handle_invalid_request(term(), term(), term(),
 			     term()) -> no_return().

src/mochiweb_http.erl

@@ -119,26 +119,6 @@ ensure_binary(B) when is_binary(B) ->
 ensure_binary(L) when is_list(L) ->
     iolist_to_binary(L).
 
--ifdef(crypto_compatibility).
--spec encrypt_data(binary(), binary()) -> binary().
-encrypt_data(Data, Key) ->
-    IV = crypto:strong_rand_bytes(16),
-    Crypt = crypto:aes_cfb_128_encrypt(Key, IV, Data),
-    <<IV/binary, Crypt/binary>>.
-
--spec decrypt_data(binary(), binary()) -> binary().
-decrypt_data(<<IV:16/binary, Crypt/binary>>, Key) ->
-    crypto:aes_cfb_128_decrypt(Key, IV, Crypt).
-
--spec gen_key(iolist(), iolist()) -> binary().
-gen_key(ExpirationTime, ServerKey) ->
-    crypto:md5_mac(ServerKey, [ExpirationTime]).
-
--spec gen_hmac(iolist(), binary(), iolist(), binary()) -> binary().
-gen_hmac(ExpirationTime, Data, SessionKey, Key) ->
-    crypto:sha_mac(Key, [ExpirationTime, Data, SessionKey]).
-
--else.
 -ifdef(new_crypto_unavailable).
 -spec encrypt_data(binary(), binary()) -> binary().
 encrypt_data(Data, Key) ->
@@ -178,7 +158,6 @@ gen_hmac(ExpirationTime, Data, SessionKey, Key) ->
     crypto:mac(hmac, sha, Key, [ExpirationTime, Data, SessionKey]).
 
 -endif.
--endif.
 
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").

src/mochiweb_session.erl

@@ -627,13 +627,8 @@ normalize_path("/" ++ Path, "/" ++ _ = Acc) ->
 normalize_path([C|Path], Acc) ->
         normalize_path(Path, [C|Acc]).
 
--ifdef(rand_mod_unavailable).
-rand_uniform(Start, End) ->
-    crypto:rand_uniform(Start, End).
--else.
 rand_uniform(Start, End) ->
     Start + rand:uniform(End - Start) - 1.
--endif.
 
 %%
 %% Tests