summaryrefslogtreecommitdiff
path: root/src/ibrowse/ibrowse_sup.erl
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/ibrowse/ibrowse_sup.erl
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/ibrowse/ibrowse_sup.erl')
-rw-r--r--src/ibrowse/ibrowse_sup.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ibrowse/ibrowse_sup.erl b/src/ibrowse/ibrowse_sup.erl
index 1b9b863a..ace33d16 100644
--- a/src/ibrowse/ibrowse_sup.erl
+++ b/src/ibrowse/ibrowse_sup.erl
@@ -1,13 +1,11 @@
%%%-------------------------------------------------------------------
%%% File : ibrowse_sup.erl
%%% Author : Chandrashekhar Mullaparthi <chandrashekhar.mullaparthi@t-mobile.co.uk>
-%%% Description :
+%%% Description :
%%%
%%% Created : 15 Oct 2003 by Chandrashekhar Mullaparthi <chandrashekhar.mullaparthi@t-mobile.co.uk>
%%%-------------------------------------------------------------------
-module(ibrowse_sup).
--vsn('$Id: ibrowse_sup.erl,v 1.1 2005/05/05 22:28:28 chandrusf Exp $ ').
-
-behaviour(supervisor).
%%--------------------------------------------------------------------
%% Include files
@@ -53,7 +51,7 @@ start_link() ->
%% Func: init/1
%% Returns: {ok, {SupFlags, [ChildSpec]}} |
%% ignore |
-%% {error, Reason}
+%% {error, Reason}
%%--------------------------------------------------------------------
init([]) ->
AChild = {ibrowse,{ibrowse,start_link,[]},