couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
Subject svn commit: r648222 - in /incubator/couchdb/trunk: ./ bin/ etc/couchdb/ share/www/style/ src/ src/couch_inets/ src/couchdb/ src/mochiweb/
Date Tue, 15 Apr 2008 12:21:05 GMT
Author: cmlenz
Date: Tue Apr 15 05:21:00 2008
New Revision: 648222

URL: http://svn.apache.org/viewvc?rev=648222&view=rev
Log:
Merged mochiweb branch back into trunk.

Added:
    incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/couchdb/couch_httpd.erl
    incubator/couchdb/trunk/src/mochiweb/   (props changed)
      - copied from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/
    incubator/couchdb/trunk/src/mochiweb/Makefile.am
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/Makefile.am
    incubator/couchdb/trunk/src/mochiweb/mochihex.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochihex.erl
    incubator/couchdb/trunk/src/mochiweb/mochijson.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochijson.erl
    incubator/couchdb/trunk/src/mochiweb/mochijson2.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochijson2.erl
    incubator/couchdb/trunk/src/mochiweb/mochinum.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochinum.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb.app
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb.app
    incubator/couchdb/trunk/src/mochiweb/mochiweb.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_app.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_app.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_charref.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_charref.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_cookies.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_cookies.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_echo.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_echo.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_headers.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_headers.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_html.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_html.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_http.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_http.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_multipart.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_multipart.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_request.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_request.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_response.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_response.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_skel.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_skel.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_socket_server.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_socket_server.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_sup.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_sup.erl
    incubator/couchdb/trunk/src/mochiweb/mochiweb_util.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/mochiweb_util.erl
    incubator/couchdb/trunk/src/mochiweb/reloader.erl
      - copied unchanged from r648218, incubator/couchdb/branches/mochiweb/src/mochiweb/reloader.erl
Removed:
    incubator/couchdb/trunk/src/couch_inets/
    incubator/couchdb/trunk/src/couchdb/mod_couch.erl
Modified:
    incubator/couchdb/trunk/   (props changed)
    incubator/couchdb/trunk/NOTICE
    incubator/couchdb/trunk/bin/couchdb.tpl.in
    incubator/couchdb/trunk/configure.ac
    incubator/couchdb/trunk/etc/couchdb/Makefile.am
    incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in
    incubator/couchdb/trunk/share/www/style/layout.css
    incubator/couchdb/trunk/src/Makefile.am
    incubator/couchdb/trunk/src/couchdb/Makefile.am
    incubator/couchdb/trunk/src/couchdb/cjson.erl
    incubator/couchdb/trunk/src/couchdb/couch.app.tpl.in
    incubator/couchdb/trunk/src/couchdb/couch_db.erl
    incubator/couchdb/trunk/src/couchdb/couch_doc.erl
    incubator/couchdb/trunk/src/couchdb/couch_rep.erl
    incubator/couchdb/trunk/src/couchdb/couch_server_sup.erl

Propchange: incubator/couchdb/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 15 05:21:00 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-648070
+/incubator/couchdb/trunk:1-648187

Modified: incubator/couchdb/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/NOTICE?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/NOTICE (original)
+++ incubator/couchdb/trunk/NOTICE Tue Apr 15 05:21:00 2008
@@ -15,6 +15,6 @@
  * m4/ac_check_icu.m4 - Copyright 2005 Akos Maroy <darkeye@tyrell.hu>
  * share/www/script/jquery.js - Copyright 2008 John Resig
  * share/www/script/json2.js - Public domain
- * src/couch_inets - Copyright 1999 Ericsson Utvecklings AB
+ * src/mochiweb - Copyright 2007 Mochi Media, Inc.
 
 [1]: http://www.apache.org/

Modified: incubator/couchdb/trunk/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/couchdb.tpl.in?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/bin/couchdb.tpl.in (original)
+++ incubator/couchdb/trunk/bin/couchdb.tpl.in Tue Apr 15 05:21:00 2008
@@ -223,7 +223,7 @@
     command="`%ICU_CONFIG% --invoke` \
         %ERL% $interactive_option -sasl errlog_type error \
         -pa %erlanglibdir%/couch-%version%/ebin \
-            %erlanglibdir%/couch_inets-4.7.5/ebin \
+            %erlanglibdir%/mochiweb-r64/ebin \
         -eval \"application:load(couch)\" \
         -eval \"couch_server:start(), receive done -> done end.\" \
         -couchini $INI_FILE"

