Merge pull request #10 from chef/lbaker/update-erlang22

Lbaker/update erlang22

rebar.config

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

rebar.lock

@@ -1,6 +1,5 @@
 {"1.1.0",
-[{<<"mochiweb">>,{pkg,<<"mochiweb">>,<<"2.12.2">>},0}]}.
-[
-{pkg_hash,[
- {<<"mochiweb">>, <<"80804AD342AFA3D7F3524040D4EED66CE74B17A555DE454AC85B07C479928E46">>}]}
-].
+[{<<"mochiweb">>,
+  {git,"git://github.com/mochi/mochiweb.git",
+       {ref,"070594e4d66163d662ac7e3bfb75dadcc922dd7c"}},
+  0}]}.

src/webmachine_decision_core.erl

@@ -31,8 +31,8 @@ handle_request(Resource, ReqState) ->
     try
         d(v3b13)
     catch
-        error:_ ->
-            error_response(erlang:get_stacktrace())
+        error:_:Stacktrace ->
+            error_response(Stacktrace)
     end.
 
 wrcall(X) ->

src/webmachine_resource.erl

@@ -201,8 +201,8 @@ resource_call(F, ReqData,
     end,
     Result = try
         apply(R_Mod, F, [ReqData, R_ModState])
-    catch C:R ->
-            Reason = {C, R, trim_trace(erlang:get_stacktrace())},
+    catch C:R:Stacktrace ->
+            Reason = {C, R, trim_trace(Stacktrace)},
             {{error, Reason}, ReqData, R_ModState}
     end,
         case R_Trace of

test/decision_core_test.erl

@@ -315,8 +315,8 @@ setup() ->
         meck:new(webmachine_resource, MeckOpts),
         Ctx
     catch
-        T:E ->
-            io:format(user, "~n~p : ~p : ~p", [T, E, erlang:get_stacktrace()]),
+        T:E:Stacktrace ->
+            io:format(user, "~n~p : ~p : ~p", [T, E, Stacktrace]),
             error(setup_failed)
     end.