Ignore:
Timestamp:
11/12/08 16:02:40 (12 years ago)
Author:
julian.reschke@…
Message:

Synchronize with trunk (../latest), with the exception of Part 6. Fix P7 where it pointed into a section that was removed from Part 6.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest-roy/p4-conditional.xml

    r345 r437  
    1313  <!ENTITY SHOULD-NOT "<bcp14 xmlns='http://purl.org/net/xml2rfc/ext'>SHOULD NOT</bcp14>">
    1414  <!ENTITY ID-VERSION "latest">
    15   <!ENTITY ID-MONTH "November">
     15  <!ENTITY ID-MONTH "December">
    1616  <!ENTITY ID-YEAR "2008">
     17  <!ENTITY notation                   "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1718  <!ENTITY notation-abnf              "<xref target='Part1' x:rel='#notation.abnf' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1819  <!ENTITY basic-rules                "<xref target='Part1' x:rel='#basic.rules' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     
    205206  </t>
    206207  <t>
    207     The changes in this draft are summarized in <xref target="changes.since.04"/>.
     208    The changes in this draft are summarized in <xref target="changes.since.05"/>.
    208209  </t>
    209210</note>
     
    249250</t>
    250251</section>
    251 </section>
    252 
    253 <section title="Notational Conventions and Generic Grammar" anchor="notation">
     252
     253<section title="Syntax Notation" anchor="notation">
     254  <x:anchor-alias value="ALPHA"/>
     255  <x:anchor-alias value="CR"/>
     256  <x:anchor-alias value="DIGIT"/>
     257  <x:anchor-alias value="LF"/>
     258  <x:anchor-alias value="OCTET"/>
     259  <x:anchor-alias value="VCHAR"/>
     260  <x:anchor-alias value="WSP"/>
     261<t>
     262  This specification uses the ABNF syntax defined in &notation;.
     263  The following core rules are included by
     264  reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
     265  ALPHA (letters), CR (carriage return), CRLF (CR LF), CTL (controls),
     266  DIGIT (decimal 0-9), DQUOTE (double quote),
     267  HEXDIG (hexadecimal 0-9/A-F/a-f), LF (line feed),
     268  OCTET (any 8-bit sequence of data), SP (space),
     269  VCHAR (any visible USASCII character),
     270  and WSP (whitespace).
     271</t>
     272
     273<section title="Core Rules" anchor="core.rules">
    254274  <x:anchor-alias value="quoted-string"/>
    255 <t>
    256   This specification uses the ABNF syntax defined in &notation-abnf; and
    257   the core rules defined in &basic-rules;:
    258   <cref anchor="abnf.dep">ABNF syntax and basic rules will be adopted from RFC 5234, see
    259   <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>.</cref>
     275  <x:anchor-alias value="OWS"/>
     276<t>
     277  The core rules below are defined in &basic-rules;:
    260278</t>
    261279<figure><artwork type="abnf2616">
    262280  <x:ref>quoted-string</x:ref> = &lt;quoted-string, defined in &basic-rules;&gt;
     281  <x:ref>OWS</x:ref>           = &lt;OWS, defined in &basic-rules;&gt;
    263282</artwork></figure>
    264 <t anchor="abnf.dependencies">
     283</section>
     284
     285<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
    265286  <x:anchor-alias value="HTTP-date"/>
     287<t>
    266288  The ABNF rules below are defined in other parts:
    267289</t>
     
    269291  <x:ref>HTTP-date</x:ref>     = &lt;HTTP-date, defined in &full-date;&gt;
    270292</artwork></figure>
     293</section>
     294
     295</section>
     296
    271297</section>
    272298
     
    650676  <iref primary="true" item="Headers" subitem="ETag" x:for-anchor=""/>
    651677  <x:anchor-alias value="ETag"/>
    652 <t>
    653    The ETag response-header field provides the current value of the
     678  <x:anchor-alias value="ETag-v"/>
     679<t>
     680   The response-header field "ETag" provides the current value of the
    654681   entity tag (see <xref target="entity.tags"/>) for the requested variant.
    655682   The headers used with entity
     
    660687   (see <xref target="weak.and.strong.validators"/>).
    661688</t>
    662 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="ETag"/>
    663   <x:ref>ETag</x:ref> = "ETag" ":" <x:ref>entity-tag</x:ref>
     689<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="ETag"/><iref primary="true" item="Grammar" subitem="ETag-v"/>
     690  <x:ref>ETag</x:ref>   = "ETag" ":" <x:ref>OWS</x:ref> <x:ref>ETag-v</x:ref>
     691  <x:ref>ETag-v</x:ref> = <x:ref>entity-tag</x:ref>
    664692</artwork></figure>
    665693<figure><preamble>
    666    Examples:
     694  Examples:
    667695</preamble>
    668696<artwork type="example">
    669    ETag: "xyzzy"
    670    ETag: W/"xyzzy"
    671    ETag: ""
     697  ETag: "xyzzy"
     698  ETag: W/"xyzzy"
     699  ETag: ""
    672700</artwork></figure>
    673701<t>
     
    694722  <iref primary="true" item="Headers" subitem="If-Match" x:for-anchor=""/>
    695723  <x:anchor-alias value="If-Match"/>
    696 <t>
    697    The If-Match request-header field is used with a method to make it
     724  <x:anchor-alias value="If-Match-v"/>
     725<t>
     726   The request-header field "If-Match" is used with a method to make it
    698727   conditional. A client that has one or more entities previously
    699728   obtained from the resource can verify that one of those entities is
     
    706735   matches any current entity of the resource.
    707736</t>
    708 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Match"/>
    709   <x:ref>If-Match</x:ref> = "If-Match" ":" ( "*" / 1#<x:ref>entity-tag</x:ref> )
     737<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Match"/><iref primary="true" item="Grammar" subitem="If-Match-v"/>
     738  <x:ref>If-Match</x:ref>   = "If-Match" ":" <x:ref>OWS</x:ref> <x:ref>If-Match-v</x:ref>
     739  <x:ref>If-Match-v</x:ref> = "*" / 1#<x:ref>entity-tag</x:ref>
    710740</artwork></figure>
    711741<t>
     
    750780</t>
    751781<figure><artwork type="example">
    752     If-Match: "xyzzy"
    753     If-Match: "xyzzy", "r2d2xxxx", "c3piozzzz"
    754     If-Match: *
     782  If-Match: "xyzzy"
     783  If-Match: "xyzzy", "r2d2xxxx", "c3piozzzz"
     784  If-Match: *
    755785</artwork></figure>
    756786<t>
     
    765795  <iref primary="true" item="Headers" subitem="If-Modified-Since" x:for-anchor=""/>
    766796  <x:anchor-alias value="If-Modified-Since"/>
    767 <t>
    768    The If-Modified-Since request-header field is used with a method to
     797  <x:anchor-alias value="If-Modified-Since-v"/>
     798<t>
     799   The request-header field "If-Modified-Since" is used with a method to
    769800   make it conditional: if the requested variant has not been modified
    770801   since the time specified in this field, an entity will not be
     
    772803   be returned without any message-body.
    773804</t>
    774 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Modified-Since"/>
    775   <x:ref>If-Modified-Since</x:ref> = "If-Modified-Since" ":" <x:ref>HTTP-date</x:ref>
     805<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Modified-Since"/><iref primary="true" item="Grammar" subitem="If-Modified-Since-v"/>
     806  <x:ref>If-Modified-Since</x:ref>   = "If-Modified-Since" ":" <x:ref>OWS</x:ref>
     807                        <x:ref>If-Modified-Since-v</x:ref>
     808  <x:ref>If-Modified-Since-v</x:ref> = <x:ref>HTTP-date</x:ref>
    776809</artwork></figure>
    777810<t>
     
    779812</t>
    780813<figure><artwork type="example">
    781     If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
     814  If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
    782815</artwork></figure>
    783816<t>
     
    847880  <iref primary="true" item="Headers" subitem="If-None-Match" x:for-anchor=""/>
    848881  <x:anchor-alias value="If-None-Match"/>
    849 <t>
    850    The If-None-Match request-header field is used with a method to make
     882  <x:anchor-alias value="If-None-Match-v"/>
     883<t>
     884   The request-header field "If-None-Match" is used with a method to make
    851885   it conditional. A client that has one or more entities previously
    852886   obtained from the resource can verify that none of those entities is
     
    862896   resource.
    863897</t>
    864 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-None-Match"/>
    865   <x:ref>If-None-Match</x:ref> = "If-None-Match" ":" ( "*" / 1#<x:ref>entity-tag</x:ref> )
     898<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-None-Match"/><iref primary="true" item="Grammar" subitem="If-None-Match-v"/>
     899  <x:ref>If-None-Match</x:ref>   = "If-None-Match" ":" <x:ref>OWS</x:ref> <x:ref>If-None-Match-v</x:ref>
     900  <x:ref>If-None-Match-v</x:ref> = "*" / 1#<x:ref>entity-tag</x:ref>
    866901</artwork></figure>
    867902<t>
     
    909944</t>
    910945<figure><artwork type="example">
    911     If-None-Match: "xyzzy"
    912     If-None-Match: W/"xyzzy"
    913     If-None-Match: "xyzzy", "r2d2xxxx", "c3piozzzz"
    914     If-None-Match: W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz"
    915     If-None-Match: *
     946  If-None-Match: "xyzzy"
     947  If-None-Match: W/"xyzzy"
     948  If-None-Match: "xyzzy", "r2d2xxxx", "c3piozzzz"
     949  If-None-Match: W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz"
     950  If-None-Match: *
    916951</artwork></figure>
    917952<t>
     
    926961  <iref primary="true" item="Headers" subitem="If-Unmodified-Since" x:for-anchor=""/>
    927962  <x:anchor-alias value="If-Unmodified-Since"/>
    928 <t>
    929    The If-Unmodified-Since request-header field is used with a method to
     963  <x:anchor-alias value="If-Unmodified-Since-v"/>
     964<t>
     965   The request-header field "If-Unmodified-Since" is used with a method to
    930966   make it conditional. If the requested resource has not been modified
    931967   since the time specified in this field, the server &SHOULD; perform the
     
    938974   a 412 (Precondition Failed).
    939975</t>
    940 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Unmodified-Since"/>
    941   <x:ref>If-Unmodified-Since</x:ref> = "If-Unmodified-Since" ":" <x:ref>HTTP-date</x:ref>
     976<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="If-Unmodified-Since"/><iref primary="true" item="Grammar" subitem="If-Unmodified-Since-v"/>
     977  <x:ref>If-Unmodified-Since</x:ref>   = "If-Unmodified-Since" ":" <x:ref>OWS</x:ref>
     978                          <x:ref>If-Unmodified-Since-v</x:ref>
     979  <x:ref>If-Unmodified-Since-v</x:ref> = <x:ref>HTTP-date</x:ref>
    942980</artwork></figure>
    943981<t>
     
    945983</t>
    946984<figure><artwork type="example">
    947     If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT
     985  If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT
    948986</artwork></figure>
    949987<t>
     
    9661004  <iref primary="true" item="Headers" subitem="Last-Modified" x:for-anchor=""/>
    9671005  <x:anchor-alias value="Last-Modified"/>
    968 <t>
    969    The Last-Modified entity-header field indicates the date and time at
     1006  <x:anchor-alias value="Last-Modified-v"/>
     1007<t>
     1008   The entity-header field "Last-Modified" indicates the date and time at
    9701009   which the origin server believes the variant was last modified.
    9711010</t>
    972 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Last-Modified"/>
    973   <x:ref>Last-Modified</x:ref>  = "Last-Modified" ":" <x:ref>HTTP-date</x:ref>
     1011<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Last-Modified"/><iref primary="true" item="Grammar" subitem="Last-Modified-v"/>
     1012  <x:ref>Last-Modified</x:ref>   = "Last-Modified" ":" <x:ref>OWS</x:ref> <x:ref>Last-Modified-v</x:ref>
     1013  <x:ref>Last-Modified-v</x:ref> = <x:ref>HTTP-date</x:ref>
    9741014</artwork></figure>
    9751015<t>
     
    9771017</t>
    9781018<figure><artwork type="example">
    979     Last-Modified: Tue, 15 Nov 1994 12:45:26 GMT
     1019  Last-Modified: Tue, 15 Nov 1994 12:45:26 GMT
    9801020</artwork></figure>
    9811021<t>
     
    12331273</reference>
    12341274
     1275<reference anchor="RFC5234">
     1276  <front>
     1277    <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
     1278    <author initials="D." surname="Crocker" fullname="Dave Crocker" role="editor">
     1279      <organization>Brandenburg InternetWorking</organization>
     1280      <address>
     1281      <postal>
     1282      <street>675 Spruce Dr.</street>
     1283      <city>Sunnyvale</city>
     1284      <region>CA</region>
     1285      <code>94086</code>
     1286      <country>US</country></postal>
     1287      <phone>+1.408.246.8253</phone>
     1288      <email>dcrocker@bbiw.net</email></address> 
     1289    </author>
     1290    <author initials="P." surname="Overell" fullname="Paul Overell">
     1291      <organization>THUS plc.</organization>
     1292      <address>
     1293      <postal>
     1294      <street>1/2 Berkeley Square</street>
     1295      <street>99 Berkely Street</street>
     1296      <city>Glasgow</city>
     1297      <code>G3 7HR</code>
     1298      <country>UK</country></postal>
     1299      <email>paul.overell@thus.net</email></address>
     1300    </author>
     1301    <date month="January" year="2008"/>
     1302  </front>
     1303  <seriesInfo name="STD" value="68"/>
     1304  <seriesInfo name="RFC" value="5234"/>
     1305</reference>
     1306
    12351307</references>
    12361308
     
    13061378</section>
    13071379
     1380</section>
     1381
     1382<section xmlns:x="http://purl.org/net/xml2rfc/ext" title="Collected ABNF" anchor="collected.abnf">
     1383<figure>
     1384<artwork type="abnf" name="p4-conditional.parsed-abnf">
     1385<x:ref>ETag</x:ref> = "ETag:" OWS ETag-v
     1386<x:ref>ETag-v</x:ref> = entity-tag
     1387
     1388<x:ref>HTTP-date</x:ref> = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;
     1389
     1390<x:ref>If-Match</x:ref> = "If-Match:" OWS If-Match-v
     1391<x:ref>If-Match-v</x:ref> = "*" / ( *( "," OWS ) entity-tag *( OWS "," [ OWS
     1392 entity-tag ] ) )
     1393<x:ref>If-Modified-Since</x:ref> = "If-Modified-Since:" OWS If-Modified-Since-v
     1394<x:ref>If-Modified-Since-v</x:ref> = HTTP-date
     1395<x:ref>If-None-Match</x:ref> = "If-None-Match:" OWS If-None-Match-v
     1396<x:ref>If-None-Match-v</x:ref> = "*" / ( *( "," OWS ) entity-tag *( OWS "," [ OWS
     1397 entity-tag ] ) )
     1398<x:ref>If-Unmodified-Since</x:ref> = "If-Unmodified-Since:" OWS
     1399 If-Unmodified-Since-v
     1400<x:ref>If-Unmodified-Since-v</x:ref> = HTTP-date
     1401
     1402<x:ref>Last-Modified</x:ref> = "Last-Modified:" OWS Last-Modified-v
     1403<x:ref>Last-Modified-v</x:ref> = HTTP-date
     1404
     1405<x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
     1406
     1407<x:ref>entity-tag</x:ref> = [ weak ] opaque-tag
     1408
     1409<x:ref>opaque-tag</x:ref> = quoted-string
     1410
     1411<x:ref>quoted-string</x:ref> = &lt;quoted-string, defined in [Part1], Section 1.2.2&gt;
     1412
     1413<x:ref>weak</x:ref> = "W/"
     1414
     1415; ETag defined but not used
     1416; If-Match defined but not used
     1417; If-Modified-Since defined but not used
     1418; If-None-Match defined but not used
     1419; If-Unmodified-Since defined but not used
     1420; Last-Modified defined but not used
     1421
     1422
     1423</artwork>
     1424</figure>
    13081425</section>
    13091426
     
    13951512      Use "/" instead of "|" for alternatives.
    13961513    </t>
     1514    <t>
     1515      Introduce new ABNF rules for "bad" whitespace ("BWS"), optional
     1516      whitespace ("OWS") and required whitespace ("RWS").
     1517    </t>
     1518    <t>
     1519      Rewrite ABNFs to spell out whitespace rules, factor out
     1520      header value format definitions.
     1521    </t>
     1522  </list>
     1523</t>
     1524</section>
     1525
     1526<section title="Since draft-ietf-httpbis-p4-conditional-05" anchor="changes.since.05">
     1527<t>
     1528  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     1529  <list style="symbols">
     1530    <t>
     1531      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     1532    </t>
    13971533  </list>
    13981534</t>
Note: See TracChangeset for help on using the changeset viewer.