Merge pull request #14 from martinsumner/develop-2.9

Develop 2.9
basho · Feb 14, 2019 · 59ceba1 · 59ceba1
2 parents 494d14f + 070daa6
commit 59ceba1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rebar.config b/rebar.config
@@ -6,7 +6,7 @@
 {xref_checks, [undefined_function_calls]}.
 
 {deps,
- [{mochiweb, "2.9.0.*", {git, "git://github.com/basho/mochiweb.git", {tag, "v2.9.0p2"}}}
+ [{mochiweb, ".*", {git, "git://github.com/basho/mochiweb.git", {branch, "develop-2.9"}}}
  ]}.
 
 {dev_only_deps,

diff --git a/src/webmachine_mochiweb.erl b/src/webmachine_mochiweb.erl
@@ -30,7 +30,14 @@
 -define (WM_OPTION_DEFAULTS, [{error_handler, webmachine_error_handler}]).
 
 start(Options) ->
-    {DispatchList, PName, DGroup, WMOptions, OtherOptions} = get_wm_options(Options),
+    {DispatchList, PName, DGroup, WMOptions, OtherOptions0} = get_wm_options(Options),
+    OtherOptions =
+        case application:get_env(webmachine, recbuf) of
+            {ok, RecBuf} ->
+                [{recbuf, RecBuf}|OtherOptions0];
+            _ ->
+                OtherOptions0
+        end,
     webmachine_router:init_routes(DGroup, DispatchList),
     _ = [application_set_unless_env_or_undef(K, V) || {K, V} <- WMOptions],
     MochiName = list_to_atom(to_list(PName) ++ "_mochiweb"),