svn commit: r954890 - in /couchdb/branches/0.11.x: src/couchdb/couch_httpd.erl test/etap/160-vhosts.t

[ja...@apache.org]

Author: jan
Date: Tue Jun 15 14:02:26 2010
New Revision: 954890

URL: http://svn.apache.org/viewvc?rev=954890&view=rev
Log:
Merge r949912 from trunk:

better tests for the vhost globals, fixed a bug

Modified:
    couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl
    couchdb/branches/0.11.x/test/etap/160-vhosts.t

Modified: couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl?rev=954890&r1=954889&r2=954890&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl Tue Jun 15 14:02:26 2010
@@ -311,8 +311,14 @@ increment_method_stats(Method) ->
 % if so, then it will not be rewritten, but will run as a normal couchdb request.
 % normally you'd use this for _uuids _utils and a few of the others you want to keep available on vhosts. You can also use it to make databases 'global'.
 vhost_global(VhostGlobals, MochiReq) ->
-    "/"++Path = MochiReq:get(path),
-    [true] == [true||V <- VhostGlobals, V == Path].
+    "/" ++ Path = MochiReq:get(path),
+    Front = case partition(Path) of
+    {"", "", ""} ->
+        "/"; % Special case the root url handler
+    {FirstPart, _, _} ->
+        FirstPart
+    end,
+    [true] == [true||V <- VhostGlobals, V == Front].
 
 % Utilities
 

Modified: couchdb/branches/0.11.x/test/etap/160-vhosts.t
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/test/etap/160-vhosts.t?rev=954890&r1=954889&r2=954890&view=diff
==============================================================================
--- couchdb/branches/0.11.x/test/etap/160-vhosts.t (original)
+++ couchdb/branches/0.11.x/test/etap/160-vhosts.t Tue Jun 15 14:02:26 2010
@@ -122,11 +122,10 @@ test_vhost_request_with_qs() ->
     end.
 
 test_vhost_request_with_global() ->
-    Url = server() ++ "_uuids",
-    case ibrowse:send_req(Url, [], get, [], [{host_header, "example.com"}]) of
-        {ok, _, _, Body} ->
-            {JsonProps} = couch_util:json_decode(Body),
-            HasUuids = proplists:is_defined(<<"uuids">>, JsonProps),
-            etap:is(HasUuids, true, "should return _uuids");
+    Url2 = server() ++ "_utils/index.html",
+    case ibrowse:send_req(Url2, [], get, [], [{host_header, "example.com"}]) of
+        {ok, _, _, Body2} ->
+            "<!DOCTYPE" ++ _Foo = Body2,
+            etap:is(true, true, "should serve /_utils even inside vhosts");
         _Else -> false
     end.