projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
components
/
cronet
/
android
/
java
/
src
/
org
/
chromium
/
net
/
HttpUrlConnectionUrlRequest.java
diff --git
a/src/components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
b/src/components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
index
2bae943
..
237623f
100644
(file)
--- a/
src/components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
+++ b/
src/components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
@@
-172,7
+172,7
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
throw new IllegalArgumentException(
"Upload contentLength is too big.");
}
throw new IllegalArgumentException(
"Upload contentLength is too big.");
}
- mUploadContentLength = (int)contentLength;
+ mUploadContentLength = (int)
contentLength;
mPostContentType = contentType;
mPostDataChannel = channel;
mPostData = null;
mPostContentType = contentType;
mPostDataChannel = channel;
mPostData = null;
@@
-182,10
+182,6
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
@Override
public void setHttpMethod(String method) {
validateNotStarted();
@Override
public void setHttpMethod(String method) {
validateNotStarted();
- if (!("PUT".equals(method) || "POST".equals(method))) {
- throw new IllegalArgumentException(
- "Only PUT and POST are allowed.");
- }
mMethod = method;
}
mMethod = method;
}
@@
-209,7
+205,7
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
}
URL url = new URL(mUrl);
}
URL url = new URL(mUrl);
- mConnection = (HttpURLConnection)url.openConnection();
+ mConnection = (HttpURLConnection)
url.openConnection();
// If configured, use the provided http verb.
if (mMethod != null) {
try {
// If configured, use the provided http verb.
if (mMethod != null) {
try {
@@
-385,13
+381,13
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
continue;
} else {
mSkippingToOffset = false;
continue;
} else {
mSkippingToOffset = false;
- start = (int)(mOffset - (mSize - size));
+ start = (int)
(mOffset - (mSize - size));
count -= start;
}
}
if (mContentLengthLimit != 0 && mSize > mContentLengthLimit) {
count -= start;
}
}
if (mContentLengthLimit != 0 && mSize > mContentLengthLimit) {
- count -= (int)(mSize - mContentLengthLimit);
+ count -= (int)
(mSize - mContentLengthLimit);
if (count > 0) {
mSink.write(ByteBuffer.wrap(buffer, start, count));
}
if (count > 0) {
mSink.write(ByteBuffer.wrap(buffer, start, count));
}
@@
-422,6
+418,11
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
}
@Override
}
@Override
+ public String getNegotiatedProtocol() {
+ return "";
+ }
+
+ @Override
public int getHttpStatusCode() {
int httpStatusCode = mHttpStatusCode;
public int getHttpStatusCode() {
int httpStatusCode = mHttpStatusCode;
@@
-458,12
+459,12
@@
class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
*/
@Override
public ByteBuffer getByteBuffer() {
*/
@Override
public ByteBuffer getByteBuffer() {
- return ((ChunkedWritableByteChannel)mSink).getByteBuffer();
+ return ((ChunkedWritableByteChannel)
mSink).getByteBuffer();
}
@Override
public byte[] getResponseAsBytes() {
}
@Override
public byte[] getResponseAsBytes() {
- return ((ChunkedWritableByteChannel)mSink).getBytes();
+ return ((ChunkedWritableByteChannel)
mSink).getBytes();
}
@Override
}
@Override