TCaptcha: publish images with image/png content-type

2 files changed, 10 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 302f3195..809be257 100644
--- a/HISTORY
+++ b/HISTORY
@@ -11,6 +11,13 @@ EHN: Modify TActiveRecordConfig & TActiveRecordManager to allow custom subclassi
 EHN: Add methods quoteTableName, quoteColumnName, quoteColumnAlias to TDbMetaData & TDbConnection and add TDbConnection:getDbMetaData [TODO: customize TOracleMetaData] (Yves)
 EHN: Add method getHeaders to THttpRequest & THttpResponse (Yves)
 EHN: Modify TThemeManager to allow custom subclassing of TTheme (Yves)
+ENH: Performance (micro)optimization in TUrlMapping::loadUrlMappings - invoke `getDefaultMappingClass` outside of loop (Yves)
+BUG: TActiveMultiView must update clientside only when necessary to get other active controls work fine inside it (ctrlaltca)
+BUG: TListBox doesn't correctly reports selected indices to serverside on callback
+BUG: TErrorHandler: avoid an error when trying to hide the file path of a lambda function (ctrlaltca)
+BUG: TSecurityManager: avoid a race condition when first generating the encryptionkey or the validationkey (ctrlaltca)
+BUG: TActiveFileUpload: urlencode the base64'ed token since it can contain the "+" character (otherway it would be traslated to a space) (ctrlaltca)
+BUG: TCaptcha: publish images with image/png content-type (ctrlaltca)
 
 BUG: Issue  #35 - [840] Capital letters for the initial letter of the directories name (ctrlaltca)
 NEW: Issue  #83 - PHP configuration style (Carl)
@@ -47,12 +54,6 @@ BUG: Issue #368 - Clearing selection of a TActiveDropDownList in callback should
 CHG: Issue #370 - Deprecated TSqliteCache since it's based on php's sqlite extension (ctrlaltca)
 BUG: Issue #371 - Sorting on TActiveDataGrid autogenerated column not work (ctrlaltca)
 ENH: Issue #372 - ActiveControls's Visible property should be reflected clientside on ajax requests (ctrlaltca)
-ENH: Performance (micro)optimization in TUrlMapping::loadUrlMappings - invoke `getDefaultMappingClass` outside of loop (Yves)
-BUG: TActiveMultiView must update clientside only when necessary to get other active controls work fine inside it (ctrlaltca)
-BUG: TListBox doesn't correctly reports selected indices to serverside on callback
-BUG: TErrorHandler: avoid an error when trying to hide the file path of a lambda function (ctrlaltca)
-BUG: TSecurityManager: avoid a race condition when first generating the encryptionkey or the validationkey (ctrlaltca)
-BUG: TActiveFileUpload: urlencode the base64'ed token since it can contain the "+" character (otherway it would be traslated to a space) (ctrlaltca)
 
 Version 3.1.10 Jul 17, 2011
 BUG: Added missing timeout on TCacheHttpSession (ctrlaltca)
diff --git a/framework/Web/UI/WebControls/assets/captcha.php b/framework/Web/UI/WebControls/assets/captcha.php
index 2d787af4..b5d0303b 100644
--- a/framework/Web/UI/WebControls/assets/captcha.php
+++ b/framework/Web/UI/WebControls/assets/captcha.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2011 PradoSoft
+ * @copyright Copyright &copy; 2005-2011 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls.assets

@@ -116,7 +116,8 @@ function displayToken($token,$fontSize,$theme)
         	imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);

         imagecolordeallocate($image,$color);

     }

-

+	

+	header('Content-Type: image/png');

 	imagepng($image);

 	imagedestroy($image);

 }