src/iserve_socket.hrl test/iserve_test3.erl @@ -2,13 +2,13 @@ ERL=erl .PHONY: all src test clean -all: src +all: src test src: cd src && $(ERL) -make all test: - cd test && $(ERL) -make all + cd test && $(ERL) -pa ./ebin -make all clean: cd ebin && rm -f *.beam Makefile @@ -3,13 +3,15 @@ % This record characterises the connection from the browser to our server % it is intended to be a consistent view derived from a bunch of different headers --record(req, {connection=keep_alive, % keep_alive | close - content_length, % Integer - vsn, % {Maj,Min} - method, % 'GET'|'POST' - uri, % Truncated URI /index.html - args="", % Part of URI after ? - headers, % [{Tag, Val}] - body = <<>>}). % Content Body +-record(req, { + connection=keep_alive, % keep_alive | close + content_length, % Integer + vsn, % {Maj,Min} + method, % 'GET'|'POST' + uri, % Truncated URI /index.html + args="", % Part of URI after ? + headers, % [{Tag, Val}] + body = <<>> % Content Body + }). -endif. include/iserve.hrl @@ -6,15 +6,41 @@ -module(iserve). -include("../include/iserve.hrl"). +-include("iserve_socket.hrl"). + +-export([behaviour_info/1]). %% API to use from iserver_socket-behavior-callback modules. -export([reply_ok/2, reply_not_modified/1, reply_not_found/2, reply_redirect/2, - reply_raw/3]). + reply_raw/3, no_reply/0, + send_reply/3, send_reply/4, + status_code/1]). + -export([req_method/1, req_content_length/1, req_uri/1, req_headers/1, req_body/1, req_http_version/1]). +-export([c_sock/1, c_port/1, c_peer_addr/1, + c_peer_port/1, c_cb_mod/1, c_cb_data/1]). + + +behaviour_info(callbacks) -> + [{iserve_request,2}]; +behaviour_info(_Other) -> + undefined. + + +send_reply(C, StatusCode, Headers) -> + iserve_socket:send_reply(C, StatusCode, Headers). + +send_reply(C, StatusCode, Headers, Body) -> + iserve_socket:send_reply(C, StatusCode, Headers, Body). + + +no_reply() -> + no_reply. + reply_ok(Headers, Body) -> response(ok, Headers, Body). reply_not_modified(Headers) -> @@ -49,15 +75,18 @@ status_code(internal_server_error) -> 500; status_code(service_unavailable) -> 503. -req_method(#req{method=Method}) -> - Method. -req_content_length(#req{content_length=Len}) -> - Len. -req_uri(#req{uri=URI}) -> - URI. -req_headers(#req{headers=Hs}) -> - Hs. -req_body(#req{body=Data}) -> - Data. -req_http_version(#req{vsn=Version}) -> - Version. +req_method(#req{method=Method}) -> Method. +req_content_length(#req{content_length=Len}) -> Len. +req_uri(#req{uri=URI}) -> URI. +req_headers(#req{headers=Hs}) -> Hs. +req_body(#req{body=Data}) -> Data. +req_http_version(#req{vsn=Version}) -> Version. + + +c_sock(#c{sock = Sock}) -> Sock. +c_port(#c{port = Port}) -> Port. +c_peer_addr(#c{peer_addr = PeerAddr}) -> PeerAddr. +c_peer_port(#c{peer_port = PeerPort}) -> PeerPort. +c_cb_mod(#c{cb_mod = CbMod}) -> CbMod. +c_cb_data(#c{cb_data = CbData}) -> CbData. + src/iserve.erl @@ -2,27 +2,37 @@ -behaviour(gen_server). --export([start/2, - start_link/2, - create/2]). +-export([start/2, start/3 + ,start_link/2, start_link/3 + ,create/2 + ]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --record(state, {listen_socket, - port, - acceptor, - cb_mod}). +-record(state, { + listen_socket, + port, + acceptor, + cb_mod, + cb_data + }). %%-------------------------------------------------------------------- start(Port, CbMod) when is_integer(Port), is_atom(CbMod) -> + start(Port, CbMod, undef). + +start(Port, CbMod, CbData) when is_integer(Port), is_atom(CbMod) -> Name = list_to_atom(lists:flatten(io_lib:format("iserve_~w", [Port]))), - gen_server:start({local, Name}, ?MODULE, [Port,CbMod], []). + gen_server:start({local, Name}, ?MODULE, [Port,CbMod,CbData], []). start_link(Port, CbMod) when is_integer(Port), is_atom(CbMod) -> + start_link(Port, CbMod, undef). + +start_link(Port, CbMod, CbData) when is_integer(Port), is_atom(CbMod) -> Name = list_to_atom(lists:flatten(io_lib:format("iserve_~w", [Port]))), - gen_server:start_link({local, Name}, ?MODULE, [Port,CbMod], []). + gen_server:start_link({local, Name}, ?MODULE, [Port,CbMod,CbData], []). %% Send message to cause a new acceptor to be created create(ServerPid, Pid) -> @@ -30,7 +40,7 @@ create(ServerPid, Pid) -> %% Called by gen_server framework at process startup. Create listening socket -init([Port,CbMod]) -> +init([Port,CbMod,CbData]) -> process_flag(trap_exit, true), case gen_tcp:listen(Port,[binary, {packet, http}, {reuseaddr, true}, @@ -38,11 +48,12 @@ init([Port,CbMod]) -> {backlog, 30}]) of {ok, Listen_socket} -> %%Create first accepting process - Pid = iserve_socket:start_link(CbMod, self(), Listen_socket, Port), + Pid = iserve_socket:start_link(CbMod, CbData, self(), Listen_socket, Port), {ok, #state{listen_socket = Listen_socket, port = Port, acceptor = Pid, - cb_mod = CbMod}}; + cb_mod = CbMod, + cb_data = CbData}}; {error, Reason} -> {stop, Reason} end. @@ -54,8 +65,11 @@ handle_call(_Request, _From, State) -> %% Called by gen_server framework when the cast message from create/2 is received handle_cast({create, _Pid}, #state{listen_socket = Listen_socket} = State) -> - New_pid = iserve_socket:start_link(State#state.cb_mod, self(), - Listen_socket, State#state.port), + New_pid = iserve_socket:start_link(State#state.cb_mod, + State#state.cb_data, + self(), + Listen_socket, + State#state.port), {noreply, State#state{acceptor=New_pid}}; handle_cast(_Msg, State) -> @@ -68,8 +82,11 @@ handle_info({'EXIT', Pid, normal}, #state{acceptor=Pid} = State) -> %% The current acceptor has died, wait a little and try again handle_info({'EXIT', Pid, _Abnormal}, #state{acceptor=Pid} = State) -> timer:sleep(2000), - iserve_socket:start_link(State#state.cb_mod, self(), - State#state.listen_socket, State#state.port), + iserve_socket:start_link(State#state.cb_mod, + State#state.cb_data, + self(), + State#state.listen_socket, + State#state.port), {noreply, State}; handle_info(_Info, State) -> src/iserve_server.erl @@ -1,32 +1,29 @@ -module(iserve_socket). --export([start_link/4]). +-export([start_link/5 + ,send_reply/3, send_reply/4 + ]). -export([init/1]). %% TODO: Remove me --compile(export_all). +%%-compile(export_all). -include("../include/iserve.hrl"). +-include("iserve_socket.hrl"). -define(not_implemented_501, "HTTP/1.1 501 Not Implemented\r\n\r\n"). -define(forbidden_403, "HTTP/1.1 403 Forbidden\r\n\r\n"). -define(not_found_404, "HTTP/1.1 404 Not Found\r\n\r\n"). --record(c, {sock, - port, - peer_addr, - peer_port, - cb_mod % callback module M:iserve_request(#req{}) - }). -define(server_idle_timeout, 30*1000). -start_link(CbMod, ListenPid, ListenSocket, ListenPort) -> +start_link(CbMod, CbData, ListenPid, ListenSocket, ListenPort) -> proc_lib:spawn_link(?MODULE, init, - [{CbMod, ListenPid, ListenSocket, ListenPort}]). + [{CbMod, CbData, ListenPid, ListenSocket, ListenPort}]). -init({CbMod, Listen_pid, Listen_socket, ListenPort}) -> +init({CbMod, CbData, Listen_pid, Listen_socket, ListenPort}) -> case catch gen_tcp:accept(Listen_socket) of {ok, Socket} -> %% Send the cast message to the listener process to create a new acceptor @@ -36,7 +33,8 @@ init({CbMod, Listen_pid, Listen_socket, ListenPort}) -> port = ListenPort, peer_addr = Addr, peer_port = Port, - cb_mod = CbMod}, + cb_mod = CbMod, + cb_data = CbData}, request(C, #req{}); %% Jump to state 'request' Else -> @@ -163,7 +161,10 @@ handle_post(C, #req{connection = Conn} = Req) -> call_mfa(C, Req) -> Mod = C#c.cb_mod, - case catch Mod:iserve_request(Req) of + case catch Mod:iserve_request(C, Req) of + no_reply -> + ok; + {'EXIT', Reason} -> io:format("Worker Crash = ~p~n",[Reason]), exit(normal); @@ -175,26 +176,29 @@ call_mfa(C, Req) -> %% A basic identity http response. {respond, StatusCode, Headers0, Body} -> Headers = add_content_length(Headers0, Body), - Enc_headers = enc_headers(Headers), - Enc_status = enc_status(StatusCode), - Resp = [<<"HTTP/1.1 ">>, Enc_status, <<"\r\n">>, - Enc_headers, - <<"\r\n">>, - Body], - send(C, Resp); + send_reply(C, StatusCode, Headers, Body); %% Chunked transfer-encoding for streaming output {stream, StatusCode, Headers0, Pid, Subscribe} -> TE = {'Transfer-Encoding', "chunked"}, Headers1 = [TE |Headers0], - Enc_headers = enc_headers(Headers1), - Enc_status = enc_status(StatusCode), - Resp = [<<"HTTP/1.1 ">>, Enc_status, <<"\r\n">>, - Enc_headers, - <<"\r\n">>], - send(C, Resp), + send_reply(C, StatusCode, Headers1), send_chunked(C, Pid, Subscribe) end. + +%%% Part of the exported API. +send_reply(C, StatusCode, Headers) -> + send_reply(C, StatusCode, Headers, ""). + +send_reply(C, StatusCode, Headers, Body) -> + Enc_headers = enc_headers(Headers), + Enc_status = enc_status(StatusCode), + Resp = [<<"HTTP/1.1 ">>, Enc_status, <<"\r\n">>, + Enc_headers, + <<"\r\n">>, + Body], + send(C, Resp). + add_content_length(Headers, Body) -> case lists:keysearch('Content-Length', 1, Headers) of src/iserve_socket.erl @@ -1,4 +1,4 @@ -{['iserve_test', 'iserve_test2'], - [{outdir,"../ebin"},debug_info]}. +{['iserve_test', 'iserve_test2', 'iserve_test3'], + [{outdir,"../ebin"},{pa,"../ebin"},debug_info]}. test/Emakefile @@ -3,7 +3,7 @@ ERL=erl .PHONY: all src clean all: - $(ERL) -make all + $(ERL) -pa ../ebin -make all clean: rm -f ../ebin/*.beam test/Makefile @@ -1,13 +1,15 @@ -module(iserve_test). --export([start/1, iserve_request/1]). +-export([start/1, iserve_request/2]). -include("../include/iserve.hrl"). +-behaviour(iserve). + start(Port) -> iserve_server:start(Port, ?MODULE). -iserve_request(Req) -> +iserve_request(_C, Req) -> error_logger:info_report( lists:zip(record_info(fields, req), tl(tuple_to_list(Req)))), test/iserve_test.erl @@ -1,13 +1,15 @@ -module(iserve_test2). --export([start/1, iserve_request/1]). +-export([start/1, iserve_request/2]). -include("../include/iserve.hrl"). +-behaviour(iserve). + start(Port) -> iserve_server:start(Port, ?MODULE). -iserve_request(Req) -> +iserve_request(_C, Req) -> error_logger:info_report( lists:zip( record_info(fields, req), test/iserve_test2.erl 9f87781d2fac11f541a3dac7a1110fa1a37cf810 Torbjorn Tornkvist tobbe@tornkvist.org http://github.com/noss/iserve/commit/31f06af72bc9a86c0d9d884b064262889016dceb 31f06af72bc9a86c0d9d884b064262889016dceb 2007-11-07T14:30:54-08:00 2007-11-07T14:30:54-08:00 Modifying iserve so that use of ifile:sendfile is possible. 4567d4d060c16012f2f4b0069c184cd4d2db6183 Torbjorn Tornkvist tobbe@tornkvist.org