[FLINK-5705] [WebMonitor] WebMonitor request/response use UTF-8 explicitly This closes #3257
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d3f2fe26 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d3f2fe26 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d3f2fe26 Branch: refs/heads/release-1.2 Commit: d3f2fe2625171f89404e1b90fa8c9493f5403b3a Parents: 6114c5b Author: shijinkui <[email protected]> Authored: Fri Feb 3 17:26:18 2017 +0800 Committer: Stephan Ewen <[email protected]> Committed: Thu Feb 16 15:09:56 2017 +0100 ---------------------------------------------------------------------- .../org/apache/flink/runtime/webmonitor/HttpRequestHandler.java | 4 ++-- .../apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/d3f2fe26/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java index 703b621..585a2f3 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java @@ -107,8 +107,8 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<HttpObject> else if (currentRequest.getMethod() == HttpMethod.POST) { // POST comes in multiple objects. First the request, then the contents // keep the request and path for the remaining objects of the POST request - currentRequestPath = new QueryStringDecoder(currentRequest.getUri()).path(); - currentDecoder = new HttpPostRequestDecoder(DATA_FACTORY, currentRequest); + currentRequestPath = new QueryStringDecoder(currentRequest.getUri(), ENCODING).path(); + currentDecoder = new HttpPostRequestDecoder(DATA_FACTORY, currentRequest, ENCODING); } else { throw new IOException("Unsupported HTTP method: " + currentRequest.getMethod().name()); http://git-wip-us.apache.org/repos/asf/flink/blob/d3f2fe26/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java index 68e1735..8dbd135 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/RuntimeMonitorHandler.java @@ -30,17 +30,18 @@ import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.router.KeepAliveWrite; import io.netty.handler.codec.http.router.Routed; -import java.net.URLDecoder; import org.apache.flink.runtime.instance.ActorGateway; import org.apache.flink.runtime.webmonitor.handlers.RequestHandler; import org.apache.flink.util.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; import java.net.InetSocketAddress; +import java.net.URLDecoder; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; @@ -116,6 +117,8 @@ public class RuntimeMonitorHandler extends RuntimeMonitorHandlerBase { } response.headers().set(HttpHeaders.Names.ACCESS_CONTROL_ALLOW_ORIGIN, "*"); + // Content-Encoding:utf-8 + response.headers().set(HttpHeaders.Names.CONTENT_ENCODING, ENCODING.name()); KeepAliveWrite.flush(ctx, routed.request(), response); }
