From c54a230a5926086ff1b69a0dd7e6352dbc0b40ff Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 20 Apr 2006 17:09:09 +0000
Subject: Merge from 3.0 branch till 947.

---
 framework/Web/THttpResponse.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'framework/Web/THttpResponse.php')

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index 18be9fec..29258259 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -238,15 +238,14 @@ class THttpResponse extends TModule implements ITextWriter
 
 		if($mimeType===null)
 		{
+			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else
+			else if(($ext=strrchr($fileName,'.'))!==false)
 			{
-				$ext=array_pop(explode('.',$fileName));
+				$ext=substr($ext,1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
-				else
-					$mimeType='text/plain';
 			}
 		}
 		$fn=basename($fileName);
-- 
cgit v1.2.3