diff --git a/lib/index.ts b/lib/index.ts index 0080716490..0a40057003 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -488,7 +488,7 @@ export class Server< res.writeHeader("cache-control", "public, max-age=0"); res.writeHeader( "content-type", - "application/" + (isMap ? "json" : "javascript") + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" ); res.writeHeader("etag", expectedEtag); @@ -581,7 +581,7 @@ export class Server< res.setHeader("Cache-Control", "public, max-age=0"); res.setHeader( "Content-Type", - "application/" + (isMap ? "json" : "javascript") + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" ); res.setHeader("ETag", expectedEtag); diff --git a/test/server-attachment.ts b/test/server-attachment.ts index a10d4c7300..9628d306b0 100644 --- a/test/server-attachment.ts +++ b/test/server-attachment.ts @@ -16,7 +16,9 @@ describe("server attachment", () => { .buffer(true) .end((err, res) => { if (err) return done(err); - expect(res.headers["content-type"]).to.be("application/javascript"); + expect(res.headers["content-type"]).to.be( + "application/javascript; charset=utf-8" + ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); expect(res.text).to.match(/engine\.io/); @@ -33,7 +35,9 @@ describe("server attachment", () => { .buffer(true) .end((err, res) => { if (err) return done(err); - expect(res.headers["content-type"]).to.be("application/json"); + expect(res.headers["content-type"]).to.be( + "application/json; charset=utf-8" + ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.text).to.match(/engine\.io/); expect(res.status).to.be(200); diff --git a/test/uws.ts b/test/uws.ts index 814a2467fd..464e65170e 100644 --- a/test/uws.ts +++ b/test/uws.ts @@ -200,7 +200,9 @@ describe("socket.io with uWebSocket.js-based engine", () => { .buffer(true) .end((err, res) => { if (err) return done(err); - expect(res.headers["content-type"]).to.be("application/javascript"); + expect(res.headers["content-type"]).to.be( + "application/javascript; charset=utf-8" + ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); expect(res.text).to.match(/engine\.io/);