Merge branch 'master' into dr-dialyzer-more-warnings

Conflicts: src/mochiweb.erl
mochi · Apr 12, 2011 · 738c58a · 738c58a
2 parents e535713 + 044e70b
commit 738c58a
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 84 deletions.
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
@@ -4,7 +4,6 @@
   {vsn, "2.0.0"},
   {modules, []},
   {registered, []},
-  {mod, {mochiweb_app, []}},
   {env, []},
   {applications, [kernel, stdlib, crypto, inets, ssl, xmerl,
                   compiler, syntax_tools]}]}.
diff --git a/src/mochiweb.erl b/src/mochiweb.erl
@@ -6,23 +6,10 @@
 -module(mochiweb).
 -author('bob@mochimedia.com').
 
--export([start/0, stop/0]).
 -export([new_request/1, new_response/1]).
 -export([all_loaded/0, all_loaded/1, reload/0]).
 -export([ensure_started/1]).
 
-%% @spec start() -> ok
-%% @doc Start the MochiWeb server.
-start() ->
-    ensure_started(crypto),
-    application:start(mochiweb).
-
-%% @spec stop() -> ok
-%% @doc Stop the MochiWeb server.
-stop() ->
-    ok = application:stop(mochiweb),
-    ok = application:stop(crypto).
-
 reload() ->
     [c:l(Module) || Module <- all_loaded()].
 
@@ -78,7 +65,6 @@ new_response({Request, Code, Headers}) ->
                           Code,
                           mochiweb_headers:make(Headers)).
 
-
 %% @spec ensure_started(App::atom()) -> ok
 %% @doc Start the given App if it has not been started already.
 ensure_started(App) ->
@@ -89,7 +75,6 @@ ensure_started(App) ->
             ok
     end.
 
-
 %%
 %% Tests
 %%

diff --git a/src/mochiweb_app.erl b/src/mochiweb_app.erl
diff --git a/src/mochiweb_sup.erl b/src/mochiweb_sup.erl