|
 |
b1e3f8a |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
37c7a4c |
Date: Sun, 13 Feb 2011 14:52:57 +0300
|
|
|
a81d5c8 |
Subject: [PATCH] Fixes for system-wide ibrowse
|
|
|
b1e3f8a |
|
|
|
37c7a4c |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
b1e3f8a |
|
|
|
9990b5e |
diff --git a/src/couch_replicator/src/couch_replicator_httpc.erl b/src/couch_replicator/src/couch_replicator_httpc.erl
|
|
|
a81d5c8 |
index b8fb31b..44f308b 100644
|
|
|
9990b5e |
--- a/src/couch_replicator/src/couch_replicator_httpc.erl
|
|
|
9990b5e |
+++ b/src/couch_replicator/src/couch_replicator_httpc.erl
|
|
|
4ee01f7 |
@@ -14,7 +14,7 @@
|
|
|
4ee01f7 |
|
|
|
4ee01f7 |
-include("couch_db.hrl").
|
|
|
9990b5e |
-include("couch_replicator_api_wrap.hrl").
|
|
|
4ee01f7 |
--include("../ibrowse/ibrowse.hrl").
|
|
|
4ee01f7 |
+-include_lib("ibrowse/include/ibrowse.hrl").
|
|
|
4ee01f7 |
|
|
|
4ee01f7 |
-export([setup/1]).
|
|
|
4ee01f7 |
-export([send_req/3]).
|
|
|
9990b5e |
diff --git a/src/couch_replicator/src/couch_replicator_utils.erl b/src/couch_replicator/src/couch_replicator_utils.erl
|
|
|
a75f831 |
index 99ddebf..1948b7d 100644
|
|
|
9990b5e |
--- a/src/couch_replicator/src/couch_replicator_utils.erl
|
|
|
9990b5e |
+++ b/src/couch_replicator/src/couch_replicator_utils.erl
|
|
|
9990b5e |
@@ -21,7 +21,7 @@
|
|
|
9990b5e |
-include("couch_db.hrl").
|
|
|
9990b5e |
-include("couch_replicator_api_wrap.hrl").
|
|
|
9990b5e |
-include("couch_replicator.hrl").
|
|
|
9990b5e |
--include("../ibrowse/ibrowse.hrl").
|
|
|
9990b5e |
+-include_lib("ibrowse/include/ibrowse.hrl").
|
|
|
9990b5e |
|
|
|
9990b5e |
-import(couch_util, [
|
|
|
9990b5e |
get_value/2,
|
|
|
ded6933 |
diff --git a/src/couchdb/couch_httpd_proxy.erl b/src/couchdb/couch_httpd_proxy.erl
|
|
|
4ee01f7 |
index dec3f55..eb037b4 100644
|
|
|
ded6933 |
--- a/src/couchdb/couch_httpd_proxy.erl
|
|
|
ded6933 |
+++ b/src/couchdb/couch_httpd_proxy.erl
|
|
|
ded6933 |
@@ -14,7 +14,7 @@
|
|
|
ded6933 |
-export([handle_proxy_req/2]).
|
|
|
ded6933 |
|
|
|
ded6933 |
-include("couch_db.hrl").
|
|
|
ded6933 |
--include("../ibrowse/ibrowse.hrl").
|
|
|
ded6933 |
+-include_lib("ibrowse/include/ibrowse.hrl").
|
|
|
ded6933 |
|
|
|
ded6933 |
-define(TIMEOUT, infinity).
|
|
|
ded6933 |
-define(PKT_SIZE, 4096).
|