Configurable to disable streaming mode for Default client

core/src/main/java/feign/Client.java

@@ -19,8 +19,10 @@
 import static feign.Util.ENCODING_GZIP;
 import static feign.Util.checkArgument;
 import static feign.Util.checkNotNull;
+import static feign.Util.isBlank;
 import static feign.Util.isNotBlank;
 import static java.lang.String.format;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -35,9 +37,11 @@
 import java.util.Map;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
+
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
+
 import feign.Request.Options;
 
 /**
@@ -61,11 +65,40 @@ class Default implements Client {
     private final HostnameVerifier hostnameVerifier;
 
     /**
-     * Null parameters imply platform defaults.
+     * Disable the request body internal buffering for {@code HttpURLConnection}.
+     * 
+     * @see HttpURLConnection#setFixedLengthStreamingMode(int)
+     * @see HttpURLConnection#setFixedLengthStreamingMode(long)
+     * @see HttpURLConnection#setChunkedStreamingMode(int)
+     */
+    private final boolean disableRequestBuffering;
+
+    /**
+     * Create a new client, which disable request buffering by default.
+     * 
+     * @param sslContextFactory SSLSocketFactory for secure https URL connections.
+     * @param hostnameVerifier the host name verifier.
      */
     public Default(SSLSocketFactory sslContextFactory, HostnameVerifier hostnameVerifier) {
       this.sslContextFactory = sslContextFactory;
       this.hostnameVerifier = hostnameVerifier;
+      this.disableRequestBuffering = true;
+    }
+
+    /**
+     * Create a new client.
+     * 
+     * @param sslContextFactory SSLSocketFactory for secure https URL connections.
+     * @param hostnameVerifier the host name verifier.
+     * @param disableRequestBuffering Disable the request body internal buffering for
+     *        {@code HttpURLConnection}.
+     */
+    public Default(SSLSocketFactory sslContextFactory, HostnameVerifier hostnameVerifier,
+        boolean disableRequestBuffering) {
+      super();
+      this.sslContextFactory = sslContextFactory;
+      this.hostnameVerifier = hostnameVerifier;
+      this.disableRequestBuffering = disableRequestBuffering;
     }
 
     @Override
@@ -161,10 +194,12 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
       }
 
       if (request.body() != null) {
-        if (contentLength != null) {
-          connection.setFixedLengthStreamingMode(contentLength);
-        } else {
-          connection.setChunkedStreamingMode(8196);
+        if (disableRequestBuffering) {
+          if (contentLength != null) {
+            connection.setFixedLengthStreamingMode(contentLength);
+          } else {
+            connection.setChunkedStreamingMode(8196);
+          }
         }
         connection.setDoOutput(true);
         OutputStream out = connection.getOutputStream();

core/src/test/java/feign/client/AbstractClientTest.java

@@ -146,6 +146,22 @@ public void parsesErrorResponseBody() {
     }
   }
 
+  @Test
+  public void parsesUnauthorizedResponseBody() {
+    String expectedResponseBody = "ARGHH";
+
+    server.enqueue(new MockResponse().setResponseCode(401).setBody("ARGHH"));
+
+    TestInterface api = newBuilder()
+        .target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    try {
+      api.postForString("HELLO");
+    } catch (FeignException e) {
+      assertThat(e.contentUTF8()).isEqualTo(expectedResponseBody);
+    }
+  }
+
   @Test
   public void safeRebuffering() {
     server.enqueue(new MockResponse().setBody("foo"));
@@ -378,6 +394,10 @@ public interface TestInterface {
     @Headers("Accept: text/plain")
     Response post(@Param("to") String to, String body);
 
+    @RequestLine("POST /?foo=bar&foo=baz&qux=")
+    @Headers({"Foo: Bar", "Foo: Baz", "Qux: ", "Content-Type: text/plain"})
+    String postForString(String body);
+
     @RequestLine("GET /")
     @Headers("Accept: text/plain")
     String get();

core/src/test/java/feign/client/DefaultClientTest.java

@@ -16,7 +16,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.core.Is.isA;
 import static org.junit.Assert.assertEquals;
-import feign.Client.Proxied;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
@@ -29,6 +28,7 @@
 import javax.net.ssl.SSLSession;
 import org.junit.Test;
 import feign.Client;
+import feign.Client.Proxied;
 import feign.Feign;
 import feign.Feign.Builder;
 import feign.RetryableException;
@@ -50,7 +50,7 @@ public boolean verify(String s, SSLSession sslSession) {
 
   @Override
   public Builder newBuilder() {
-    return Feign.builder().client(new Client.Default(TrustingSSLSocketFactory.get(), null));
+    return Feign.builder().client(new Client.Default(TrustingSSLSocketFactory.get(), null, false));
   }
 
   @Test