Permalink
Browse files

Fixed bug in https requests without a proxy in between

  • Loading branch information...
1 parent 07153bc commit d5580a5de217fe14e4fc5ae6b9aa21b103545984 Chandrashekhar Mullaparthi committed Jun 10, 2010
Showing with 8 additions and 3 deletions.
  1. +3 −1 README
  2. +1 −1 ebin/ibrowse.app
  3. +1 −0 src/ibrowse_http_client.erl
  4. +2 −0 src/ibrowse_test.erl
  5. +1 −1 vsn.mk
View
4 README
@@ -18,12 +18,14 @@ ibrowse is available under two different licenses. LGPL or the BSD license.
Comments to : Chandrashekhar.Mullaparthi@gmail.com
-Version : 1.6.0
+Version : 1.6.1
Latest version : git://github.com/cmullaparthi/ibrowse.git
CONTRIBUTIONS & CHANGE HISTORY
==============================
+10-06-2010 - * Fixed bug in https requests not going via the proxy
+
12-05-2010 - * Added support for the CONNECT method to tunnel HTTPS through
a proxy. When a https URL is requested through a proxy,
ibrowse will automatically use the CONNECT method to first
View
@@ -1,6 +1,6 @@
{application, ibrowse,
[{description, "HTTP client application"},
- {vsn, "1.6.0"},
+ {vsn, "1.6.1"},
{modules, [ ibrowse,
ibrowse_http_client,
ibrowse_app,
@@ -460,6 +460,7 @@ filter_sock_options(Opts) ->
do_send(Req, #state{socket = Sock,
is_ssl = true,
+ use_proxy = true,
proxy_tunnel_setup = Pts}) when Pts /= done -> gen_tcp:send(Sock, Req);
do_send(Req, #state{socket = Sock, is_ssl = true}) -> ssl:send(Sock, Req);
do_send(Req, #state{socket = Sock, is_ssl = false}) -> gen_tcp:send(Sock, Req).
View
@@ -192,6 +192,7 @@ dump_errors(Key, Iod) ->
{"http://www.google.co.uk", get},
{"http://www.google.com", get},
{"http://www.google.com", options},
+ {"https://mail.google.com", get},
{"http://www.sun.com", get},
{"http://www.oracle.com", get},
{"http://www.bbc.co.uk", get},
@@ -222,6 +223,7 @@ unit_tests() ->
unit_tests([]).
unit_tests(Options) ->
+ application:start(ssl),
Options_1 = Options ++ [{connect_timeout, 5000}],
{Pid, Ref} = erlang:spawn_monitor(?MODULE, unit_tests_1, [self(), Options_1]),
receive
View
2 vsn.mk
@@ -1,2 +1,2 @@
-IBROWSE_VSN = 1.6.0
+IBROWSE_VSN = 1.6.1

0 comments on commit d5580a5

Please sign in to comment.