Merge pull request #10355 from grails/GRAILS-10312

Grails 10312

Author: jameskleeh

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy

@@ -393,7 +393,7 @@ trait ResponseRenderer extends WebAttributes {
                         hasContentType = detectContentTypeFromFileName(webRequest, response, argMap, fileName)
                     }
                     if (fnO) {
-                        response.setHeader HttpHeaders.CONTENT_DISPOSITION, DISPOSITION_HEADER_PREFIX + fileName
+                        response.setHeader HttpHeaders.CONTENT_DISPOSITION, "$DISPOSITION_HEADER_PREFIX\"$fileName\""
                     }
                 }
                 if (!hasContentType) {

grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy

@@ -54,7 +54,7 @@ class RenderMethodTests {
 
         controller.render file:new ByteArrayInputStream("hello".bytes), contentType:"text/plain", fileName:"hello.txt"
         assert "hello" == response.contentAsString
-        assert "attachment;filename=hello.txt" == response.getHeader(HttpHeaders.CONTENT_DISPOSITION)
+        assert "attachment;filename=\"hello.txt\"" == response.getHeader(HttpHeaders.CONTENT_DISPOSITION)
     }
 
     @Test