diff options
| author | John Christopher Anderson <jchris@apache.org> | 2009-01-29 22:15:48 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2009-01-29 22:15:48 +0000 |
| commit | ace6dfe0107010b57c5da0596f69cfd10fc84a38 (patch) | |
| tree | bbcaedf64e20a580214f1b1f74cd40473073279c /bin | |
| parent | 7cbee5abae38fca0c612e22bb1079641c96cd348 (diff) | |
Replacement of inets with ibrowse. Fixes COUCHDB-179 and enhances replication.
Thanks Jason Davies and Adam Kocoloski for the fix, Maximillian Dornseif for reporting.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@739047 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Makefile.am | 5 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index e03dfa0d..decc4ef7 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -28,8 +28,9 @@ couchdb: couchdb.tpl -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \ -e "s|%bindir%|@bindir@|g" \ -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \ - -e "s|%mochiwebebindir%|couch-@version@/ebin|g" \ - -e "s|%couchdbebindir%|mochiweb-r82/ebin|g" \ + -e "s|%couchdbebindir%|couch-@version@/ebin|g" \ + -e "s|%mochiwebebindir%|mochiweb-r82/ebin|g" \ + -e "s|%ibrowseebindir%|ibrowse-1.4.1/ebin|g" \ -e "s|%defaultini%|default.ini|g" \ -e "s|%localini%|local.ini|g" \ -e "s|%localconfdir%|@localconfdir@|g" \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index c769bd33..4959654a 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -183,11 +183,12 @@ start_couchdb () { %ERL% $interactive_option -smp auto -sasl errlog_type error +K true \ -pa %localerlanglibdir%/%couchdbebindir% \ %localerlanglibdir%/%mochiwebebindir% \ - -eval \"application:load(inets)\" \ + %localerlanglibdir%/%ibrowseebindir% \ + -eval \"application:load(ibrowse)\" \ -eval \"application:load(crypto)\" \ -eval \"application:load(couch)\" \ -eval \"crypto:start()\" \ - -eval \"inets:start()\" \ + -eval \"ibrowse:start()\" \ -eval \"couch_server:start([$start_arguments]), receive done -> done end.\" " if test "$BACKGROUND_BOOLEAN" = "true" \ -a "$RECURSED_BOOLEAN" = "false"; then |