From f3f553c59c476ec839f1c89e231bf33ac44ee4d5 Mon Sep 17 00:00:00 2001
From: chandrusf <chandrusf>
Date: Tue, 7 Jun 2005 21:40:02 +0000
Subject: [PATCH] Username/Password for proxy is now optional. This is the
 first time I've used a proxy which doesn't need authentication (no - not a
 dodgy one) and stumbled on to this bug

---
 src/ibrowse_http_client.erl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ibrowse_http_client.erl b/src/ibrowse_http_client.erl
index 42d5d7f..408fef7 100644
--- a/src/ibrowse_http_client.erl
+++ b/src/ibrowse_http_client.erl
@@ -6,7 +6,7 @@
 %%% Created : 11 Oct 2003 by Chandrashekhar Mullaparthi <chandrashekhar.mullaparthi@t-mobile.co.uk>
 %%%-------------------------------------------------------------------
 -module(ibrowse_http_client).
--vsn('$Id: ibrowse_http_client.erl,v 1.2 2005/05/31 11:56:06 chandrusf Exp $ ').
+-vsn('$Id: ibrowse_http_client.erl,v 1.3 2005/06/07 21:40:02 chandrusf Exp $ ').
 
 -behaviour(gen_server).
 %%--------------------------------------------------------------------
@@ -120,8 +120,8 @@ handle_info({{send_req, [Url, Headers, Method,
 		  false ->
 		      State;
 		   _PHost ->
-		      ProxyUser = get_value(proxy_user, Options),
-		      ProxyPassword = get_value(proxy_password, Options),
+		      ProxyUser = get_value(proxy_user, Options, []),
+		      ProxyPassword = get_value(proxy_password, Options, []),
 		      SaveResponseToFile = get_value(save_response_to_file, Options, false),
 		      Digest = http_auth_digest(ProxyUser, ProxyPassword),
 		      State#state{use_proxy = true,
@@ -486,10 +486,14 @@ add_auth_headers(#url{username = User,
     case UseProxy of
 	false ->
 	    Headers_1;
+	true when ProxyAuthDigest == [] ->
+	    Headers_1;
 	true ->
 	    [{"Proxy-Authorization", ["Basic ", ProxyAuthDigest]} | Headers_1]
     end.
 			
+http_auth_digest([], []) ->
+    [];
 http_auth_digest(Username, Password) ->
     encode_base64(Username ++ [$: | Password]).