Author: tucu
Date: Wed Dec 21 05:53:50 2011
New Revision: 1221619
URL: http://svn.apache.org/viewvc?rev=1221619&view=rev
Log:
Merge -r 1221615:1221616 from trunk to branch. FIXES: HDFS-2705
Added:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java
- copied unchanged from r1221616,
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestCheckUploadContentTypeFilter.java
- copied unchanged from r1221616,
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestCheckUploadContentTypeFilter.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/webapp/WEB-INF/web.xml
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java?rev=1221619&r1=1221618&r2=1221619&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
Wed Dec 21 05:53:50 2011
@@ -98,6 +98,8 @@ public class HttpFSFileSystem extends Fi
public static final String SET_REPLICATION_JSON = "boolean";
+ public static final String UPLOAD_CONTENT_TYPE= "application/octet-stream";
+
public static enum FILE_TYPE {
FILE, DIRECTORY, SYMLINK;
@@ -459,7 +461,7 @@ public class HttpFSFileSystem extends Fi
String location = conn.getHeaderField("Location");
if (location != null) {
conn = getConnection(new URL(location), method);
- conn.setRequestProperty("Content-Type", "application/octet-stream");
+ conn.setRequestProperty("Content-Type", UPLOAD_CONTENT_TYPE);
try {
OutputStream os = new BufferedOutputStream(conn.getOutputStream(),
bufferSize);
return new HttpFSDataOutputStream(conn, os, expectedStatus,
statistics);
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/webapp/WEB-INF/web.xml?rev=1221619&r1=1221618&r2=1221619&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/webapp/WEB-INF/web.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/webapp/WEB-INF/web.xml
Wed Dec 21 05:53:50 2011
@@ -61,6 +61,11 @@
</filter>
<filter>
+ <filter-name>checkUploadContentType</filter-name>
+
<filter-class>org.apache.hadoop.fs.http.server.CheckUploadContentTypeFilter</filter-class>
+ </filter>
+
+ <filter>
<filter-name>fsReleaseFilter</filter-name>
<filter-class>org.apache.hadoop.fs.http.server.HttpFSReleaseFilter</filter-class>
</filter>
@@ -81,6 +86,11 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>checkUploadContentType</filter-name>
+ <url-pattern>*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>fsReleaseFilter</filter-name>
<url-pattern>*</url-pattern>
</filter-mapping>
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1221619&r1=1221618&r2=1221619&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Dec 21 05:53:50 2011
@@ -119,6 +119,9 @@ Release 0.23.1 - UNRELEASED
HDFS-2657. TestHttpFSServer and TestServerWebApp are failing on trunk.
(tucu)
+ HDFS-2705. HttpFS server should check that upload requests have correct
+ content-type. (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
