Merge 197325 "[Fetch] Check / Set .bodyUsed in Request construct..."

Source/modules/fetch/Request.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/fetch/Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
@@ skipping 31 matching lines @@
     // FIXME: Set cache mode.
     // TODO(yhirano): Set redirect mode.
     return request;
 }
 
 Request* Request::createRequestWithRequestOrString(ScriptState* scriptState, Request* inputRequest, const String& inputString, const RequestInit& init, ExceptionState& exceptionState)
 {
     // "1. Let |temporaryBody| be null."
     RefPtr<BlobDataHandle> temporaryBody;
 
+    if (inputRequest) {
+        // We check bodyUsed even when the body is null in spite of the
+        // spec. See https://github.com/whatwg/fetch/issues/61 for details.
+        if (inputRequest->bodyUsed()) {
+            exceptionState.throwTypeError("Cannot construct a Request with a Request object that has already been used.");
+            return nullptr;
+        }
+    }
+
     // "2. If |input| is a Request object and |input|'s body is non-null, run
     // these substeps:"
     if (inputRequest && inputRequest->hasBody()) {
         // "1. If |input|'s used flag is set, throw a TypeError."
         // "2. Set |temporaryBody| to |input|'s body."
         if (inputRequest->bodyUsed()) {
             exceptionState.throwTypeError("Cannot construct a Request with a Request object that has already been used.");
             return nullptr;
         }
         if (inputRequest->isBodyConsumed()) {
@@ skipping 174 matching lines @@
 
     // "29. Set |r|'s body to |temporaryBody|.
     r->setBodyBlobHandle(temporaryBody.release());
 
     // "30. Set |r|'s MIME type to the result of extracting a MIME type from
     // |r|'s request's header list."
     r->m_request->setMIMEType(r->m_request->headerList()->extractMIMEType());
 
     // "31. If |input| is a Request object and |input|'s body is non-null, run
     // these substeps:"
-    if (inputRequest && inputRequest->hasBody()) {
+    // We set bodyUsed even when the body is null in spite of the
+    // spec. See https://github.com/whatwg/fetch/issues/61 for details.
+    if (inputRequest) {
         // "1. Set |input|'s body to null."
         inputRequest->setBodyBlobHandle(nullptr);
         // "2. Set |input|'s used flag."
         inputRequest->lockBody(PassBody);
     }
 
     // "32. Return |r|."
     return r;
 }
 
@@ skipping 276 matching lines @@
 }
 
 DEFINE_TRACE(Request)
 {
     Body::trace(visitor);
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink