Changeset 1230 for draft-ietf-httpbis/latest/p7-auth.xml

Timestamp:

Mar 29, 2011, 5:30:21 AM (9 years ago)

Author:

julian.reschke@…

Message:

rewrite header field ABNFs to only specify the field value (see #276)

File:

• draft-ietf-httpbis/latest/p7-auth.xml (modified) (11 diffs)

draft-ietf-httpbis/latest/p7-auth.xml

@@ -467 +467 @@
   <iref primary="true" item="Header Fields" subitem="Authorization" x:for-anchor=""/>
   <x:anchor-alias value="Authorization"/>
-  <x:anchor-alias value="Authorization-v"/>
 <t>
    The "Authorization" header field allows a user agent to authenticate
@@ -475 +474 @@
    requested.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Authorization"/><iref primary="true" item="Grammar" subitem="Authorization-v"/>
-  <x:ref>Authorization</x:ref>   = "Authorization" ":" <x:ref>OWS</x:ref> <x:ref>Authorization-v</x:ref>
-  <x:ref>Authorization-v</x:ref> = <x:ref>credentials</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Authorization"/>
+  <x:ref>Authorization</x:ref> = <x:ref>credentials</x:ref>
 </artwork></figure>
 <t>
@@ -522 +520 @@
   <iref primary="true" item="Header Fields" subitem="Proxy-Authenticate" x:for-anchor=""/>
   <x:anchor-alias value="Proxy-Authenticate"/>
-  <x:anchor-alias value="Proxy-Authenticate-v"/>
 <t>
    The "Proxy-Authenticate" header field consists of a challenge that
@@ -529 +526 @@
    of a 407 (Proxy Authentication Required) response.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authenticate"/><iref primary="true" item="Grammar" subitem="Proxy-Authenticate-v"/>
-  <x:ref>Proxy-Authenticate</x:ref>   = "Proxy-Authenticate" ":" <x:ref>OWS</x:ref>
-                         <x:ref>Proxy-Authenticate-v</x:ref>
-  <x:ref>Proxy-Authenticate-v</x:ref> = 1#<x:ref>challenge</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authenticate"/>
+  <x:ref>Proxy-Authenticate</x:ref> = 1#<x:ref>challenge</x:ref>
 </artwork></figure>
 <t>
@@ -548 +543 @@
   <iref primary="true" item="Header Fields" subitem="Proxy-Authorization" x:for-anchor=""/>
   <x:anchor-alias value="Proxy-Authorization"/>
-  <x:anchor-alias value="Proxy-Authorization-v"/>
 <t>
    The "Proxy-Authorization" header field allows the client to
@@ -556 +550 @@
    agent for the proxy and/or realm of the resource being requested.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authorization"/><iref primary="true" item="Grammar" subitem="Proxy-Authorization-v"/>
-  <x:ref>Proxy-Authorization</x:ref>   = "Proxy-Authorization" ":" <x:ref>OWS</x:ref>
-                          <x:ref>Proxy-Authorization-v</x:ref>
-  <x:ref>Proxy-Authorization-v</x:ref> = <x:ref>credentials</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Proxy-Authorization"/>
+  <x:ref>Proxy-Authorization</x:ref> = <x:ref>credentials</x:ref>
 </artwork></figure>
 <t>
@@ -577 +569 @@
   <iref primary="true" item="Header Fields" subitem="WWW-Authenticate" x:for-anchor=""/>
   <x:anchor-alias value="WWW-Authenticate"/>
-  <x:anchor-alias value="WWW-Authenticate-v"/>
 <t>
    The "WWW-Authenticate" header field consists of at least one
@@ -584 +575 @@
    (Unauthorized) response messages.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="WWW-Authenticate"/><iref primary="true" item="Grammar" subitem="WWW-Authenticate-v"/>
-  <x:ref>WWW-Authenticate</x:ref>   = "WWW-Authenticate" ":" <x:ref>OWS</x:ref> <x:ref>WWW-Authenticate-v</x:ref>
-  <x:ref>WWW-Authenticate-v</x:ref> = 1#<x:ref>challenge</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="WWW-Authenticate"/>
+  <x:ref>WWW-Authenticate</x:ref> = 1#<x:ref>challenge</x:ref>
 </artwork></figure>
 <t>
@@ -983 +973 @@
 </references>
 
-<!-- re-add this once we have changes
 <section title="Changes from RFC 2616" anchor="changes.from.rfc.2616">
-</section>
- -->
+<t>
+  Change ABNF productions for header fields to only define the field value.
+  (<xref target="header.fields"/>)
+</t>
+</section>
  
 <?BEGININC p7-auth.abnf-appendix ?>
@@ -992 +984 @@
 <figure>
 <artwork type="abnf" name="p7-auth.parsed-abnf">
-<x:ref>Authorization</x:ref> = "Authorization:" OWS Authorization-v
-<x:ref>Authorization-v</x:ref> = credentials
+<x:ref>Authorization</x:ref> = credentials
 
 <x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
 
-<x:ref>Proxy-Authenticate</x:ref> = "Proxy-Authenticate:" OWS Proxy-Authenticate-v
-<x:ref>Proxy-Authenticate-v</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
+<x:ref>Proxy-Authenticate</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
  challenge ] )
-<x:ref>Proxy-Authorization</x:ref> = "Proxy-Authorization:" OWS
- Proxy-Authorization-v
-<x:ref>Proxy-Authorization-v</x:ref> = credentials
-
-<x:ref>WWW-Authenticate</x:ref> = "WWW-Authenticate:" OWS WWW-Authenticate-v
-<x:ref>WWW-Authenticate-v</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS
- challenge ] )
+<x:ref>Proxy-Authorization</x:ref> = credentials
+
+<x:ref>WWW-Authenticate</x:ref> = *( "," OWS ) challenge *( OWS "," [ OWS challenge
+ ] )
 
 <x:ref>auth-param</x:ref> = token "=" ( token / quoted-string )
@@ -1197 +1184 @@
 <section title="Since draft-ietf-httpbis-p7-auth-13" anchor="changes.since.13">
 <t>
-  None yet.
+  Closed issues:
+  <list style="symbols">
+    <t>
+      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/276"/>:
+      "untangle ABNFs for header fields"
+    </t>
+  </list>
 </t>
 </section>