Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 66677 invoked from network); 1 Jun 2008 18:47:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Jun 2008 18:47:43 -0000 Received: (qmail 99319 invoked by uid 500); 1 Jun 2008 18:47:46 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 99291 invoked by uid 500); 1 Jun 2008 18:47:46 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 99282 invoked by uid 99); 1 Jun 2008 18:47:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 11:47:46 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 18:46:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9FFDB2388A1B; Sun, 1 Jun 2008 11:47:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662263 - /incubator/couchdb/branches/runtimeconfig/src/couchdb/couch_httpd.erl Date: Sun, 01 Jun 2008 18:47:20 -0000 To: couchdb-commits@incubator.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080601184720.9FFDB2388A1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.