From 7958fc2f6b141759c5a046bbf7fa647e1ca115cc Mon Sep 17 00:00:00 2001 From: Chandrashekhar Mullaparthi Date: Fri, 24 Sep 2010 06:52:02 +0100 Subject: [PATCH] Removed spurious io:format --- README | 59 +++++++++++++++++++++++-------------- doc/ibrowse.html | 4 +-- ebin/ibrowse.app | 2 +- src/ibrowse.erl | 3 +- src/ibrowse_http_client.erl | 9 ------ vsn.mk | 2 +- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/README b/README index adb1d7d..ea948e6 100644 --- a/README +++ b/README @@ -18,31 +18,46 @@ ibrowse is available under two different licenses. LGPL or the BSD license. Comments to : Chandrashekhar.Mullaparthi@gmail.com -Version : 2.0.0 +Version : 2.0.1 Latest version : git://github.com/cmullaparthi/ibrowse.git CONTRIBUTIONS & CHANGE HISTORY ============================== -22-09-2010 - * Added option preserve_chunked_encoding. This allows the caller to get - the raw HTTP response when the Transfer-Encoding is Chunked. This feature - was requested by Benoit Chesneau who wanted to write a HTTP proxy using - ibrowse. - * Fixed bug with the {stream_to, {Pid, once}} option. Bug report and lot - of help from Filipe David Manana. Thank you Filipe. - * The {error, conn_failed} and {error, send_failed} return values are - now of the form {error, {conn_failed, Err}} and - {error, {send_failed, Err}}. This is so that the specific socket error - can be returned to the caller. I think it looks a bit ugly, but that - is the best compromise I could come up with. - * Added application configuration parameters default_max_sessions and - default_max_pipeline_size. These were previously hard coded to 10. - * Versioning of ibrowse now follows the Semantic Versioning principles. - See http://semver.org. Thanks to Anthony Molinaro for nudging me in - this direction. - * The connect_timeout option now only applies to the connection setup - phase. In previous versions, the time taken to setup the connection - was deducted from the specified timeout value for the request. +24-09-2010 - v2.0.1 + * Removed a spurious io:format statement + +22-09-2010 - v2.0.0. + + * Added option preserve_chunked_encoding. This allows the + caller to get the raw HTTP response when the + Transfer-Encoding is Chunked. This feature was requested + by Benoit Chesneau who wanted to write a HTTP proxy using + ibrowse. + + * Fixed bug with the {stream_to, {Pid, once}} option. Bug + report and lot of help from Filipe David Manana. Thank + you Filipe. + + * The {error, conn_failed} and {error, send_failed} return + values are now of the form {error, {conn_failed, Err}} + and {error, {send_failed, Err}}. This is so that the + specific socket error can be returned to the caller. I + think it looks a bit ugly, but that is the best + compromise I could come up with. + + * Added application configuration parameters + default_max_sessions and default_max_pipeline_size. These + were previously hard coded to 10. + + * Versioning of ibrowse now follows the Semantic Versioning + principles. See http://semver.org. Thanks to Anthony + Molinaro for nudging me in this direction. + + * The connect_timeout option now only applies to the + connection setup phase. In previous versions, the time + taken to setup the connection was deducted from the + specified timeout value for the request. 17-07-2010 - * Merged change made by Filipe David Manana to use the base64 module for encoding/decoding. @@ -173,7 +188,7 @@ CONTRIBUTIONS & CHANGE HISTORY 12-01-2007 - Derek Upham sent in a bug fix. The reset_state function was not behaving correctly when the transfer encoding was not chunked. -13-11-2006 - Youns Hafri reported a bug where ibrowse was not returning the +13-11-2006 - Youns Hafri reported a bug where ibrowse was not returning the temporary filename when the server was closing the connection after sending the data (as in HTTP/1.0). Released ibrowse under the BSD license @@ -192,7 +207,7 @@ CONTRIBUTIONS & CHANGE HISTORY 22-Nov-2005 - Added ability to generate requests using the Chunked Transfer-Encoding. -08-May-2005 - Youns Hafri made a CRUX LINUX port of ibrowse. +08-May-2005 - Youns Hafri made a CRUX LINUX port of ibrowse. http://yhafri.club.fr/crux/index.html Here are some usage examples. Enjoy! diff --git a/doc/ibrowse.html b/doc/ibrowse.html index af65022..88cba60 100644 --- a/doc/ibrowse.html +++ b/doc/ibrowse.html @@ -12,7 +12,7 @@ The ibrowse application implements an HTTP 1.1 client.

