[Pkg-owncloud-commits] [php-sabredav] 44/66: Support for upcoming sabre/http

[David Prévot]

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

taffit pushed a commit to branch master
in repository php-sabredav.

commit c60954865ac317d935cfd38434a8db7395d35b9f
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Jan 6 19:19:42 2014 +0100

    Support for upcoming sabre/http
---
 lib/Sabre/DAV/Server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Sabre/DAV/Server.php b/lib/Sabre/DAV/Server.php
index 663b60b..b882be3 100644
--- a/lib/Sabre/DAV/Server.php
+++ b/lib/Sabre/DAV/Server.php
@@ -209,7 +209,7 @@ class Server extends EventEmitter {
             throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
         }
         $this->httpResponse = new HTTP\Response();
-        $this->httpRequest = HTTP\Request::createFromPHPRequest();
+        $this->httpRequest = HTTP\Sapi::getRequest();
         $this->addPlugin(new CorePlugin());
 
     }
@@ -299,7 +299,7 @@ class Server extends EventEmitter {
             $this->httpResponse->setStatus($httpCode);
             $this->httpResponse->addHeaders($headers);
             $this->httpResponse->setBody($DOM->saveXML());
-            $this->httpResponse->send();
+            HTTP\Sapi::sendResponse($this->httpResponse);
 
         }
 
@@ -449,7 +449,7 @@ class Server extends EventEmitter {
         if (!$this->emit('afterMethod:' . $method,[$request, $response])) return;
         if (!$this->emit('afterMethod', [$request, $response])) return;
 
-        $response->send();
+        HTTP\Sapi::sendResponse($response);
 
     }
 

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