tilia-dav 3.1.0.pre.alpha4 → 3.1.0.pre.alpha5

data/test/dav/server_events_test.rb

@@ -23,7 +23,7 @@ module Tilia
 
         @server.http_request = Http::Sapi.create_from_server_array(
           'REQUEST_METHOD'    => 'GET',
-          'REQUEST_PATH'      => '/test.txt'
+          'PATH_INFO'         => '/test.txt'
         )
 
         @server.exec
@@ -36,7 +36,7 @@ module Tilia
         # Also testing put
         req = Http::Sapi.create_from_server_array(
           'REQUEST_METHOD' => 'PUT',
-          'REQUEST_PATH'   => '/barbar'
+          'PATH_INFO'      => '/barbar'
         )
 
         @server.http_request = req
@@ -54,7 +54,7 @@ module Tilia
 
         req = Http::Sapi.create_from_server_array(
           'REQUEST_METHOD' => 'GET',
-          'REQUEST_PATH'   => '/not/exisitng'
+          'PATH_INFO'      => '/not/exisitng'
         )
         @server.http_request = req
         @server.exec

data/test/dav/server_mkcol_test.rb

@@ -5,7 +5,7 @@ module Tilia
     class ServerMKCOLTest < AbstractServer
       def test_mkcol
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL'
         }
 
@@ -29,7 +29,7 @@ module Tilia
 
       def test_mkcol_unknown_body
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL'
         }
 
@@ -51,7 +51,7 @@ module Tilia
 
       def test_mkcol_broken_xml
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -74,7 +74,7 @@ module Tilia
 
       def test_mkcol_unknown_xml
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -97,7 +97,7 @@ module Tilia
 
       def test_mkcol_no_resource_type
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -130,7 +130,7 @@ XML
 
       def test_mkcol_incorrect_resource_type
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -163,7 +163,7 @@ XML
 
       def test_mkcol_success
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -196,7 +196,7 @@ XML
 
       def test_mkcol_white_space_resource_type
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }
@@ -231,7 +231,7 @@ XML
 
       def test_mkcol_no_parent
         server_vars = {
-          'REQUEST_PATH'   => '/testnoparent/409me',
+          'PATH_INFO'      => '/testnoparent/409me',
           'REQUEST_METHOD' => 'MKCOL'
         }
 
@@ -254,7 +254,7 @@ XML
 
       def test_mkcol_parent_is_no_collection
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt/409me',
+          'PATH_INFO'      => '/test.txt/409me',
           'REQUEST_METHOD' => 'MKCOL'
         }
 
@@ -277,7 +277,7 @@ XML
 
       def test_mkcol_already_exists
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'MKCOL'
         }
 
@@ -301,7 +301,7 @@ XML
 
       def test_mkcol_and_props
         server_vars = {
-          'REQUEST_PATH'   => '/testcol',
+          'PATH_INFO'      => '/testcol',
           'REQUEST_METHOD' => 'MKCOL',
           'HTTP_CONTENT_TYPE' => 'application/xml'
         }

data/test/dav/server_plugin_test.rb

@@ -29,7 +29,7 @@ module Tilia
 
       def test_options
         server_vars = {
-          'REQUEST_PATH'   => '/',
+          'PATH_INFO'      => '/',
           'REQUEST_METHOD' => 'OPTIONS'
         }
 

data/test/dav/server_precondition_test.rb

@@ -151,7 +151,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         server.http_response = Http::ResponseMock.new
         refute(server.check_preconditions(http_request, server.http_response))
@@ -168,7 +168,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_MODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
 
         http_response = Http::ResponseMock.new
@@ -180,7 +180,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_MODIFIED_SINCE' => 'Your mother',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         http_response = Http::ResponseMock.new
 
@@ -193,7 +193,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 EST',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         http_response = Http::ResponseMock.new
         assert(server.check_preconditions(http_request, http_response))
@@ -204,7 +204,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         http_response = Http::Response.new
         assert(server.check_preconditions(http_request, http_response))
