summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2010-09-13 13:22:25 +0000
committerFilipe David Borba Manana <fdmanana@apache.org>2010-09-13 13:22:25 +0000
commitd107466d3962a989b9371b8194d35a258886616e (patch)
tree4e55ca86705f7b8e14971267aa73cbe6aab98846 /src/couchdb
parentcca05238288464f3e6670ec9de5bb69623ac8d5d (diff)
Merging revision 985730 from trunk:
Bumping ibrowse library to version 1.6.2 (latest). It has a few important bug fixes and new features, such as, for example: 1) fixes https requests not going via the proxy; 2) added SSL support for direct connections; 3) fixes to URL parsing; 4) added option headers_as_is This is important since it fixes replication through a proxy not working with HTTPS. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@996520 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_rep_httpc.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep_httpc.erl b/src/couchdb/couch_rep_httpc.erl
index 886babd1..a47c26a3 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/src/couchdb/couch_rep_httpc.erl
@@ -204,8 +204,7 @@ spawn_worker_process(Req) ->
Pid.
spawn_link_worker_process(Req) ->
- Url = ibrowse_lib:parse_url(Req#http_db.url),
- {ok, Pid} = ibrowse_http_client:start_link(Url),
+ {ok, Pid} = ibrowse:spawn_link_worker_process(Req#http_db.url),
Pid.
maybe_decompress(Headers, Body) ->