android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Code Releases Activity

Use the same logic for permitting request body as client.

Browse Source
This commit is contained in:
Jake Wharton
2015-07-21 12:19:29 -04:00
parent e52e2b07da
commit eeec4b8db8
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/MockWebServer.java
View File

@@ -30,6 +30,7 @@ import com.squareup.okhttp.internal.framed.FramedConnection;
import com.squareup.okhttp.internal.framed.FramedStream;
import com.squareup.okhttp.internal.framed.Header;
import com.squareup.okhttp.internal.framed.IncomingStreamHandler;
import com.squareup.okhttp.internal.http.HttpMethod;
import com.squareup.okhttp.internal.ws.RealWebSocket;
import com.squareup.okhttp.internal.ws.WebSocketProtocol;
import com.squareup.okhttp.ws.WebSocketListener;
@@ -629,19 +630,9 @@ public final class MockWebServer {
}
}
if (request.startsWith("OPTIONS ")
|| request.startsWith("GET ")
|| request.startsWith("HEAD ")
|| request.startsWith("TRACE ")
|| request.startsWith("CONNECT ")) {
if (hasBody) {
throw new IllegalArgumentException("Request must not have a body: " + request);
}
} else if (!request.startsWith("POST ")
&& !request.startsWith("PUT ")
&& !request.startsWith("PATCH ")
&& !request.startsWith("DELETE ")) { // Permitted as spec is ambiguous.
throw new UnsupportedOperationException("Unexpected method: " + request);
String method = request.substring(0, request.indexOf(' '));
if (hasBody && !HttpMethod.permitsRequestBody(method)) {
throw new IllegalArgumentException("Request must not have a body: " + request);
}
return new RecordedRequest(request, headers.build(), chunkSizes, requestBody.receivedByteCount,