diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-20 15:28:55 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-20 15:28:55 +0000 |
| commit | 4aaadc75abce9a6d662b807df92989505cba4a49 (patch) | |
| tree | 497573f6ecbc9886d6f3b9be2a829415d756b50a /src/ibrowse/ibrowse.erl | |
| parent | f57948efb95ad460a2bfce3923696e2580561e6b (diff) | |
Merge revision 1061340 from trunk
Upgrade ibrowse to version 2.1.3
This version fixes several bugs and adds a few minor improvements.
For a list and description of the changes relative to the previous
version, see the README file at:
https://github.com/cmullaparthi/ibrowse
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1061341 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/ibrowse/ibrowse.erl')
| -rw-r--r-- | src/ibrowse/ibrowse.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ibrowse/ibrowse.erl b/src/ibrowse/ibrowse.erl index e1051504..f70f92f1 100644 --- a/src/ibrowse/ibrowse.erl +++ b/src/ibrowse/ibrowse.erl @@ -6,8 +6,8 @@ %%% Created : 11 Oct 2003 by Chandrashekhar Mullaparthi <chandrashekhar.mullaparthi@t-mobile.co.uk> %%%------------------------------------------------------------------- %% @author Chandrashekhar Mullaparthi <chandrashekhar dot mullaparthi at gmail dot com> -%% @copyright 2005-2010 Chandrashekhar Mullaparthi -%% @version 2.1.2 +%% @copyright 2005-2011 Chandrashekhar Mullaparthi +%% @version 2.1.3 %% @doc The ibrowse application implements an HTTP 1.1 client in erlang. This %% module implements the API of the HTTP client. There is one named %% process called 'ibrowse' which assists in load balancing and maintaining configuration. There is one load balancing process per unique webserver. There is @@ -683,16 +683,16 @@ init(_) -> State = #state{}, put(my_trace_flag, State#state.trace), put(ibrowse_trace_token, "ibrowse"), - ets:new(ibrowse_lb, [named_table, public, {keypos, 2}]), - ets:new(ibrowse_conf, [named_table, protected, {keypos, 2}]), - ets:new(ibrowse_stream, [named_table, public]), + ibrowse_lb = ets:new(ibrowse_lb, [named_table, public, {keypos, 2}]), + ibrowse_conf = ets:new(ibrowse_conf, [named_table, protected, {keypos, 2}]), + ibrowse_stream = ets:new(ibrowse_stream, [named_table, public]), import_config(), {ok, #state{}}. import_config() -> case code:priv_dir(ibrowse) of - {error, _} = Err -> - Err; + {error, _} -> + ok; PrivDir -> Filename = filename:join(PrivDir, "ibrowse.conf"), import_config(Filename) @@ -723,8 +723,8 @@ import_config(Filename) -> io:format("Skipping unrecognised term: ~p~n", [X]) end, lists:foreach(Fun, Terms); - Err -> - Err + _Err -> + ok end. %% @doc Internal export |