Merge pull request #20189 from owncloud/use-get-http-protocol

Use getHttpProtocol instead of $_SERVER

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index b71ca71391d..b0be4045541 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -252,11 +252,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		});
 
 		$this->registerService('Protocol', function($c){
-			if(isset($_SERVER['SERVER_PROTOCOL'])) {
-				return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
-			} else {
-				return new Http($_SERVER);
-			}
+			/** @var \OC\Server $server */
+			$server = $c->query('ServerContainer');
+			$protocol = $server->getRequest()->getHttpProtocol();
+			return new Http($_SERVER, $protocol);
 		});
 
 		$this->registerService('Dispatcher', function($c) {
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index 89f6f70f4e7..e64759fa924 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -112,6 +112,7 @@ class Http extends BaseHttp {
 	 * @param Http::CONSTANT $status the constant from the Http class
 	 * @param \DateTime $lastModified formatted last modified date
 	 * @param string $ETag the etag
+	 * @return string
 	 */
 	public function getStatusHeader($status, \DateTime $lastModified=null, 
 	                                $ETag=null) {
diff --git a/lib/private/response.php b/lib/private/response.php
index 2cd1d990e51..b0eb8adc4d5 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -74,7 +74,7 @@ class OC_Response {
 	* @param int $status a HTTP status code, see also the STATUS constants
 	*/
 	static public function setStatus($status) {
-		$protocol = $_SERVER['SERVER_PROTOCOL'];
+		$protocol = \OC::$server->getRequest()->getHttpProtocol();
 		switch($status) {
 			case self::STATUS_NOT_MODIFIED:
 				$status = $status . ' Not Modified';