Merge WHATWG change: Be clearer about response headers; exclude trailer headers from the scope.
--- a/Overview.html Tue Oct 22 14:02:50 2013 +0900
+++ b/Overview.html Tue Oct 22 15:32:23 2013 +0900
@@ -1931,6 +1931,13 @@
<h3 id="response"><span class="secno">4.7 </span>Response</h3>
+ <p>A <dfn id="concept-response-header" title="concept-response-header">response header</dfn> is a HTTP response header
+ transmitted before the <a href="#response-entity-body">response entity body</a>.
+ <a href="#refsHTTP">[HTTP]</a>
+
+ <p class="note">This excludes trailer fields ("trailers").
+
+
<h4 id="the-status-attribute"><span class="secno">4.7.1 </span>The <code title="">status</code> attribute</h4>
<dl class="domintro">
@@ -1999,24 +2006,22 @@
<li><p>If <var>header</var> is a case-insensitive match for
<code>Set-Cookie</code> or <code>Set-Cookie2</code>, return null.</li>
- <li><p>If <var>header</var> is a case-insensitive match for multiple HTTP
- response headers, return the values of these headers as a single
- concatenated string separated from each other by a
+ <li><p>If <var>header</var> is a case-insensitive match for multiple
+ <a href="#concept-response-header" title="concept-response-header">response headers</a>, return the values of these
+ headers as a single concatenated string separated from each other by a
U+002C COMMA U+0020 SPACE character pair.
- <li><p>If <var>header</var> is a case-insensitive match for a single HTTP
- response header, return the value of that header.
+ <li><p>If <var>header</var> is a case-insensitive match for a single
+ <a href="#concept-response-header" title="concept-response-header">response header</a>, return the value of that header.
<li><p>Return null.</li>
</ol>
-
<p class="note">The Cross-Origin Resource Sharing specification filters
- the headers that are exposed by
- <code title="dom-XMLHttpRequest-getResponseHeader"><a href="#dom-xmlhttprequest-getresponseheader">getResponseHeader()</a></code>
- for non <a class="external" href="http://dev.w3.org/html5/spec/browsers.html#same-origin" title="same origin">same-origin</a>
- requests. <a href="#refsCORS">[CORS]</a>
-
+ <a href="#concept-response-header" title="concept-response-header">response headers</a> exposed by
+ <code title="dom-XMLHttpRequest-getAllResponseHeaders"><a href="#dom-xmlhttprequest-getallresponseheaders">getAllResponseHeaders()</a></code>
+ for <a class="external" href="http://www.w3.org/TR/cors/#cross-origin-request" title="cross-origin request">cross-origin requests</a>.
+ <a href="#refsCORS">[CORS]</a>
<div class="example">
@@ -2058,7 +2063,7 @@
<li><p>If the <a href="#error-flag">error flag</a> is set, return the empty string.
- <li><p>Return all the HTTP headers, excluding headers that are a
+ <li><p>Return all <a href="#concept-response-header" title="concept-response-header">response headers</a>, excluding headers that are a
case-insensitive match for <code>Set-Cookie</code> or
<code>Set-Cookie2</code>, as a single string, with each header line
separated by a U+000D CR U+000A LF pair, excluding the status line, and
@@ -2066,13 +2071,11 @@
U+003A COLON U+0020 SPACE pair.</li>
</ol>
-
<p class="note">The Cross-Origin Resource Sharing specification filters
- the headers that are exposed by
+ <a href="#concept-response-header" title="concept-response-header">response headers</a> exposed by
<code title="dom-XMLHttpRequest-getAllResponseHeaders"><a href="#dom-xmlhttprequest-getallresponseheaders">getAllResponseHeaders()</a></code>
- for non <a class="external" href="http://dev.w3.org/html5/spec/browsers.html#same-origin" title="same origin">same-origin</a>
- requests. <a href="#refsCORS">[CORS]</a>
-
+ for <a class="external" href="http://www.w3.org/TR/cors/#cross-origin-request" title="cross-origin request">cross-origin requests</a>.
+ <a href="#refsCORS">[CORS]</a>
<div class="example">
<p>For the following script:</p>
--- a/Overview.src.html Tue Oct 22 14:02:50 2013 +0900
+++ b/Overview.src.html Tue Oct 22 15:32:23 2013 +0900
@@ -1940,6 +1940,13 @@
<h3 id="response">Response</h3>
+ <p>A <dfn title=concept-response-header>response header</dfn> is a HTTP response header
+ transmitted before the <span>response entity body</span>.
+ <span data-anolis-ref>HTTP</span>
+
+ <p class=note>This excludes trailer fields ("trailers").
+
+
<h4>The <code title>status</code> attribute</h4>
<dl class=domintro>
@@ -2008,24 +2015,22 @@
<li><p>If <var>header</var> is a case-insensitive match for
<code>Set-Cookie</code> or <code>Set-Cookie2</code>, return null.</p></li>
- <li><p>If <var>header</var> is a case-insensitive match for multiple HTTP
- response headers, return the values of these headers as a single
- concatenated string separated from each other by a
+ <li><p>If <var>header</var> is a case-insensitive match for multiple
+ <span title=concept-response-header>response headers</span>, return the values of these
+ headers as a single concatenated string separated from each other by a
U+002C COMMA U+0020 SPACE character pair.
- <li><p>If <var>header</var> is a case-insensitive match for a single HTTP
- response header, return the value of that header.
+ <li><p>If <var>header</var> is a case-insensitive match for a single
+ <span title=concept-response-header>response header</span>, return the value of that header.
<li><p>Return null.</p></li>
</ol>
-
<p class=note>The Cross-Origin Resource Sharing specification filters
- the headers that are exposed by
- <code title="dom-XMLHttpRequest-getResponseHeader">getResponseHeader()</code>
- for non <span data-anolis-spec=html title="same origin">same-origin</span>
- requests. <span data-anolis-ref>CORS</span>
-
+ <span title=concept-response-header>response headers</span> exposed by
+ <code title="dom-XMLHttpRequest-getAllResponseHeaders">getAllResponseHeaders()</code>
+ for <span data-anolis-spec=cors title="cross-origin request">cross-origin requests</span>.
+ <span data-anolis-ref>CORS</span>
<div class="example">
@@ -2067,7 +2072,7 @@
<li><p>If the <span>error flag</span> is set, return the empty string.
- <li><p>Return all the HTTP headers, excluding headers that are a
+ <li><p>Return all <span title=concept-response-header>response headers</span>, excluding headers that are a
case-insensitive match for <code>Set-Cookie</code> or
<code>Set-Cookie2</code>, as a single string, with each header line
separated by a U+000D CR U+000A LF pair, excluding the status line, and
@@ -2075,13 +2080,11 @@
U+003A COLON U+0020 SPACE pair.</p></li>
</ol>
-
<p class=note>The Cross-Origin Resource Sharing specification filters
- the headers that are exposed by
+ <span title=concept-response-header>response headers</span> exposed by
<code title="dom-XMLHttpRequest-getAllResponseHeaders">getAllResponseHeaders()</code>
- for non <span data-anolis-spec=html title="same origin">same-origin</span>
- requests. <span data-anolis-ref>CORS</span>
-
+ for <span data-anolis-spec=cors title="cross-origin request">cross-origin requests</span>.
+ <span data-anolis-ref>CORS</span>
<div class="example">
<p>For the following script:</p>
--- a/data/xrefs/dom/xhr.json Tue Oct 22 14:02:50 2013 +0900
+++ b/data/xrefs/dom/xhr.json Tue Oct 22 15:32:23 2013 +0900
@@ -5,6 +5,7 @@
"arraybuffer response entity body": "arraybuffer-response-entity-body",
"author request headers": "author-request-headers",
"blob response entity body": "blob-response-entity-body",
+ "concept-response-header": "concept-response-header",
"concept-xmlhttprequest-document": "concept-xmlhttprequest-document",
"cross-origin request event rules": "cross-origin-request-event-rules",
"cross-origin request steps": "cross-origin-request-steps",