[Pkg-owncloud-commits] [php-sabredav] 09/33: Fixes Issue 23

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag version-1.0.10
in repository php-sabredav.

commit 46cc746e74383485a99cb172d18fcf58fd74121f
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Mar 3 19:40:30 2010 +0900

    Fixes Issue 23
---
 ChangeLog                            | 1 +
 lib/Sabre/DAV/Server.php             | 2 +-
 tests/Sabre/DAV/FSExt/NodesTest.php  | 2 +-
 tests/Sabre/DAV/ServerPluginTest.php | 2 +-
 tests/Sabre/DAV/ServerSimpleTest.php | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 75a5526..b91b0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 1.0.8-stable (2010-??-??)
 	* Fixed: Issue 21: typos causing errors
+	* Fixed: Issue 23: Comma's between methods in Allow header.
 
 1.0.7-stable (2010-02-24)
 	* Fixed: Issue 19 regression for MS Office
diff --git a/lib/Sabre/DAV/Server.php b/lib/Sabre/DAV/Server.php
index af31b38..d5124c7 100644
--- a/lib/Sabre/DAV/Server.php
+++ b/lib/Sabre/DAV/Server.php
@@ -264,7 +264,7 @@ class Sabre_DAV_Server {
         foreach($this->plugins as $plugin) $methods = array_merge($methods,$plugin->getHTTPMethods());
         array_unique($methods);
 
-        $this->httpResponse->setHeader('Allow',strtoupper(implode(' ',$methods)));
+        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
         $features = array('1','3');
 
         foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
diff --git a/tests/Sabre/DAV/FSExt/NodesTest.php b/tests/Sabre/DAV/FSExt/NodesTest.php
index 2538d70..520759f 100644
--- a/tests/Sabre/DAV/FSExt/NodesTest.php
+++ b/tests/Sabre/DAV/FSExt/NodesTest.php
@@ -206,7 +206,7 @@ class Sabre_DAV_FSExt_NodesTest extends Sabre_DAV_AbstractServer{
         $this->assertEquals(array(
             'DAV'            => '1, 3',
             'MS-Author-Via'  => 'DAV',
-            'Allow'          => 'OPTIONS GET HEAD DELETE TRACE PROPFIND MKCOL PUT PROPPATCH COPY MOVE REPORT',
+            'Allow'          => 'OPTIONS, GET, HEAD, DELETE, TRACE, PROPFIND, MKCOL, PUT, PROPPATCH, COPY, MOVE, REPORT',
             'Accept-Ranges'  => 'bytes',
             'Content-Length' => '0',
         ),$this->response->headers);
diff --git a/tests/Sabre/DAV/ServerPluginTest.php b/tests/Sabre/DAV/ServerPluginTest.php
index af9417e..b212baa 100644
--- a/tests/Sabre/DAV/ServerPluginTest.php
+++ b/tests/Sabre/DAV/ServerPluginTest.php
@@ -31,7 +31,7 @@ class Sabre_DAV_ServerPluginTest extends Sabre_DAV_AbstractServer {
         $this->assertEquals(array(
             'DAV'            => '1, 3, drinking',
             'MS-Author-Via'  => 'DAV',
-            'Allow'          => 'OPTIONS GET HEAD DELETE TRACE PROPFIND MKCOL PUT PROPPATCH COPY MOVE REPORT BEER WINE',
+            'Allow'          => 'OPTIONS, GET, HEAD, DELETE, TRACE, PROPFIND, MKCOL, PUT, PROPPATCH, COPY, MOVE, REPORT, BEER, WINE',
             'Accept-Ranges'  => 'bytes',
             'Content-Length' =>  '0',
         ),$this->response->headers);
diff --git a/tests/Sabre/DAV/ServerSimpleTest.php b/tests/Sabre/DAV/ServerSimpleTest.php
index 1030665..0c105a8 100644
--- a/tests/Sabre/DAV/ServerSimpleTest.php
+++ b/tests/Sabre/DAV/ServerSimpleTest.php
@@ -244,7 +244,7 @@ class Sabre_DAV_ServerSimpleTest extends Sabre_DAV_AbstractServer{
         $this->assertEquals(array(
             'DAV'            => '1, 3',
             'MS-Author-Via'  => 'DAV',
-            'Allow'          => 'OPTIONS GET HEAD DELETE TRACE PROPFIND MKCOL PUT PROPPATCH COPY MOVE REPORT',
+            'Allow'          => 'OPTIONS, GET, HEAD, DELETE, TRACE, PROPFIND, MKCOL, PUT, PROPPATCH, COPY, MOVE, REPORT',
             'Accept-Ranges'  => 'bytes',
             'Content-Length' => '0',
         ),$this->response->headers);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git