Changeset 137


Ignore:
Timestamp:
Jan 3, 2008, 8:21:04 AM (12 years ago)
Author:
julian.reschke@…
Message:

Use consistent status reason phrases.

Location:
draft-ietf-httpbis/latest
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p1-messaging.html

    r135 r137  
    11081108      <p id="rfc.section.3.4.p.9">New transfer-coding value tokens <em class="bcp14">SHOULD</em> be registered in the same way as new content-coding value tokens (<a href="p3-payload.html#content.codings" title="Content Codings">Section 2.2</a> of <a href="#Part3" id="rfc.xref.Part3.7"><cite title="HTTP/1.1, part 3: Message Payload and Content Negotiation">[Part3]</cite></a>).
    11091109      </p>
    1110       <p id="rfc.section.3.4.p.10">A server which receives an entity-body with a transfer-coding it does not understand <em class="bcp14">SHOULD</em> return 501 (Unimplemented), and close the connection. A server <em class="bcp14">MUST NOT</em> send transfer-codings to an HTTP/1.0 client.
     1110      <p id="rfc.section.3.4.p.10">A server which receives an entity-body with a transfer-coding it does not understand <em class="bcp14">SHOULD</em> return 501 (Not Implemented), and close the connection. A server <em class="bcp14">MUST NOT</em> send transfer-codings to an HTTP/1.0 client.
    11111111      </p>
    11121112      <h3 id="rfc.section.3.4.1"><a href="#rfc.section.3.4.1">3.4.1</a>&nbsp;<a id="chunked.transfer.encoding" href="#chunked.transfer.encoding">Chunked Transfer Coding</a></h3>
     
    12301230      <p id="rfc.section.4.3.p.6">For response messages, whether or not a message-body is included with a message is dependent on both the request method and
    12311231         the response status code (<a href="#status.code.and.reason.phrase" title="Status Code and Reason Phrase">Section&nbsp;6.1.1</a>). All responses to the HEAD request method <em class="bcp14">MUST NOT</em> include a message-body, even though the presence of entity-header fields might lead one to believe they do. All 1xx (informational),
    1232          204 (no content), and 304 (not modified) responses <em class="bcp14">MUST NOT</em> include a message-body. All other responses do include a message-body, although it <em class="bcp14">MAY</em> be of zero length.
     1232         204 (No Content), and 304 (Not Modified) responses <em class="bcp14">MUST NOT</em> include a message-body. All other responses do include a message-body, although it <em class="bcp14">MAY</em> be of zero length.
    12331233      </p>
    12341234      <h2 id="rfc.section.4.4"><a href="#rfc.section.4.4">4.4</a>&nbsp;<a id="message.length" href="#message.length">Message Length</a></h2>
     
    12711271      </ol>
    12721272      <p id="rfc.section.4.4.p.3">For compatibility with HTTP/1.0 applications, HTTP/1.1 requests containing a message-body <em class="bcp14">MUST</em> include a valid Content-Length header field unless the server is known to be HTTP/1.1 compliant. If a request contains a message-body
    1273          and a Content-Length is not given, the server <em class="bcp14">SHOULD</em> respond with 400 (bad request) if it cannot determine the length of the message, or with 411 (length required) if it wishes
     1273         and a Content-Length is not given, the server <em class="bcp14">SHOULD</em> respond with 400 (Bad Request) if it cannot determine the length of the message, or with 411 (Length Required) if it wishes
    12741274         to insist on receiving a valid Content-Length.
    12751275      </p>
  • draft-ietf-httpbis/latest/p1-messaging.xml

    r135 r137  
    12051205<t>
    12061206   A server which receives an entity-body with a transfer-coding it does
    1207    not understand &SHOULD; return 501 (Unimplemented), and close the
     1207   not understand &SHOULD; return 501 (Not Implemented), and close the
    12081208   connection. A server &MUST-NOT; send transfer-codings to an HTTP/1.0
    12091209   client.
     
    14331433   &MUST-NOT; include a message-body, even though the presence of entity-header
    14341434   fields might lead one to believe they do. All 1xx
    1435    (informational), 204 (no content), and 304 (not modified) responses
     1435   (informational), 204 (No Content), and 304 (Not Modified) responses
    14361436   &MUST-NOT; include a message-body. All other responses do include a
    14371437   message-body, although it &MAY; be of zero length.
     
    14981498   field unless the server is known to be HTTP/1.1 compliant. If a
    14991499   request contains a message-body and a Content-Length is not given,
    1500    the server &SHOULD; respond with 400 (bad request) if it cannot
    1501    determine the length of the message, or with 411 (length required) if
     1500   the server &SHOULD; respond with 400 (Bad Request) if it cannot
     1501   determine the length of the message, or with 411 (Length Required) if
    15021502   it wishes to insist on receiving a valid Content-Length.
    15031503</t>
  • draft-ietf-httpbis/latest/p2-semantics.html

    r135 r137  
    13881388      </p>
    13891389      <p id="rfc.section.10.2.p.7">Many older HTTP/1.0 and HTTP/1.1 applications do not understand the Expect header.</p>
    1390       <p id="rfc.section.10.2.p.8">See <a href="p1-messaging.html#use.of.the.100.status" title="Use of the 100 (Continue) Status">Section 7.2.3</a> of <a href="#Part1" id="rfc.xref.Part1.8"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a> for the use of the 100 (continue) status.
     1390      <p id="rfc.section.10.2.p.8">See <a href="p1-messaging.html#use.of.the.100.status" title="Use of the 100 (Continue) Status">Section 7.2.3</a> of <a href="#Part1" id="rfc.xref.Part1.8"><cite title="HTTP/1.1, part 1: URIs, Connections, and Message Parsing">[Part1]</cite></a> for the use of the 100 (Continue) status.
    13911391      </p>
    13921392      <div id="rfc.iref.f.1"></div>
  • draft-ietf-httpbis/latest/p2-semantics.xml

    r135 r137  
    17251725</t>
    17261726<t>
    1727    See &use100; for the use of the 100 (continue) status.
     1727   See &use100; for the use of the 100 (Continue) status.
    17281728</t>
    17291729</section>
  • draft-ietf-httpbis/latest/p3-payload.html

    r136 r137  
    912912      <p id="rfc.section.5.1.p.8">If no Accept header field is present, then it is assumed that the client accepts all media types. If an Accept header field
    913913         is present, and if the server cannot send a response which is acceptable according to the combined Accept field value, then
    914          the server <em class="bcp14">SHOULD</em> send a 406 (not acceptable) response.
     914         the server <em class="bcp14">SHOULD</em> send a 406 (Not Acceptable) response.
    915915      </p>
    916916      <p id="rfc.section.5.1.p.9">A more elaborate example is</p>
     
    963963      </p>
    964964      <p id="rfc.section.5.2.p.6">If no Accept-Charset header is present, the default is that any character set is acceptable. If an Accept-Charset header is
    965          present, and if the server cannot send a response which is acceptable according to the Accept-Charset header, then the server <em class="bcp14">SHOULD</em> send an error response with the 406 (not acceptable) status code, though the sending of an unacceptable response is also allowed.
     965         present, and if the server cannot send a response which is acceptable according to the Accept-Charset header, then the server <em class="bcp14">SHOULD</em> send an error response with the 406 (Not Acceptable) status code, though the sending of an unacceptable response is also allowed.
    966966      </p>
    967967      <div id="rfc.iref.a.3"></div>
  • draft-ietf-httpbis/latest/p3-payload.xml

    r136 r137  
    886886   and if the server cannot send a response which is acceptable
    887887   according to the combined Accept field value, then the server &SHOULD;
    888    send a 406 (not acceptable) response.
     888   send a 406 (Not Acceptable) response.
    889889</t>
    890890<t>
     
    981981   and if the server cannot send a response which is acceptable
    982982   according to the Accept-Charset header, then the server &SHOULD; send
    983    an error response with the 406 (not acceptable) status code, though
     983   an error response with the 406 (Not Acceptable) status code, though
    984984   the sending of an unacceptable response is also allowed.
    985985</t>
  • draft-ietf-httpbis/latest/p4-conditional.html

    r135 r137  
    772772      <h2 id="rfc.section.6.3"><a href="#rfc.section.6.3">6.3</a>&nbsp;<a id="header.if-modified-since" href="#header.if-modified-since">If-Modified-Since</a></h2>
    773773      <p id="rfc.section.6.3.p.1">The If-Modified-Since request-header field is used with a method to make it conditional: if the requested variant has not
    774          been modified since the time specified in this field, an entity will not be returned from the server; instead, a 304 (not
    775          modified) response will be returned without any message-body.
     774         been modified since the time specified in this field, an entity will not be returned from the server; instead, a 304 (Not
     775         Modified) response will be returned without any message-body.
    776776      </p>
    777777      <div id="rfc.figure.u.6"></div><pre class="inline"><span id="rfc.iref.g.6"></span>  If-Modified-Since = "If-Modified-Since" ":" HTTP-date
  • draft-ietf-httpbis/latest/p4-conditional.xml

    r135 r137  
    671671   make it conditional: if the requested variant has not been modified
    672672   since the time specified in this field, an entity will not be
    673    returned from the server; instead, a 304 (not modified) response will
     673   returned from the server; instead, a 304 (Not Modified) response will
    674674   be returned without any message-body.
    675675</t>
  • draft-ietf-httpbis/latest/p5-range.html

    r135 r137  
    566566      <p id="rfc.section.3.1.p.4">A cache <em class="bcp14">MUST NOT</em> combine a 206 response with other previously cached content if the ETag or Last-Modified headers do not match exactly, see <a href="#combining.byte.ranges" title="Combining Byte Ranges">4</a>.
    567567      </p>
    568       <p id="rfc.section.3.1.p.5">A cache that does not support the Range and Content-Range headers <em class="bcp14">MUST NOT</em> cache 206 (Partial) responses.
     568      <p id="rfc.section.3.1.p.5">A cache that does not support the Range and Content-Range headers <em class="bcp14">MUST NOT</em> cache 206 (Partial Content) responses.
    569569      </p>
    570570      <div id="rfc.iref.4"></div>
     
    659659         a Content-Length header showing the number of bytes actually transferred. For example,
    660660      </p>
    661       <div id="rfc.figure.u.10"></div><pre class="text">    HTTP/1.1 206 Partial content
     661      <div id="rfc.figure.u.10"></div><pre class="text">    HTTP/1.1 206 Partial Content
    662662    Date: Wed, 15 Nov 1995 06:25:24 GMT
    663663    Last-Modified: Wed, 15 Nov 1995 04:58:08 GMT
     
    700700         no more than two characters.) The If-Range header <em class="bcp14">SHOULD</em> only be used together with a Range header, and <em class="bcp14">MUST</em> be ignored if the request does not include a Range header, or if the server does not support the sub-range operation.
    701701      </p>
    702       <p id="rfc.section.5.3.p.5">If the entity tag given in the If-Range header matches the current entity tag for the entity, then the server <em class="bcp14">SHOULD</em> provide the specified sub-range of the entity using a 206 (Partial content) response. If the entity tag does not match, then
     702      <p id="rfc.section.5.3.p.5">If the entity tag given in the If-Range header matches the current entity tag for the entity, then the server <em class="bcp14">SHOULD</em> provide the specified sub-range of the entity using a 206 (Partial Content) response. If the entity tag does not match, then
    703703         the server <em class="bcp14">SHOULD</em> return the entire entity using a 200 (OK) response.
    704704      </p>
  • draft-ietf-httpbis/latest/p5-range.xml

    r135 r137  
    293293<t>
    294294   A cache that does not support the Range and Content-Range headers
    295    &MUST-NOT; cache 206 (Partial) responses.
     295   &MUST-NOT; cache 206 (Partial Content) responses.
    296296</t>
    297297</section>
     
    474474</t>
    475475<figure><artwork type="example">
    476     HTTP/1.1 206 Partial content
     476    HTTP/1.1 206 Partial Content
    477477    Date: Wed, 15 Nov 1995 06:25:24 GMT
    478478    Last-Modified: Wed, 15 Nov 1995 04:58:08 GMT
     
    556556   If the entity tag given in the If-Range header matches the current
    557557   entity tag for the entity, then the server &SHOULD; provide the
    558    specified sub-range of the entity using a 206 (Partial content)
     558   specified sub-range of the entity using a 206 (Partial Content)
    559559   response. If the entity tag does not match, then the server &SHOULD;
    560560   return the entire entity using a 200 (OK) response.
  • draft-ietf-httpbis/latest/p6-cache.html

    r135 r137  
    698698            see <a href="#header.cache-control" id="rfc.xref.header.cache-control.2" title="Cache-Control">Section&nbsp;3.2</a>).
    699699         </li>
    700          <li>It is an appropriate 304 (Not Modified), 305 (Proxy Redirect), or error (4xx or 5xx) response message.</li>
     700         <li>It is an appropriate 304 (Not Modified), 305 (Use Proxy), or error (4xx or 5xx) response message.</li>
    701701      </ol>
    702702      <p id="rfc.section.2.1.1.p.2">If the cache can not communicate with the origin server, then a correct cache <em class="bcp14">SHOULD</em> respond as above if the response can be correctly served from the cache; if not it <em class="bcp14">MUST</em> return an error or warning indicating that there was a communication failure.
  • draft-ietf-httpbis/latest/p6-cache.xml

    r135 r137  
    471471         "no-cache" cache-request-directive; see <xref target="header.cache-control"/>).</t>
    472472
    473       <t>It is an appropriate 304 (Not Modified), 305 (Proxy Redirect),
     473      <t>It is an appropriate 304 (Not Modified), 305 (Use Proxy),
    474474         or error (4xx or 5xx) response message.</t>
    475475  </list>
Note: See TracChangeset for help on using the changeset viewer.