You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/11/18 18:19:34 UTC
svn commit: r1543089 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Author: markrmiller
Date: Mon Nov 18 17:19:33 2013
New Revision: 1543089
URL: http://svn.apache.org/r1543089
Log:
SOLR-5461: Request proxying should only set con.setDoOutput(true) if the
request is a post.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1543089&r1=1543088&r2=1543089&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Nov 18 17:19:33 2013
@@ -81,6 +81,9 @@ Bug Fixes
* SOLR-5460: SolrDispatchFilter#sendError can get a SolrCore that it does not
close. (Mark Miller)
+* SOLR-5461: Request proxying should only set con.setDoOutput(true) if the
+ request is a post. (Mark Miller)
+
Other Changes
---------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1543089&r1=1543088&r2=1543089&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Mon Nov 18 17:19:33 2013
@@ -500,7 +500,11 @@ public class SolrDispatchFilter implemen
con.setRequestMethod(req.getMethod());
con.setUseCaches(false);
- con.setDoOutput(true);
+ boolean isPostRequest = "POST".equals(req.getMethod());
+
+ if (isPostRequest) {
+ con.setDoOutput(true);
+ }
con.setDoInput(true);
for (Enumeration<String> e = req.getHeaderNames(); e.hasMoreElements();) {
String headerName = e.nextElement();
@@ -511,7 +515,7 @@ public class SolrDispatchFilter implemen
InputStream is;
OutputStream os;
- if ("POST".equals(req.getMethod())) {
+ if (isPostRequest) {
is = req.getInputStream();
os = con.getOutputStream(); // side effect: method is switched to POST
try {