Merge pull request amber-smalltalk#204 from herby/master

Fix local server to serve ';charset=utf-8' for .js files
rtyler · May 13, 2012 · f51425c · f51425c
2 parents f47e896 + 3300f2a
commit f51425c
Show file tree

Hide file tree

Showing 2 changed files with 4,035 additions and 5,197 deletions.
diff --git a/server/FileServer.st b/server/FileServer.st
@@ -100,11 +100,13 @@ respondFileNamed: aFilename to: aResponse
 		ex notNil 
 			ifTrue: [self respondInternalErrorTo: aResponse]
 			ifFalse: [
-        			type := self class mimeTypeFor: filename.
+				type := self class mimeTypeFor: filename.
+				type = 'application/javascript'
+					ifTrue: [ type:=type,';charset=utf-8' ].
 				aResponse 
-                          		writeHead: 200 options:  #{'Content-Type' -> type};
-					write: file binary: 'binary';
-                          		end]]
+					writeHead: 200 options:  #{'Content-Type' -> type};
+					write: file encoding: 'binary';
+					end]]
 !
 
 respondInternalErrorTo: aResponse