@@ -215,7 +215,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_UNMODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         http_response = Http::ResponseMock.new
         assert_raises(Exception::PreconditionFailed) do
@@ -228,7 +228,7 @@ module Tilia
         server = ServerMock.new(root)
         http_request = Http::Sapi.create_from_server_array(
           'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1984 08:49:37 CET',
-          'REQUEST_PATH'  => '/foo'
+          'PATH_INFO'     => '/foo'
         )
         http_response = Http::ResponseMock.new
         assert(server.check_preconditions(http_request, http_response))

data/test/dav/server_range_test.rb

@@ -9,7 +9,7 @@ module Tilia
 
       def test_range
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-5'
         }
@@ -40,7 +40,7 @@ module Tilia
 
       def test_start_range
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-'
         }
@@ -71,7 +71,7 @@ module Tilia
 
       def test_end_range
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=-8'
         }
@@ -102,7 +102,7 @@ module Tilia
 
       def test_too_high_range
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=100-200'
         }
@@ -116,7 +116,7 @@ module Tilia
 
       def test_crazy_range
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=8-4'
         }
@@ -132,7 +132,7 @@ module Tilia
         node = @server.tree.node_for_path('test.txt')
 
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-5',
           'HTTP_IF_RANGE'  => node.etag
@@ -166,7 +166,7 @@ module Tilia
         node = @server.tree.node_for_path('test.txt')
 
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-5',
           'HTTP_IF_RANGE'  => node.etag + 'blabla'
@@ -197,7 +197,7 @@ module Tilia
 
       def test_if_range_modification_date
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-5',
           'HTTP_IF_RANGE'  => 'tomorrow'
