diff --git a/ring-jetty-adapter/src/ring/adapter/jetty.clj b/ring-jetty-adapter/src/ring/adapter/jetty.clj index 39dfa125..5e66bbd6 100644 --- a/ring-jetty-adapter/src/ring/adapter/jetty.clj +++ b/ring-jetty-adapter/src/ring/adapter/jetty.clj @@ -17,7 +17,6 @@ (let [request-map (servlet/build-request-map request) response-map (handler request-map)] (when response-map - (.setCharacterEncoding response "UTF-8") (servlet/update-servlet-response response response-map) (.setHandled base-request true)))))) diff --git a/ring-jetty-adapter/test/ring/adapter/test/jetty.clj b/ring-jetty-adapter/test/ring/adapter/test/jetty.clj index 69248e59..01d7d8f0 100644 --- a/ring-jetty-adapter/test/ring/adapter/test/jetty.clj +++ b/ring-jetty-adapter/test/ring/adapter/test/jetty.clj @@ -59,8 +59,9 @@ (testing "default character encoding" (with-server (content-type-handler "text/plain") {:port 4347} (let [response (http/get "http://localhost:4347")] - (is (= (get-in response [:headers "content-type"]) - "text/plain;charset=UTF-8"))))) + (is (.contains + (get-in response [:headers "content-type"]) + "text/plain"))))) (testing "custom content-type" (with-server (content-type-handler "text/plain;charset=UTF-16;version=1") {:port 4347} diff --git a/ring-servlet/src/ring/util/servlet.clj b/ring-servlet/src/ring/util/servlet.clj index 3deeb020..ff8a0505 100644 --- a/ring-servlet/src/ring/util/servlet.clj +++ b/ring-servlet/src/ring/util/servlet.clj @@ -120,7 +120,6 @@ (fn [^HttpServlet servlet ^HttpServletRequest request ^HttpServletResponse response] - (.setCharacterEncoding response "UTF-8") (let [request-map (-> request (build-request-map) (merge-servlet-keys servlet request response))]