summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/Services/TJsonService.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 5d6f635f..3dee5567 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ BUG: Issue #412 - open_basedir restriction (ctrlaltca)
BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (ctrlaltca)
BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca)
BUG: Issue #415 - prado-cli throws an error if the application is making use of THttpSession (ctrlaltca)
+BUG: Issue #416 - TJsonService reports the wrong content-type (ctrlaltca)
EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca)
EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca)
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index b3dd795f..dc49ff6f 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -154,7 +154,7 @@ class TJsonService extends TService
if(($content=$service->getJsonContent())!==null)
{
$response = $this->getResponse();
- $response->setContentType('text/javascript');
+ $response->setContentType('application/json');
$response->setCharset('UTF-8');
//send content
$response->write(TJavaScript::jsonEncode($content));