re-enable POST over proxy, which didn't work since update to httpcore-4.1.1

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7772 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/net/yacy/cora/protocol/http/HTTPClient.java

@@ -145,7 +145,7 @@ public class HTTPClient {
 		// connections per host (2 default)
 		clientConnectionManager.setDefaultMaxPerRoute(2);
 		// Increase max connections for localhost
-		HttpHost localhost = new HttpHost("locahost");
+		HttpHost localhost = new HttpHost("localhost");
 		clientConnectionManager.setMaxForRoute(new HttpRoute(localhost), maxcon);
 		/**
 		 * HTTP protocol settings
@@ -369,7 +369,7 @@ public class HTTPClient {
         String host = url.getHost();
         if (host == null) host = "127.0.0.1";
         setHost(host); // overwrite resolved IP, needed for shared web hosting DO NOT REMOVE, see http://en.wikipedia.org/wiki/Shared_web_hosting_service
-        final InputStreamEntity inputStreamEntity = new InputStreamEntity(instream, length);
+        final NonClosingInputStreamEntity inputStreamEntity = new NonClosingInputStreamEntity(instream, length);
     	// statistics
     	upbytes = length;
     	httpPost.setEntity(inputStreamEntity);
@@ -441,7 +441,6 @@ public class HTTPClient {
         // statistics
         upbytes = length;
         httpPost.setEntity(inputStreamEntity);
-        currentRequest = httpPost;
         return getContentBytes(httpPost, Long.MAX_VALUE);
     }
 	

source/net/yacy/cora/protocol/http/NonClosingInputStreamEntity.java

@@ -0,0 +1,110 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package net.yacy.cora.protocol.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.http.entity.AbstractHttpEntity;
+
+/**
+ * This is InputStreamEntity from httpcore-4.1
+ * In httpcore-4.1.1 InputStreamEntity finally closes its InputStream.
+ * In general that is a good idea - but while in use of our proxy doing a POST,
+ * this also closes the server-socket an the proxy-client doesn't get anything.
+ */
+public class NonClosingInputStreamEntity extends AbstractHttpEntity {
+
+    private final static int BUFFER_SIZE = 2048;
+
+    private final InputStream content;
+    private final long length;
+
+    public NonClosingInputStreamEntity(final InputStream instream, long length) {
+        super();
+        if (instream == null) {
+            throw new IllegalArgumentException("Source input stream may not be null");
+        }
+        this.content = instream;
+        this.length = length;
+    }
+
+    public boolean isRepeatable() {
+        return false;
+    }
+
+    public long getContentLength() {
+        return this.length;
+    }
+
+    public InputStream getContent() throws IOException {
+        return this.content;
+    }
+
+    public void writeTo(final OutputStream outstream) throws IOException {
+        if (outstream == null) {
+            throw new IllegalArgumentException("Output stream may not be null");
+        }
+        InputStream instream = this.content;
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int l;
+        if (this.length < 0) {
+            // consume until EOF
+            while ((l = instream.read(buffer)) != -1) {
+                outstream.write(buffer, 0, l);
+            }
+        } else {
+            // consume no more than length
+            long remaining = this.length;
+            while (remaining > 0) {
+                l = instream.read(buffer, 0, (int)Math.min(BUFFER_SIZE, remaining));
+                if (l == -1) {
+                    break;
+                }
+                outstream.write(buffer, 0, l);
+                remaining -= l;
+            }
+        }
+    }
+
+    public boolean isStreaming() {
+        return true;
+    }
+
+    /**
+     * @deprecated Either use {@link #getContent()} and call {@link java.io.InputStream#close()} on that;
+     * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
+     */
+    public void consumeContent() throws IOException {
+        // If the input stream is from a connection, closing it will read to
+        // the end of the content. Otherwise, we don't care what it does.
+        this.content.close();
+    }
+
+}