Fixed bug in https requests without a proxy in between

cmullaparthi · Jun 10, 2010 · d5580a5 · d5580a5
1 parent 07153bc
commit d5580a5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/README b/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

diff --git a/ebin/ibrowse.app b/ebin/ibrowse.app
@@ -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, 

diff --git a/src/ibrowse_http_client.erl b/src/ibrowse_http_client.erl
@@ -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).

diff --git a/src/ibrowse_test.erl b/src/ibrowse_test.erl
@@ -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 

diff --git a/vsn.mk b/vsn.mk
@@ -1,2 +1,2 @@
-IBROWSE_VSN = 1.6.0
+IBROWSE_VSN = 1.6.1