Copyright 2005-2010 Chandrashekhar Mullaparthi

-

Version: 2.0.0

+

Version: 2.0.1

Behaviours: gen_server.

Authors: Chandrashekhar Mullaparthi (chandrashekhar dot mullaparthi at gmail dot com).

@@ -446,6 +446,6 @@ send_req/4, send_req/5, send_req/6.

Overviewerlang logo
-

Generated by EDoc, Sep 22 2010, 22:56:44.

+

Generated by EDoc, Sep 24 2010, 06:42:36.

diff --git a/ebin/ibrowse.app b/ebin/ibrowse.app index 208c311..b72099d 100644 --- a/ebin/ibrowse.app +++ b/ebin/ibrowse.app @@ -1,6 +1,6 @@ {application, ibrowse, [{description, "HTTP client application"}, - {vsn, "1.6.2"}, + {vsn, "2.0.0"}, {modules, [ ibrowse, ibrowse_http_client, ibrowse_app, diff --git a/src/ibrowse.erl b/src/ibrowse.erl index 9f7b3a2..7f8d8bc 100644 --- a/src/ibrowse.erl +++ b/src/ibrowse.erl @@ -7,7 +7,7 @@ %%%------------------------------------------------------------------- %% @author Chandrashekhar Mullaparthi %% @copyright 2005-2010 Chandrashekhar Mullaparthi -%% @version 2.0.0 +%% @version 2.0.1 %% @doc The ibrowse application implements an HTTP 1.1 client. 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 @@ -334,7 +334,6 @@ try_routing_request(Lb_pid, Parsed_url, case do_send_req(Conn_Pid, Parsed_url, Headers, Method, Body, Options_1, Timeout) of {error, sel_conn_closed} -> - io:format("Selected connection closed. Trying again...~n", []), try_routing_request(Lb_pid, Parsed_url, Max_sessions, Max_pipeline_size, diff --git a/src/ibrowse_http_client.erl b/src/ibrowse_http_client.erl index 7816359..16d9b87 100644 --- a/src/ibrowse_http_client.erl +++ b/src/ibrowse_http_client.erl @@ -305,12 +305,10 @@ handle_sock_data(Data, #state{status = get_body, {stop, normal, State}; #state{cur_req = #request{caller_controls_socket = Ccs}, interim_reply_sent = Irs} = State_1 -> - %% io:format("Irs: ~p~n", [Irs]), case Irs of true -> active_once(State_1); false when Ccs == true -> - %% io:format("Setting {active,once}~n", []), do_setopts(Socket, [{active, once}], State); false -> active_once(State_1) @@ -1168,13 +1166,6 @@ parse_11_response(DataRecvd, {RemChunk, RemData} = split_binary(DataRecvd, NeedBytes), do_trace("Recvd another chunk...~p~n", [RemChunk]), do_trace("RemData -> ~p~n", [RemData]), - case RemData of - <<>> -> - %% io:format("RemData -> ~p~n", [RemData]); - ok; - _ -> - ok - end, case accumulate_response(RemChunk, State) of {error, Reason} -> do_trace("Error accumulating response --> ~p~n", [Reason]), diff --git a/vsn.mk b/vsn.mk index b3fd96c..d13db2d 100644 --- a/vsn.mk +++ b/vsn.mk @@ -1,2 +1,2 @@ -IBROWSE_VSN = 2.0.0 +IBROWSE_VSN = 2.0.1