couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r1094420 - /couchdb/branches/1.1.x/src/couchdb/couch_rep.erl
Date Mon, 18 Apr 2011 09:45:00 GMT
Author: fdmanana
Date: Mon Apr 18 09:44:59 2011
New Revision: 1094420

URL: http://svn.apache.org/viewvc?rev=1094420&view=rev
Log:
Merged revision 1094419 from branch 1.0.x

    Replicator: fix proxy feature after upgrading ibrowse to version 2.2.0

Modified:
    couchdb/branches/1.1.x/src/couchdb/couch_rep.erl

Modified: couchdb/branches/1.1.x/src/couchdb/couch_rep.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_rep.erl?rev=1094420&r1=1094419&r2=1094420&view=diff
==============================================================================
--- couchdb/branches/1.1.x/src/couchdb/couch_rep.erl (original)
+++ couchdb/branches/1.1.x/src/couchdb/couch_rep.erl Mon Apr 18 09:44:59 2011
@@ -22,6 +22,7 @@
 
 -include("couch_db.hrl").
 -include("couch_js_functions.hrl").
+-include("../ibrowse/ibrowse.hrl").
 
 -define(REP_ID_VERSION, 2).
 
@@ -849,9 +850,13 @@ parse_proxy_params(ProxyUrl) when is_bin
 parse_proxy_params([]) ->
     [];
 parse_proxy_params(ProxyUrl) ->
-    {url, _, Base, Port, User, Passwd, _Path, _Proto} =
-        ibrowse_lib:parse_url(ProxyUrl),
-    [{proxy_host, Base}, {proxy_port, Port}] ++
+    #url{
+        host = Host,
+        port = Port,
+        username = User,
+        password = Passwd
+    } = ibrowse_lib:parse_url(ProxyUrl),
+    [{proxy_host, Host}, {proxy_port, Port}] ++
         case is_list(User) andalso is_list(Passwd) of
         false ->
             [];



Mime
View raw message