Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1295314 from trunk to branch-0.23 to fix MAPREDUCE-3706. Fix circular redirect error in job-attempts page. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295315 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2012-02-29 22:16:05 +00:00
parent 05ff7bb9ce
commit 66d7ab2789
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -149,6 +149,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3903. Add support for mapreduce admin users. (Thomas Graves via
sseth)
MAPREDUCE-3706. Fix circular redirect error in job-attempts page. (bobby
via acmurthy)
Release 0.23.1 - 2012-02-17
NEW FEATURES

7
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
View File

@ -38,7 +38,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.cookie.CookiePolicy;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.IOUtils;
@ -124,7 +126,10 @@ public class WebAppProxyServlet extends HttpServlet {
HttpServletResponse resp, URI link,Cookie c) throws IOException {
org.apache.commons.httpclient.URI uri =
new org.apache.commons.httpclient.URI(link.toString(), false);
HttpClient client = new HttpClient();
HttpClientParams params = new HttpClientParams();
params.setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
params.setBooleanParameter(HttpClientParams.ALLOW_CIRCULAR_REDIRECTS, true);
HttpClient client = new HttpClient(params);
HttpMethod method = new GetMethod(uri.getEscapedURI());
@SuppressWarnings("unchecked")