android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-24 04:02:07 +03:00
Code Releases Activity

issue #364: spdy should set content-length when it is known.

Browse Source
This commit is contained in:
Adrian Cole
2013-12-07 12:16:34 -08:00
parent 54d4fcde20
commit af5e60af84
2 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java
View File

@@ -37,6 +37,10 @@ public final class SpdyTransport implements Transport {
}
@Override public OutputStream createRequestBody() throws IOException {
long fixedContentLength = httpEngine.policy.getFixedContentLength();
if (fixedContentLength != -1) {
httpEngine.requestHeaders.setContentLength(fixedContentLength);
}
// TODO: if we aren't streaming up to the server, we should buffer the whole request
writeRequestHeaders();
return stream.getOutputStream();

46
okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java
View File

@@ -50,7 +50,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -115,19 +117,57 @@ public final class HttpOverSpdyTest {
assertEquals(-1, connection.getInputStream().read());
}
@Test public void post() throws Exception {
byte[] postBytes = "FGHIJ".getBytes(Util.UTF_8);
/** An output stream can be written to more than once, so we can't guess content length. */
@Test public void noDefaultContentLengthOnPost() throws Exception {
MockResponse response = new MockResponse().setBody("ABCDE");
server.enqueue(response);
server.play();
HttpURLConnection connection = client.open(server.getUrl("/foo"));
connection.setDoOutput(true);
connection.getOutputStream().write("FGHIJ".getBytes(Util.UTF_8));
connection.getOutputStream().write(postBytes);
assertContent("ABCDE", connection, Integer.MAX_VALUE);
RecordedRequest request = server.takeRequest();
assertEquals("POST /foo HTTP/1.1", request.getRequestLine());
assertEquals("FGHIJ", request.getUtf8Body());
assertArrayEquals(postBytes, request.getBody());
assertNull(request.getHeader("Content-Length"));
}
@Test public void userSuppliedContentLengthHeader() throws Exception {
MockResponse response = new MockResponse().setBody("ABCDE");
server.enqueue(response);
server.play();
HttpURLConnection connection = client.open(server.getUrl("/foo"));
connection.setRequestProperty("Content-Length", String.valueOf(postBytes.length));
connection.setDoOutput(true);
connection.getOutputStream().write(postBytes);
assertContent("ABCDE", connection, Integer.MAX_VALUE);
RecordedRequest request = server.takeRequest();
assertEquals("POST /foo HTTP/1.1", request.getRequestLine());
assertArrayEquals(postBytes, request.getBody());
assertEquals(postBytes.length, Integer.parseInt(request.getHeader("Content-Length")));
}
@Test public void setFixedLengthStreamingModeSetsContentLength() throws Exception {
MockResponse response = new MockResponse().setBody("ABCDE");
server.enqueue(response);
server.play();
HttpURLConnection connection = client.open(server.getUrl("/foo"));
connection.setFixedLengthStreamingMode(postBytes.length);
connection.setDoOutput(true);
connection.getOutputStream().write(postBytes);
assertContent("ABCDE", connection, Integer.MAX_VALUE);
RecordedRequest request = server.takeRequest();
assertEquals("POST /foo HTTP/1.1", request.getRequestLine());
assertArrayEquals(postBytes, request.getBody());
assertEquals(postBytes.length, Integer.parseInt(request.getHeader("Content-Length")));
}
@Test public void spdyConnectionReuse() throws Exception {