You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2008/06/01 20:47:20 UTC
svn commit: r662263 -
/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
Author: jan
Date: Sun Jun 1 11:47:20 2008
New Revision: 662263
URL: http://svn.apache.org/viewvc?rev=662263&view=rev
Log:
Really resolve conflict.
Modified:
incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
Modified: incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl?rev=662263&r1=662262&r2=662263&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl (original)
+++ incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl Sun Jun 1 11:47:20 2008
@@ -106,17 +106,10 @@
{ok, Req:respond({301, [{"Location", "/_utils/"}], <<>>})};
"/_utils/" ++ PathInfo ->
{ok, Req:serve_file(PathInfo, DocumentRoot)};
-<<<<<<< .working
- "/_config/" ++ Config ->
- handle_config_request(Req, Method, {config, Config});
- "/_" ++ UnknownPrivatePath ->
- handle_unkown_private_uri_request(Req, Method, UnknownPrivatePath);
-=======
"/_" ++ _Path ->
throw({not_found, unknown_private_path});
"/favicon.ico" ->
{ok, Req:serve_file("favicon.ico", DocumentRoot)};
->>>>>>> .merge-right.r660315
_Else ->
handle_db_request(Req, Method, {Path})
end.