From b08745d88d9232cf2c8d436c37ca556332769bd6 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 31 Jan 2018 23:47:04 +0100 Subject: Upgrading Prado to 3.3.3 --- lib/prado/HISTORY | 3 ++- lib/prado/framework/PradoBase.php | 2 +- lib/prado/framework/Web/Javascripts/source/prado/prado.js | 2 +- lib/prado/framework/Web/THttpResponse.php | 5 +---- lib/prado/framework/pradolite.php | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/prado/HISTORY b/lib/prado/HISTORY index 80b5781..7105d0d 100644 --- a/lib/prado/HISTORY +++ b/lib/prado/HISTORY @@ -1,7 +1,8 @@ -Version 3.3.X in development +Version 3.3.3 Jan 25, 2018 BUG: Issue #625 - The url tag produce an extra directory separator before the result (ctrlaltca) BUG: Issue #610 - IIS: Page redirect dosn't work (ctrlaltca) +BUG: Issue #648 - Fix status header in cgi/fpm mode (ctrlaltca) Version 3.3.2 August 23, 2016 diff --git a/lib/prado/framework/PradoBase.php b/lib/prado/framework/PradoBase.php index f6c0312..01374b4 100644 --- a/lib/prado/framework/PradoBase.php +++ b/lib/prado/framework/PradoBase.php @@ -69,7 +69,7 @@ class PradoBase */ public static function getVersion() { - return '3.3.2'; + return '3.3.3'; } /** diff --git a/lib/prado/framework/Web/Javascripts/source/prado/prado.js b/lib/prado/framework/Web/Javascripts/source/prado/prado.js index 2000537..3ff23b9 100644 --- a/lib/prado/framework/Web/Javascripts/source/prado/prado.js +++ b/lib/prado/framework/Web/Javascripts/source/prado/prado.js @@ -271,7 +271,7 @@ var Prado = * Version of Prado clientscripts * @var Version */ - Version: '3.3.2', + Version: '3.3.3', /** * Registry for Prado components diff --git a/lib/prado/framework/Web/THttpResponse.php b/lib/prado/framework/Web/THttpResponse.php index 48328c3..e11a715 100644 --- a/lib/prado/framework/Web/THttpResponse.php +++ b/lib/prado/framework/Web/THttpResponse.php @@ -531,10 +531,7 @@ class THttpResponse extends TModule implements ITextWriter if($this->getRequest()->getHttpProtocolVersion() === null) $protocol='HTTP/1.1'; - $phpSapiName = substr(php_sapi_name(), 0, 3); - $cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm'; - - header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status)); + header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status)); $this->_httpHeaderSent = true; } diff --git a/lib/prado/framework/pradolite.php b/lib/prado/framework/pradolite.php index 37f93ec..724cff8 100644 --- a/lib/prado/framework/pradolite.php +++ b/lib/prado/framework/pradolite.php @@ -25,7 +25,7 @@ class PradoBase protected static $classExists = array(); public static function getVersion() { - return '3.3.2'; + return '3.3.3'; } public static function initErrorHandlers() { -- cgit v1.2.3