summaryrefslogtreecommitdiff
path: root/modules/image
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2014-11-02 12:43:36 -0500
committerDavid Rothstein <drothstein@gmail.com>2014-11-02 12:43:36 -0500
commitc684532504121f6342ed4ae97951dc7034dfb82b (patch)
tree3e1f8a3c815a25d84adb408c69f67cbb5d5a1ecd /modules/image
parentc95d72521d31ff2ae4f843979f4ab5a39e633300 (diff)
downloadbrdo-c684532504121f6342ed4ae97951dc7034dfb82b.tar.gz
brdo-c684532504121f6342ed4ae97951dc7034dfb82b.tar.bz2
Issue #1099732 by joshi.rohit100, droplet | Chi: Fixed Incorrect encoding for error pages in image_style_deliver().
Diffstat (limited to 'modules/image')
-rw-r--r--modules/image/image.module2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/image/image.module b/modules/image/image.module
index c6a23f25a..585c15a29 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -854,6 +854,7 @@ function image_style_deliver($style, $scheme) {
// Tell client to retry again in 3 seconds. Currently no browsers are known
// to support Retry-After.
drupal_add_http_header('Status', '503 Service Unavailable');
+ drupal_add_http_header('Content-Type', 'text/html; charset=utf-8');
drupal_add_http_header('Retry-After', 3);
print t('Image generation in progress. Try again shortly.');
drupal_exit();
@@ -875,6 +876,7 @@ function image_style_deliver($style, $scheme) {
else {
watchdog('image', 'Unable to generate the derived image located at %path.', array('%path' => $derivative_uri));
drupal_add_http_header('Status', '500 Internal Server Error');
+ drupal_add_http_header('Content-Type', 'text/html; charset=utf-8');
print t('Error generating image.');
drupal_exit();
}