couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
Subject svn commit: r660139 - /incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
Date Mon, 26 May 2008 09:20:48 GMT
Author: cmlenz
Date: Mon May 26 02:20:47 2008
New Revision: 660139

URL: http://svn.apache.org/viewvc?rev=660139&view=rev
Log:
Change error handling on unknown private paths to be more consistent with how other errors
are handled.

Modified:
    incubator/couchdb/trunk/src/couchdb/couch_httpd.erl

Modified: incubator/couchdb/trunk/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=660139&r1=660138&r2=660139&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ incubator/couchdb/trunk/src/couchdb/couch_httpd.erl Mon May 26 02:20:47 2008
@@ -99,8 +99,8 @@
             {ok, Req:respond({301, [{"Location", "/_utils/"}], <<>>})};
         "/_utils/" ++ PathInfo ->
             {ok, Req:serve_file(PathInfo, DocumentRoot)};
-        "/_" ++ UnknownPrivatePath ->
-            handle_unkown_private_uri_request(Req, Method, UnknownPrivatePath);
+        "/_" ++ _Path ->
+            throw({not_found, unknown_private_path});
         _Else ->
             handle_db_request(Req, Method, {Path})
     end.
@@ -134,18 +134,6 @@
 handle_replicate_request(_Req, _Method) ->
     throw({method_not_allowed, "POST"}).
 
-handle_unkown_private_uri_request(Req, _Method, UnknownPrivatePath) ->
-  KnownPrivatePaths = ["_utils"],
-  Msg = {obj,
-    [
-      {error, "Could not find the private path '_" ++
-        mochiweb_util:unquote(UnknownPrivatePath) ++
-        "'. Known private path(s): '" ++
-        lists:flatten(KnownPrivatePaths) ++ "'"}
-    ]
-  },
-  send_error(Req, 404, Msg).
-
 % Database request handlers
 
 handle_db_request(Req, Method, {Path}) ->



Mime
View raw message