summaryrefslogtreecommitdiff
path: root/modules/image
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-03-06 06:31:24 +0000
committerDries Buytaert <dries@buytaert.net>2010-03-06 06:31:24 +0000
commite1ce11dad0bb6377ffddaa5fb0b7174e406ba20c (patch)
tree6cdf49084a28fba8c6910a7e000f6708888858a4 /modules/image
parent140cacba103e3241d24d24c8c1d06c760280261b (diff)
downloadbrdo-e1ce11dad0bb6377ffddaa5fb0b7174e406ba20c.tar.gz
brdo-e1ce11dad0bb6377ffddaa5fb0b7174e406ba20c.tar.bz2
- Patch #732486 by Damien Tournoud, JacobSingh: drupal_add_http_header() req ; make Status a normal header and drupal_add_http() header shouldn't return a list of headers.
Diffstat (limited to 'modules/image')
-rw-r--r--modules/image/image.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/image/image.module b/modules/image/image.module
index 3d6cb2d65..404be65f9 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -609,7 +609,7 @@ function image_style_generate() {
if (!$lock_acquired) {
// Tell client to retry again in 3 seconds. Currently no browsers are known
// to support Retry-After.
- drupal_add_http_header('503 Service Unavailable');
+ drupal_add_http_header('Status', '503 Service Unavailable');
drupal_add_http_header('Retry-After', 3);
print t('Image generation in progress. Try again shortly.');
drupal_exit();
@@ -630,7 +630,7 @@ function image_style_generate() {
}
else {
watchdog('image', 'Unable to generate the derived image located at %path.', array('%path' => $destination));
- drupal_add_http_header('500 Internal Server Error');
+ drupal_add_http_header('Status', '500 Internal Server Error');
print t('Error generating image.');
drupal_exit();
}