From 4cc7da8b7e267fc872760f5c562d04e8babcaf24 Mon Sep 17 00:00:00 2001 From: Corey Sewell Date: Fri, 5 Sep 2014 09:25:36 +1200 Subject: [PATCH] Set Content-Type to 'application/json' for wildcard HTTP_ACCEPT The Content-Type HTTP header should be set to application/json if HTTP_ACCEPT has application/json or is */* --- bulkUpload/code/GridFieldBulkUpload_Request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bulkUpload/code/GridFieldBulkUpload_Request.php b/bulkUpload/code/GridFieldBulkUpload_Request.php index 10f0df3..c95fb49 100644 --- a/bulkUpload/code/GridFieldBulkUpload_Request.php +++ b/bulkUpload/code/GridFieldBulkUpload_Request.php @@ -295,7 +295,7 @@ class GridFieldBulkUpload_Request extends RequestHandler */ protected function contentTypeNegotiation(&$response) { - if (isset($_SERVER['HTTP_ACCEPT']) && (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) + if (isset($_SERVER['HTTP_ACCEPT']) && ((strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false) || $_SERVER['HTTP_ACCEPT'] === '*/*' )) { { $response->addHeader('Content-Type', 'application/json'); }else{