You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2011/10/13 22:41:01 UTC
svn commit: r1183081 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: ./
src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/
src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/
Author: szetszwo
Date: Thu Oct 13 20:41:00 2011
New Revision: 1183081
URL: http://svn.apache.org/viewvc?rev=1183081&view=rev
Log:
HDFS-2441. Remove the Content-Type set by HttpServer.QuotingInputFilter in webhdfs responses.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1183081&r1=1183080&r2=1183081&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Oct 13 20:41:00 2011
@@ -113,6 +113,9 @@ Trunk (unreleased changes)
HDFS-2349. Corruption detected during block transfers between DNs
should log a WARN instead of INFO. (harsh)
+ HDFS-2441. Remove the Content-Type set by HttpServer.QuotingInputFilter in
+ webhdfs responses. (szetszwo)
+
Release 0.23.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java?rev=1183081&r1=1183080&r2=1183081&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/resources/DatanodeWebHdfsMethods.java Thu Oct 13 20:41:00 2011
@@ -27,6 +27,7 @@ import java.security.PrivilegedException
import java.util.EnumSet;
import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -78,6 +79,7 @@ public class DatanodeWebHdfsMethods {
public static final Log LOG = LogFactory.getLog(DatanodeWebHdfsMethods.class);
private @Context ServletContext context;
+ private @Context HttpServletResponse response;
/** Handle HTTP PUT request. */
@PUT
@@ -108,6 +110,9 @@ public class DatanodeWebHdfsMethods {
replication, blockSize));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException, URISyntaxException {
@@ -164,6 +169,9 @@ public class DatanodeWebHdfsMethods {
+ Param.toSortedString(", ", bufferSize));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException {
@@ -215,6 +223,9 @@ public class DatanodeWebHdfsMethods {
+ Param.toSortedString(", ", offset, length, bufferSize));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException {
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java?rev=1183081&r1=1183080&r2=1183081&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java Thu Oct 13 20:41:00 2011
@@ -28,6 +28,7 @@ import java.util.EnumSet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -108,6 +109,7 @@ public class NamenodeWebHdfsMethods {
private @Context ServletContext context;
private @Context HttpServletRequest request;
+ private @Context HttpServletResponse response;
private static DatanodeInfo chooseDatanode(final NameNode namenode,
final String path, final HttpOpParam.Op op, final long openOffset
@@ -226,6 +228,9 @@ public class NamenodeWebHdfsMethods {
modificationTime, accessTime, renameOptions));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException, URISyntaxException {
@@ -317,6 +322,9 @@ public class NamenodeWebHdfsMethods {
+ Param.toSortedString(", ", bufferSize));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException, URISyntaxException {
@@ -394,6 +402,8 @@ public class NamenodeWebHdfsMethods {
+ Param.toSortedString(", ", offset, length, renewer, bufferSize));
}
+ //clear content type
+ response.setContentType(null);
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
@@ -522,6 +532,9 @@ public class NamenodeWebHdfsMethods {
+ Param.toSortedString(", ", recursive));
}
+ //clear content type
+ response.setContentType(null);
+
return ugi.doAs(new PrivilegedExceptionAction<Response>() {
@Override
public Response run() throws IOException {