Update To 11.40.268.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 237623f..4d2af1a 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
@@ -79,6 +79,8 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
 
     private int mHttpStatusCode;
 
+    private String mHttpStatusText;
+
     private boolean mStarted;
 
     private boolean mCanceled;
@@ -126,8 +128,8 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
                         @Override
                     public Thread newThread(Runnable r) {
                         Thread thread = new Thread(r,
-                                "HttpUrlConnection #" +
-                                mCount.getAndIncrement());
+                                "HttpUrlConnection #"
+                                + mCount.getAndIncrement());
                         // Note that this thread is not doing actual networking.
                         // It's only a controller.
                         thread.setPriority(Thread.NORM_PRIORITY);
@@ -186,6 +188,12 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
     }
 
     @Override
+    public void disableRedirects() {
+        validateNotStarted();
+        mConnection.setFollowRedirects(false);
+    }
+
+    @Override
     public void start() {
         getExecutor().execute(new Runnable() {
             @Override
@@ -250,6 +258,7 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
             }
 
             mHttpStatusCode = mConnection.getResponseCode();
+            mHttpStatusText = mConnection.getResponseMessage();
             mContentType = mConnection.getContentType();
             mContentLength = mConnection.getContentLength();
             if (mContentLengthLimit > 0 && mContentLength > mContentLengthLimit
@@ -438,6 +447,11 @@ class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
     }
 
     @Override
+    public String getHttpStatusText() {
+        return mHttpStatusText;
+    }
+
+    @Override
     public IOException getException() {
         if (mException == null && mContentLengthOverLimit) {
             mException = new ResponseTooLargeException();