Modified: incubator/couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/configure.ac (original)
+++ incubator/couchdb/trunk/configure.ac Tue Apr 15 05:21:00 2008
@@ -215,7 +215,6 @@
 AC_CONFIG_FILES([bin/couchdb.tpl])
 AC_CONFIG_FILES([bin/Makefile])
 AC_CONFIG_FILES([etc/couchdb/Makefile])
-AC_CONFIG_FILES([etc/couchdb/couch_httpd.conf.tpl])
 AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl])
 AC_CONFIG_FILES([etc/default/couchdb.tpl])
 AC_CONFIG_FILES([etc/default/Makefile])
@@ -227,9 +226,9 @@
 AC_CONFIG_FILES([etc/logrotate.d/Makefile])
 AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([share/Makefile])
-AC_CONFIG_FILES([src/couch_inets/Makefile])
 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
 AC_CONFIG_FILES([src/couchdb/Makefile])
+AC_CONFIG_FILES([src/mochiweb/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([var/Makefile])
 

Modified: incubator/couchdb/trunk/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/Makefile.am?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/couchdb/Makefile.am Tue Apr 15 05:21:00 2008
@@ -12,11 +12,9 @@
 
 datarootdir = @prefix@/share
 
-pkgconf_DATA = couch.ini couch_httpd.conf
+pkgconf_DATA = couch.ini
 
-nobase_dist_pkgconf_DATA = conf/mime.types
-
-CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA)
+CLEANFILES = $(pkgconf_DATA)
 
 transform = @program_transform_name@
 couchjs_command_name = `echo couchjs | sed '$(transform)'`
@@ -32,10 +30,3 @@
 	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
 	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
 	< $< > $@
-
-couch_httpd.conf: couch_httpd.conf.tpl
-	sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	< $< > $@
-

Modified: incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in (original)
+++ incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in Tue Apr 15 05:21:00 2008
@@ -6,9 +6,13 @@
 
 DbRootDir=%pkgstatelibdir%
 
-LogFile=%pkgstatelogdir%/couch.log
+Port=5984
+
+BindAddress=127.0.0.1
 
-HttpConfigFile=%pkgconfdir%/couch_httpd.conf
+DocumentRoot=%pkgdatadir%/www
+
+LogFile=%pkgstatelogdir%/couch.log
 
 UtilDriverDir=%couchprivlibdir%
 

Modified: incubator/couchdb/trunk/share/www/style/layout.css
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/share/www/style/layout.css?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/share/www/style/layout.css (original)
+++ incubator/couchdb/trunk/share/www/style/layout.css Tue Apr 15 05:21:00 2008
@@ -382,7 +382,7 @@
 #tests tbody.content td.status { background-position: 5px 8px;
   background-repeat: no-repeat; color: #999; padding-left: 20px;
 }
-#tests tbody.content td.details { width: 50%; overflow: auto; }
+#tests tbody.content td.details { width: 50%; }
 #tests tbody.content td.details a { border-bottom: 1px dashed #ccc;
   color: #999; float: right; font-size: 85%;
 }

Modified: incubator/couchdb/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/Makefile.am?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/Makefile.am (original)
+++ incubator/couchdb/trunk/src/Makefile.am Tue Apr 15 05:21:00 2008
@@ -12,4 +12,4 @@
 
 datarootdir = @prefix@/share
 
-SUBDIRS = couch_inets couchdb
+SUBDIRS = couchdb mochiweb

Modified: incubator/couchdb/trunk/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/Makefile.am?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/src/couchdb/Makefile.am Tue Apr 15 05:21:00 2008
@@ -36,6 +36,7 @@
     couch_doc.erl \
     couch_event_sup.erl \
     couch_file.erl \
+    couch_httpd.erl \
     couch_ft_query.erl \
     couch_key_tree.erl \
     couch_log.erl \
@@ -45,8 +46,7 @@
     couch_server_sup.erl \
     couch_stream.erl \
     couch_util.erl \
-    couch_view.erl \
-    mod_couch.erl
+    couch_view.erl
 
 couchebin_DATA = \
     cjson.beam \
@@ -58,6 +58,7 @@
     couch_event_sup.beam \
     couch_file.beam \
     couch_ft_query.beam \
+    couch_httpd.beam \
     couch_key_tree.beam \
     couch_log.beam \
     couch_query_servers.beam \
@@ -66,8 +67,7 @@
     couch_server_sup.beam \
     couch_stream.beam \
     couch_util.beam \
-    couch_view.beam \
-    mod_couch.beam
+    couch_view.beam
 
 couchinclude_DATA = couch_db.hrl
 

Modified: incubator/couchdb/trunk/src/couchdb/cjson.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/cjson.erl?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/cjson.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/cjson.erl Tue Apr 15 05:21:00 2008
@@ -410,7 +410,7 @@
 tokenize([L | Rest], S) when is_list(L) ->
     tokenize(L ++ Rest, S);
 tokenize([B | Rest], S) when is_binary(B) ->
-    tokenize(xmerl_ucs:from_utf8(B) ++ Rest, S);
+    tokenize(xmerl_ucs:from_utf8(B) ++ Rest, S#decoder{input_encoding=unicode});
 tokenize("\r\n" ++ Rest, S) ->
     tokenize(Rest, ?INC_LINE(S));
 tokenize("\n" ++ Rest, S) ->

Modified: incubator/couchdb/trunk/src/couchdb/couch.app.tpl.in
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch.app.tpl.in?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch.app.tpl.in (original)
+++ incubator/couchdb/trunk/src/couchdb/couch.app.tpl.in Tue Apr 15 05:21:00 2008
@@ -13,7 +13,7 @@
                         couch_key_tree,
                         couch_view,
                         couch_util,
-                        mod_couch,
+                        couch_httpd,
                         couch_event_sup,
                         couch_db_update_notifier,
                         couch_ft_query,
@@ -25,5 +25,4 @@
                            couch_view,
                            couch_query_servers,
                            couch_ft_query]},
-              {applications,[kernel,stdlib,xmerl,couch_inets]},
-              {mod,{couch_server,[]}}]}.
+              {applications,[kernel,stdlib,xmerl,inets,mochiweb]}]}.

Modified: incubator/couchdb/trunk/src/couchdb/couch_db.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_db.erl?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_db.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_db.erl Tue Apr 15 05:21:00 2008
@@ -246,6 +246,7 @@
     end.
 
 update_docs(MainPid, Docs, Options) ->