@@ -229,7 +229,7 @@ module Tilia
 
       def test_if_range_modification_date_modified
         server_vars = {
-          'REQUEST_PATH'   => '/test.txt',
+          'PATH_INFO'      => '/test.txt',
           'REQUEST_METHOD' => 'GET',
           'HTTP_RANGE'     => 'bytes=2-5',
           'HTTP_IF_RANGE'  => '-2 years'

data/test/dav/server_simple_test.rb

@@ -67,7 +67,7 @@ module Tilia
 
       def test_non_existant_method
         server_vars = {
-          'REQUEST_PATH'   => '/',
+          'PATH_INFO'      => '/',
           'REQUEST_METHOD' => 'BLABLA'
         }
 
@@ -88,7 +88,7 @@ module Tilia
 
       def test_base_uri
         server_vars = {
-          'REQUEST_PATH'   => '/blabla/test.txt',
+          'PATH_INFO'      => '/blabla/test.txt',
           'REQUEST_METHOD' => 'GET'
         }
         filename = ::File.join(@temp_dir, 'test.txt')
@@ -187,7 +187,7 @@ module Tilia
 
       def test_guess_base_uri
         server_vars = {
-          'REQUEST_PATH' => '/index.php/root',
+          'SCRIPT_NAME'  => '/index.php',
           'PATH_INFO'    => '/root'
         }
 
@@ -200,7 +200,7 @@ module Tilia
 
       def test_guess_base_uri_percent_encoding
         server_vars = {
-          'REQUEST_PATH' => '/index.php/dir/path2/path%20with%20spaces',
+          'SCRIPT_NAME'  => '/index.php',
           'PATH_INFO'    => '/dir/path2/path with spaces'
         }
 
@@ -214,7 +214,7 @@ module Tilia
       # def test_guess_base_uri_percent_encoding2
       #   skip('This behaviour is not yet implemented')
       #   server_vars = {
-      #     'REQUEST_PATH' => '/some%20directory+mixed/index.php/dir/path2/path%20with%20spaces',
+      #     'PATH_INFO'    => '/some%20directory+mixed/index.php/dir/path2/path%20with%20spaces',
       #     'PATH_INFO'    => '/dir/path2/path with spaces',
       #   }
       #
@@ -227,7 +227,7 @@ module Tilia
 
       def test_guess_base_uri2
         server_vars = {
-          'REQUEST_PATH' => '/index.php/root/',
+          'SCRIPT_NAME' => '/index.php',
           'PATH_INFO'    => '/root/'
         }
 
@@ -240,7 +240,7 @@ module Tilia
 
       def test_guess_base_uri_no_path_info
         server_vars = {
-          'REQUEST_PATH' => '/index.php/root'
+          'PATH_INFO'    => '/index.php/root'
         }
 
         http_request = Tilia::Http::Sapi.create_from_server_array(server_vars)
@@ -252,7 +252,7 @@ module Tilia
 
       def test_guess_base_uri_no_path_info2
         server_vars = {
-          'REQUEST_PATH' => '/a/b/c/test.php'
+          'PATH_INFO'    => '/a/b/c/test.php'
         }
 
         http_request = Tilia::Http::Sapi.create_from_server_array(server_vars)
@@ -264,7 +264,8 @@ module Tilia
 
       def test_guess_base_uri_query_string
         server_vars = {
-          'REQUEST_PATH' => '/index.php/root?query_string=blabla',
+          'SCRIPT_NAME' => '/index.php',
+          'QUERY_STRING' => 'query_string=blabla',
           'PATH_INFO'    => '/root'
         }
 
@@ -275,22 +276,24 @@ module Tilia
         assert_equal('/index.php/', server.guess_base_uri)
       end
 
-      def test_guess_base_uri_bad_config
-        server_vars = {
-          'REQUEST_PATH' => '/index.php/root/heyyy',
-          'PATH_INFO'    => '/root'
-        }
-
-        http_request = Tilia::Http::Sapi.create_from_server_array(server_vars)
-        server = Tilia::Dav::ServerMock.new
-        server.http_request = http_request
-
-        assert_raises(Exception) { server.guess_base_uri }
-      end
+      # Using RACKs environment ...
+      # def test_guess_base_uri_bad_config
+      #   skip()
+      #   server_vars = {
+      #     'PATH_INFO'    => '/index.php/root/heyyy',
+      #     'PATH_INFO'    => '/root'
+      #   }
+      #
+      #   http_request = Tilia::Http::Sapi.create_from_server_array(server_vars)
+      #   server = Tilia::Dav::ServerMock.new
+      #   server.http_request = http_request
+      #
+      #   assert_raises(Exception) { server.guess_base_uri }
+      # end
 
       def test_trigger_exception
         server_vars = {
-          'REQUEST_PATH'   => '/',
+          'PATH_INFO'      => '/',
           'REQUEST_METHOD' => 'FOO'
         }
 
@@ -315,7 +318,7 @@ module Tilia
 
       def test_report_not_found
         server_vars = {
-          'REQUEST_PATH'   => '/',
+          'PATH_INFO'      => '/',
           'REQUEST_METHOD' => 'REPORT'
         }
 
@@ -337,7 +340,7 @@ module Tilia
 
       def test_report_intercepted
         server_vars = {
-          'REQUEST_PATH'   => '/',
+          'PATH_INFO'      => '/',
           'REQUEST_METHOD' => 'REPORT'
         }
 

data/test/dav/sync/plugin_test.rb

@@ -124,7 +124,7 @@ BLA
 
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -184,7 +184,7 @@ BLA
 
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -232,7 +232,7 @@ BLA
 
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'   => 'application/xml',
             'HTTP_DEPTH'     => '1'
           )
@@ -286,7 +286,7 @@ BLA
         def test_sync_no_sync_info
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -313,7 +313,7 @@ BLA
         def test_sync_no_sync_collection
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/normalcoll/',
+            'PATH_INFO'      => '/normalcoll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -341,7 +341,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -369,7 +369,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -396,7 +396,7 @@ BLA
         def test_sync_no_sync_token
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'    => 'application/xml'
           )
 
@@ -423,7 +423,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_PATH'   => '/coll/',
+            'PATH_INFO'      => '/coll/',
             'CONTENT_TYPE'   => 'application/xml'
           )
 
