Merge pull request #13 from chef/CHEF-11677/CHEF-12498/lbaker

Chef 11677/chef 12498/lbaker update erlang

Author: jashaik

rebar.config

@@ -5,7 +5,7 @@
 
 {xref_checks, [undefined_function_calls]}.
 
-{deps, [{mochiweb, ".*", {git, "git://github.com/mochi/mochiweb.git", {branch, "master"}}}]}.
+{deps, [{mochiweb, ".*", {git, "https://github.com/mochi/mochiweb", {branch, "main"}}}]}.
 
 {eunit_opts, [
               no_tty,
@@ -15,8 +15,8 @@
 {profiles,
  [{test,
    [{deps, [meck,
-            {ibrowse, {git, "git://github.com/chef/ibrowse.git", {branch, "ma/revert_ipv6"}}},
-            {eunit_formatters, {git, "git://github.com/seancribbs/eunit_formatters", {branch, "master"}}}
+            {ibrowse, {git, "https://github.com/chef/ibrowse", {branch, "ma/revert_ipv6"}}},
+            {eunit_formatters, {git, "https://github.com/seancribbs/eunit_formatters", {branch, "master"}}}
            ]},
     {erl_opts, [debug_info]}
    ]}

rebar.lock

@@ -1,5 +1,4 @@
-{"1.1.0",
 [{<<"mochiweb">>,
-  {git,"git://github.com/mochi/mochiweb.git",
-       {ref,"070594e4d66163d662ac7e3bfb75dadcc922dd7c"}},
-  0}]}.
+  {git,"https://github.com/mochi/mochiweb",
+       {ref,"611254eb941e502227f221667389b98fd8e72d6f"}},
+  0}].

rebar3

@@ -627,8 +627,7 @@ make_reqdata(Path) ->
     %% object.
     MochiReq = mochiweb_request:new(testing, 'GET', Path, {1, 1},
                                     mochiweb_headers:make([])),
-    Req = webmachine:new_request(mochiweb, MochiReq),
-    {RD, _} = Req:get_reqdata(),
+    {Mod, Req} = webmachine:new_request(mochiweb, MochiReq),
+    {RD, _} = Mod:get_reqdata(Req),
     RD.
-
 -endif.

src/webmachine_dispatcher.erl

@@ -264,15 +264,15 @@ do_choose(Choices, Header, Default) ->
     DefaultOkay = case DefaultPrio of
         [] ->
             case StarPrio of
-                [0.0] -> no;
+                [+0.0] -> no;
                 _ -> yes
             end;
-        [0.0] -> no;
+        [+0.0] -> no;
         _ -> yes
     end,
     AnyOkay = case StarPrio of
         [] -> no;
-        [0.0] -> no;
+        [+0.0] -> no;
         _ -> yes
     end,
     do_choose(Default, DefaultOkay, AnyOkay, Choices, Accepted).
@@ -296,7 +296,7 @@ do_choose(Default, DefaultOkay, AnyOkay, Choices, []) ->
 do_choose(Default, DefaultOkay, AnyOkay, Choices, [AccPair|AccRest]) ->
     {Prio, Acc} = AccPair,
     case Prio of
-        0.0 ->
+        +0.0 ->
             do_choose(Default, DefaultOkay, AnyOkay,
                             lists:delete(Acc, Choices), AccRest);
         _ ->

src/webmachine_util.erl

@@ -20,7 +20,7 @@
 -include("wm_reqdata.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -define(RESOURCE, atom_to_list(?MODULE)).
 -define(RESOURCE_PATH, "/" ++ ?RESOURCE).

test/decision_core_test.erl

@@ -22,7 +22,7 @@
 -include_lib("eunit/include/eunit.hrl").
 -include("webmachine.hrl").
 
--compile(export_all).
+-compile(export_all, nowarn_export_all).
 
 -define(QC_OUT(P),
         eqc:on_output(fun(Str, Args) -> io:format(user, Str, Args) end, P)).

test/etag_test.erl

@@ -17,7 +17,7 @@
 -include_lib("eunit/include/eunit.hrl").
 -include("webmachine.hrl").
 
--compile([export_all]).
+-compile([export_all, nowarn_export_all]).
 
 integration_test_() ->
     {foreach,