+    % go ahead and generate the new revision ids for the documents.
     Docs2 = lists:map(
         fun(#doc{id=Id,revs=Revs}=Doc) ->
             case Id of
@@ -261,7 +262,7 @@
     Ids = [Id || [#doc{id=Id}|_] <- DocBuckets],
     Db = get_db(MainPid),
     
-    % first things first, lookup the doc by id and get the most recent
+    % lookup the doc by id and get the most recent
     
     ExistingDocs = get_full_doc_infos(Db, Ids),
     
@@ -276,7 +277,6 @@
             [prepare_doc_for_new_edit(Db, Doc, OldFullDocInfo, LeafRevsDict) || Doc <-
Bucket]
         end,
         DocBuckets, ExistingDocs),
-    
     % flush unwritten binaries to disk.
     DocBuckets3 = [[doc_flush_binaries(Doc, Db#db.fd) || Doc <- Bucket] || Bucket <-
DocBuckets2],
 
@@ -607,7 +607,7 @@
     Doc = make_doc(Db, Id, IsDeleted, Sp, [Rev]),
     {ok, Doc#doc{meta=doc_meta_info(DocInfo, [], Options)}};
 open_doc_int(Db, #full_doc_info{id=Id,rev_tree=RevTree}=FullDocInfo, Options) ->
-    #doc_info{deleted=IsDeleted,rev=Rev, summary_pointer=Sp} = DocInfo =
+    #doc_info{deleted=IsDeleted,rev=Rev,summary_pointer=Sp} = DocInfo =
         couch_doc:to_doc_info(FullDocInfo),
     {[{_Rev,_Value, Revs}], []} = couch_key_tree:get(RevTree, [Rev]),
     Doc = make_doc(Db, Id, IsDeleted, Sp, Revs),
@@ -626,7 +626,14 @@
     true ->
         {[RevPath],[]} = 
             couch_key_tree:get_full_key_paths(RevTree, [DocInfo#doc_info.rev]),
-        [{revs_info, [{Rev, Deleted} || {Rev, {Deleted, _Sp0}} <- RevPath]}]
+        [{revs_info, lists:map(
+            fun({Rev, {true, _Sp}}) -> 
+                {Rev, deleted};
+            ({Rev, {false, _Sp}}) ->
+                {Rev, available};
+            ({Rev, ?REV_MISSING}) ->
+                {Rev, missing}
+            end, RevPath)}]
     end ++
     case lists:member(conflicts, Options) of
     false -> [];

Modified: incubator/couchdb/trunk/src/couchdb/couch_doc.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_doc.erl?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_doc.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_doc.erl Tue Apr 15 05:21:00 2008
@@ -128,13 +128,12 @@
     [{RevId, {IsDeleted, SummaryPointer}, _Path} | Rest] = SortedLeafRevs,
 
     {ConflictRevTuples, DeletedConflictRevTuples} =
-        lists:splitwith(fun({_ConflictRevId, {IsDeleted1, _SummaryPointer}, _}) ->
+        lists:splitwith(fun({_ConflictRevId, {IsDeleted1, _Sp}, _}) ->
                 not IsDeleted1
             end, Rest),
 
     ConflictRevs = [RevId1  || {RevId1, _, _} <- ConflictRevTuples],
     DeletedConflictRevs = [RevId2   || {RevId2, _, _} <- DeletedConflictRevTuples],
-
     #doc_info{
         id=Id,
         update_seq=Seq,

Modified: incubator/couchdb/trunk/src/couchdb/couch_rep.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_rep.erl?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_rep.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_rep.erl Tue Apr 15 05:21:00 2008
@@ -154,6 +154,15 @@
     couch_log:debug("couch_rep HTTP client request:"),
     couch_log:debug("\tAction: ~p", [Action]),
     couch_log:debug("\tUrl: ~p", [Url]),
+
+    % ensure that the inets application is running
+    case application:start(inets) of
+        ok ->
+            ok;
+        {error, {already_started, inets}} ->
+            ok
+    end,
+
     Request =
     case JsonBody of
     [] ->

Modified: incubator/couchdb/trunk/src/couchdb/couch_server_sup.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=648222&r1=648221&r2=648222&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_server_sup.erl Tue Apr 15 05:21:00 2008
@@ -65,7 +65,9 @@
     ConsoleStartupMsg = proplists:get_value({"Couch", "ConsoleStartupMsg"}, Ini, "Apache
CouchDB is starting."),
     LogLevel = list_to_atom(proplists:get_value({"Couch", "LogLevel"}, Ini, "error")),
     DbRootDir = proplists:get_value({"Couch", "DbRootDir"}, Ini, "."),
-    HttpConfigFile = proplists:get_value({"Couch", "HttpConfigFile"}, Ini, "couch_httpd.conf"),
+    BindAddress = proplists:get_value({"Couch", "BindAddress"}, Ini, any),
+    Port = proplists:get_value({"Couch", "Port"}, Ini, 5984),
+    DocumentRoot = proplists:get_value({"Couch", "DocumentRoot"}, Ini, "share/www"),
     LogFile = proplists:get_value({"Couch", "LogFile"}, Ini, "couchdb.log"),
     UtilDriverDir = proplists:get_value({"Couch", "UtilDriverDir"}, Ini, ""),
     UpdateNotifierExes = proplists:get_all_values({"Couch", "DbUpdateNotificationProcess"},
Ini),
@@ -111,12 +113,12 @@
             brutal_kill,
             worker,
             [couch_view]},
-        {httpd,
-            {httpd, start_link, [HttpConfigFile]},
+        {couch_httpd,
+            {couch_httpd, start_link, [BindAddress, Port, DocumentRoot]},
             permanent,
             1000,
             supervisor,
-            [httpd]}
+            [couch_httpd]}
         ] ++
         lists:map(fun(UpdateNotifierExe) ->
             {UpdateNotifierExe,
@@ -148,7 +150,9 @@
 
     ConfigInfo = io_lib:format("Config Info ~s:~n\tCurrentWorkingDir=~s~n" ++
         "\tDbRootDir=~s~n" ++
-        "\tHttpConfigFile=~s~n" ++
+        "\tBindAddress=~p~n" ++
+        "\tPort=~p~n" ++
+        "\tDocumentRoot=~s~n" ++
         "\tLogFile=~s~n" ++
         "\tUtilDriverDir=~s~n" ++
         "\tDbUpdateNotificationProcesses=~s~n" ++
@@ -157,7 +161,9 @@
             [IniFilename,
             Cwd,
             DbRootDir,
-            HttpConfigFile,
+            BindAddress,
+            Port,
+            DocumentRoot,
             LogFile,
             UtilDriverDir,
             UpdateNotifierExes,

Propchange: incubator/couchdb/trunk/src/mochiweb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 15 05:21:00 2008
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.beam



Mime
View raw message