Merge from 3.0 branch till 1082.

1 files changed, 5 insertions, 3 deletions

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 582a3db3..5a3ff99d 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -65,7 +65,7 @@ class THttpResponse extends TModule implements ITextWriter
 	/**

 	 * @var string content type

 	 */

-	private $_contentType='text/html';

+	private $_contentType=null;

 	/**

 	 * @var string character set, e.g. UTF-8

 	 */

@@ -315,9 +315,11 @@ class THttpResponse extends TModule implements ITextWriter
 			$charset=$globalization->getCharset();

 		if($charset!=='')

 		{

-			$header='Content-Type: '.$this->getContentType().';charset='.$charset;

-			$this->appendHeader($header);

+			$contentType=$this->_contentType===null?'text/html':$this->_contentType;

+			$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);

 		}

+		else if($this->_contentType!==null)

+			$this->appendHeader('Content-Type: '.$this->_contentType.';charset=UTF-8');

 	}

 

 	/**