svn commit: r1479871 - in /manifoldcf/branches/release-1.2-branch: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

[kw...@apache.org]

Author: kwright
Date: Tue May  7 11:58:36 2013
New Revision: 1479871

URL: http://svn.apache.org/r1479871
Log:
Pull up fix for CONNECTORS-682 from trunk.

Modified:
    manifoldcf/branches/release-1.2-branch/   (props changed)
    manifoldcf/branches/release-1.2-branch/CHANGES.txt
    manifoldcf/branches/release-1.2-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

Propchange: manifoldcf/branches/release-1.2-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1479870

Modified: manifoldcf/branches/release-1.2-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/CHANGES.txt?rev=1479871&r1=1479870&r2=1479871&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.2-branch/CHANGES.txt Tue May  7 11:58:36 2013
@@ -3,6 +3,13 @@ $Id$
 
 =======================  Release 1.2 =====================
 
+
+======================= Release 1.2 =====================
+
+CONNECTORS-682: Fix expect-continue issues with Solr when there is
+a Solr delay of more than 3 seconds.
+(Oleg Kalnichevski, Erlend Garåsen, Karl Wright)
+
 CONNECTORS-683: Add Dropbox connector end-user documentation.
 (Andrew Janowczyk)
 

Modified: manifoldcf/branches/release-1.2-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.2-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1479871&r1=1479870&r2=1479871&view=diff
==============================================================================
--- manifoldcf/branches/release-1.2-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/branches/release-1.2-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Tue May  7 11:58:36 2013
@@ -233,6 +233,7 @@ public class HttpPoster
     // This one is essential to prevent us from reading from the content stream before necessary during auth, but
     // is incompatible with some proxies.
     params.setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE,true);
+    params.setIntParameter(CoreProtocolPNames.WAIT_FOR_CONTINUE,socketTimeout);
     params.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY,true);
     params.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,true);
     params.setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS,true);