From 7428a0093d7b2a686b804de904acfab6cdbd758e Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 18 Jan 2017 10:38:03 +0100 Subject: Fix #610 (prado-3.3) --- framework/Web/THttpResponse.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'framework/Web/THttpResponse.php') diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index 93d3c91e..48328c32 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -426,13 +426,28 @@ class THttpResponse extends TModule implements ITextWriter { $this->ensureHeadersSent(); + // Under IIS, explicitly send an HTTP response including the status code + // this is handled automatically by PHP on Apache and others + $isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false); if($url[0]==='/') $url=$this->getRequest()->getBaseUrl().$url; if ($this->_status >= 300 && $this->_status < 400) + { // The status code has been modified to a valid redirection status, send it + if($isIIS) + { + header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[ + array_key_exists($this->_status, self::$HTTP_STATUS_CODES) + ? $this->_status + : 302 + ]); + } header('Location: '.str_replace('&','&',$url), true, $this->_status); - else + } else { + if($isIIS) + header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]); header('Location: '.str_replace('&','&',$url)); + } if(!$this->getApplication()->getRequestCompleted()) $this->getApplication()->onEndRequest(); @@ -719,4 +734,3 @@ class THttpResponse extends TModule implements ITextWriter return Prado::createComponent($type, $writer); } } - -- cgit v1.2.3