Merge branch 'klm-remove-default-rewrite-setting' into wrd-content-le…

…ngth-with-streaming
vinoski · Nov 8, 2012 · 1af6ae0 · 1af6ae0
2 parents 98a6d0c + b0dccbe
commit 1af6ae0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/webmachine_mochiweb.erl b/src/webmachine_mochiweb.erl
@@ -56,7 +56,15 @@ start(Options) ->
     end,
     application_set_unless_env(webmachine, dispatch_list, DispatchList),
     application_set_unless_env(webmachine, error_handler, ErrorHandler),
-    application_set_unless_env(webmachine, rewrite_module, RewriteModule),
+    case RewriteModule of
+        undefined ->
+            %% webmachine:new_request/2 will explode if
+            %% application:get_env returns {ok, undefined}
+            ok;
+        _ ->
+            application_set_unless_env(
+              webmachine, rewrite_module, RewriteModule)
+    end,
     mochiweb_http:start([{name, PName}, {loop, fun loop/1} | Options6]).
 
 stop() ->