From f53235549d7d15a6ceeb105530d93786af1f0d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@dev-extend.eu>
Date: Fri, 18 Mar 2011 00:15:46 +0100
Subject: Introduce Handler:init/2 for initializing the handler state.

We need an init function in order to process upgrade instructions
for protocols like WebSockets, but also to request an active receive
mode for long-polling connections, both of which will be implemented
at a later time.
---
 README.md                    |  7 +++++--
 src/cowboy_http_protocol.erl | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index fc8b127..876af0f 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,10 @@ use one of the predefined handlers or write your own. An hello world HTTP
 handler could be written like this:
 
     -module(my_handler).
-    -export([handle/2]).
+    -export([init/2, handle/2]).
 
-    handle(Opts, Req) ->
+    init(Req, Opts) ->
+        {ok, undefined}.
+
+    handle(Req, State) ->
         {reply, 200, [], "Hello World!"}.
diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_http_protocol.erl
index d3d41f9..da10411 100644
--- a/src/cowboy_http_protocol.erl
+++ b/src/cowboy_http_protocol.erl
@@ -106,14 +106,24 @@ header({http_header, _I, Field, _R, Value}, Req, State) ->
 header(http_eoh, #http_req{host=undefined}, State) ->
 	error_terminate(400, State);
 header(http_eoh, Req, State) ->
-	handler_loop(Req, State).
+	handler_init(Req, State).
+
+-spec handler_init(Req::#http_req{}, State::#state{}) -> ok.
+handler_init(Req, State=#state{handler={Handler, Opts}}) ->
+	case Handler:init(Req, Opts) of
+		{ok, HandlerState} ->
+			handler_loop(HandlerState, Req, State)
+		%% @todo {mode, active}; {upgrade_protocol, Module}; {error, Reason}
+	end.
 
--spec handler_loop(Req::#http_req{}, State::#state{}) -> ok.
-handler_loop(Req, State=#state{handler={Handler, Opts}}) ->
-	case Handler:handle(Opts, Req) of
+-spec handler_loop(HandlerState::term(), Req::#http_req{},
+	State::#state{}) -> ok.
+handler_loop(HandlerState, Req, State=#state{handler={Handler, _Opts}}) ->
+	case Handler:handle(Req, HandlerState) of
+		%% @todo {ok, HandlerState}; {mode, active}
+		%% @todo Move the reply code to the cowboy_http_req module.
 		{reply, RCode, RHeaders, RBody} ->
 			reply(RCode, RHeaders, RBody, State)
-		%% @todo stream_reply, request_body, stream_request_body...
 	end.
 
 -spec error_terminate(Code::http_status(), State::#state{}) -> ok.
-- 
cgit v1.2.3