@@ -448,7 +448,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'DELETE',
-            'REQUEST_PATH'   => '/coll/file1.txt',
+            'PATH_INFO'      => '/coll/file1.txt',
             'HTTP_IF'        => '</coll> (<http://sabre.io/ns/sync/1>)'
           )
           response = request(request)
@@ -463,7 +463,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'DELETE',
-            'REQUEST_PATH'   => '/coll/file1.txt',
+            'PATH_INFO'      => '/coll/file1.txt',
             'HTTP_IF'        => '</coll> (Not <http://sabre.io/ns/sync/2>)'
           )
           response = request(request)
@@ -478,7 +478,7 @@ BLA
           @collection.add_change(['file1.txt'], [], [])
           request = Http::Sapi.create_from_server_array(
             'REQUEST_METHOD' => 'DELETE',
-            'REQUEST_PATH'   => '/coll/file1.txt',
+            'PATH_INFO'      => '/coll/file1.txt',
             'HTTP_IF'        => '</coll> (<opaquelocktoken:foo>)'
           )
           response = request(request)

data/test/dav/xml/property/supported_report_set_test.rb

@@ -7,7 +7,7 @@ module Tilia
         class SupportedReportSetTest < AbstractServer
           def send_propfind(body)
             server_vars = {
-              'REQUEST_PATH'        => '/',
+              'PATH_INFO'           => '/',
               'REQUEST_METHOD'      => 'PROPFIND',
               'HTTP_DEPTH'          => '0'
             }

data/test/dav_acl/expand_properties_test.rb

@@ -54,7 +54,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/node1'
+          'PATH_INFO'      => '/node1'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -105,7 +105,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/node1'
+          'PATH_INFO'      => '/node1'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -159,7 +159,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/node2'
+          'PATH_INFO'      => '/node2'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -215,7 +215,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/node2'
+          'PATH_INFO'      => '/node2'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)

data/test/dav_acl/plugin_admin_test.rb

@@ -24,7 +24,7 @@ module Tilia
         request = Http::Sapi.create_from_server_array(
           'REQUEST_METHOD' => 'OPTIONS',
           'HTTP_DEPTH'     => 1,
-          'REQUEST_PATH'   => '/adminonly'
+          'PATH_INFO'      => '/adminonly'
         )
 
         response = Http::ResponseMock.new
@@ -44,7 +44,7 @@ module Tilia
         request = Http::Sapi.create_from_server_array(
           'REQUEST_METHOD' => 'OPTIONS',
           'HTTP_DEPTH'     => 1,
-          'REQUEST_PATH'   => '/adminonly'
+          'PATH_INFO'      => '/adminonly'
         )
 
         response = Http::ResponseMock.new

data/test/dav_acl/principal_property_search_test.rb

@@ -41,7 +41,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '1',
-          'REQUEST_PATH'   => '/principals'
+          'PATH_INFO'      => '/principals'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -80,7 +80,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/principals'
+          'PATH_INFO'      => '/principals'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -121,7 +121,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/'
+          'PATH_INFO'      => '/'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -186,7 +186,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/'
+          'PATH_INFO'      => '/'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -251,7 +251,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/'
+          'PATH_INFO'      => '/'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -309,7 +309,7 @@ BODY
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/'
+          'PATH_INFO'      => '/'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)

data/test/dav_acl/principal_search_property_set_test.rb

@@ -28,7 +28,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '1',
-          'REQUEST_PATH'   => '/principals'
+          'PATH_INFO'      => '/principals'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -58,7 +58,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/principals'
+          'PATH_INFO'      => '/principals'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)
@@ -86,7 +86,7 @@ XML
         server_vars = {
           'REQUEST_METHOD' => 'REPORT',
           'HTTP_DEPTH'     => '0',
-          'REQUEST_PATH'   => '/principals'
+          'PATH_INFO'      => '/principals'
         }
 
         request = Http::Sapi.create_from_server_array(server_vars)