Make the Response constructor throw when status is a null body status and body is non-null

Source/modules/fetch/Response.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/Response.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/DOMArrayBuffer.h"
@@ skipping 135 matching lines @@
         const long long length = blobData->length();
         Blob* blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
         return create(context, blob, ResponseInit(responseInit, exceptionState), exceptionState);
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 Response* Response::create(ExecutionContext* context, Blob* body, const ResponseInit& responseInit, ExceptionState& exceptionState)
 {
+    unsigned short status = responseInit.status;
+
     // "1. If |init|'s status member is not in the range 200 to 599, throw a
     // RangeError."
-    if (responseInit.status < 200 || 599 < responseInit.status) {
-        exceptionState.throwRangeError("Invalid status");
+    if (status < 200 || 599 < status) {
+        exceptionState.throwRangeError(ExceptionMessages::indexOutsideRange<unsigned>("status", status, 200, ExceptionMessages::InclusiveBound, 599, ExceptionMessages::InclusiveBound));
         return 0;
     }
 
-    // "2. If |init|'s statusText member does not match the Reason-Phrase
+    // "2. If init's status member is a null body status and body is non-null,
+    // throw a TypeError. A null body status is 101, 204, 205, or 304,
+    // spec link, See https://github.com/whatwg/fetch/issues/86 for details

[philipj_slow, 2015/07/28 09:52:51]

The issue link is already in the description. I meant a static bool
isNullBodyStatus(unsigned short status), perhaps documented with
https://fetch.spec.whatwg.org/#null-body-status

[shiva.jm, 2015/07/29 04:13:00]

Done.

[shiva.jm, 2015/07/29 04:13:00]

Done.

+    if ((status == 101 || status == 204 || status == 205 || status == 304) && body) {
+        exceptionState.throwTypeError("Response with null body status cannot have body");
+        return 0;
+    }
+
+    // "3. If |init|'s statusText member does not match the Reason-Phrase
     // token production, throw a TypeError."
     if (!isValidReasonPhrase(responseInit.statusText)) {
         exceptionState.throwTypeError("Invalid statusText");
         return 0;
     }
 
-    // "3. Let |r| be a new Response object, associated with a new response,
+    // "4. Let |r| be a new Response object, associated with a new response,
     // Headers object, and Body object."
     Response* r = new Response(context);
     r->suspendIfNeeded();
 
-    // "4. Set |r|'s response's status to |init|'s status member."
+    // "5. Set |r|'s response's status to |init|'s status member."
     r->m_response->setStatus(responseInit.status);
 
-    // "5. Set |r|'s response's status message to |init|'s statusText member."
+    // "6. Set |r|'s response's status message to |init|'s statusText member."
     r->m_response->setStatusMessage(AtomicString(responseInit.statusText));
 
-    // "6. If |init|'s headers member is present, run these substeps:"
+    // "7. If |init|'s headers member is present, run these substeps:"
     if (responseInit.headers) {
         // "1. Empty |r|'s response's header list."
         r->m_response->headerList()->clearList();
         // "2. Fill |r|'s Headers object with |init|'s headers member. Rethrow
         // any exceptions."
         r->m_headers->fillWith(responseInit.headers.get(), exceptionState);
         if (exceptionState.hadException())
             return 0;
     } else if (!responseInit.headersDictionary.isUndefinedOrNull()) {
         // "1. Empty |r|'s response's header list."
         r->m_response->headerList()->clearList();
         // "2. Fill |r|'s Headers object with |init|'s headers member. Rethrow
         // any exceptions."
         r->m_headers->fillWith(responseInit.headersDictionary, exceptionState);
         if (exceptionState.hadException())
             return 0;
     }
-    // "7. If body is given, run these substeps:"
+    // "8. If body is given, run these substeps:"
     if (body) {
         // "1. Let |stream| and |Content-Type| be the result of extracting body."
         // "2. Set |r|'s response's body to |stream|."
         // "3. If |Content-Type| is non-null and |r|'s response's header list
         // contains no header named `Content-Type`, append `Content-Type`/
         // |Content-Type| to |r|'s response's header list."
         // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
         // Step 3, Blob:
         // "If object's type attribute is not the empty byte sequence, set
         // Content-Type to its value."
         r->m_response->replaceBodyStreamBuffer(BodyStreamBuffer::create(FetchBlobDataConsumerHandle::create(context, body->blobDataHandle())));
         r->refreshBody();
         if (!body->type().isEmpty() && !r->m_response->headerList()->has("Content-Type"))
             r->m_response->headerList()->append("Content-Type", body->type());
     }
 
-    // "8. Set |r|'s MIME type to the result of extracting a MIME type
+    // "9. Set |r|'s MIME type to the result of extracting a MIME type
     // from |r|'s response's header list."
     r->m_response->setMIMEType(r->m_response->headerList()->extractMIMEType());
 
-    // "9. Return |r|."
+    // "10. Return |r|."
     return r;
 }
 
 Response* Response::create(ExecutionContext* context, FetchResponseData* response)
 {
     Response* r = new Response(context, response);
     r->suspendIfNeeded();
     return r;
 }
 
@@ skipping 203 matching lines @@
 }
 
 DEFINE_TRACE(Response)
 {
     Body::trace(visitor);
     visitor->trace(m_response);
     visitor->trace(m_headers);
 }
 
 } // namespace blink