wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Use getHttpProtocol instead of $_SERVER
This commit is contained in:
Thomas Müller 2015-11-02 10:13:41 +01:00
commit b6ca23afe1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/appframework/dependencyinjection/dicontainer.php
View file

@ -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) {

1
lib/private/appframework/http.php
View file

@ -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) {

2
lib/private/response.php
View file

@ -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';