Merge branch 'master' of https://github.com/cmullaparthi/ibrowse

.gitignore

@@ -2,3 +2,7 @@ ebin/
 *~
 .eunit/
 *beam
+doc/*.html
+doc/*.css
+doc/*.png
+doc/edoc-info

Makefile

@@ -19,3 +19,7 @@ test: all
 
 xref: all
 	./rebar xref
+
+docs:
+	erl -noshell \
+		-eval 'edoc:application(ibrowse, ".", []), init:stop().'

src/ibrowse.erl

@@ -481,7 +481,7 @@ spawn_worker_process(Args) ->
     spawn_worker_process(Args, []).
 
 %% @doc Same as spawn_worker_process/1 except with Erlang process options.
-%% @spec spawn_worker_process(Url::string() | {Host::string(), Port::integer(), Options::list()) -> {ok, pid()}
+%% @spec spawn_worker_process(Host::string(), Port::integer()) -> {ok, pid()}
 spawn_worker_process(Host, Port) when is_list(Host), is_integer(Port) ->
     %% Convert old API calls to new API format.
     spawn_worker_process({Host, Port}, []);
@@ -495,7 +495,7 @@ spawn_link_worker_process(Args) ->
     spawn_link_worker_process(Args, []).
 
 %% @doc Same as spawn_link_worker_process/1 except with Erlang process options.
-%% @spec spawn_link_worker_process(Url::string() | {Host::string(), Port::integer(), Options::list()) -> {ok, pid()}
+%% @spec spawn_link_worker_process(Host::string(), Port::integer()) -> {ok, pid()}
 spawn_link_worker_process(Host, Port) when is_list(Host), is_integer(Port) ->
     %% Convert old API calls to new API format.
     spawn_link_worker_process({Host, Port}, []);

src/ibrowse_http_client.erl

@@ -233,12 +233,12 @@ handle_info({ssl_error, _Sock, Reason}, State) ->
     {stop, normal, State};
 
 handle_info({req_timedout, From}, State) ->
-    case lists:keymember(From, #request.from, queue:to_list(State#state.reqs)) of
+    case lists:keysearch(From, #request.from, queue:to_list(State#state.reqs)) of
         false ->
             {noreply, State};
-        true ->
+        {value, #request{stream_to = StreamTo, req_id = ReqId}} ->
+            catch StreamTo ! {ibrowse_async_response_timeout, ReqId},
             shutting_down(State),
-%%            do_error_reply(State, req_timedout),
             {stop, normal, State}
     end;