Changeset 2447

Timestamp:

30/10/13 12:05:22 (8 years ago)

Author:

julian.reschke@…

Message:

Revert [2443] (see #504)

Location:

draft-ietf-httpbis/latest

Files:

• httpbis.abnf (modified) (3 diffs)
• p2-semantics.html (modified) (6 diffs)
• p2-semantics.xml (modified) (5 diffs)

draft-ietf-httpbis/latest/httpbis.abnf

@@ -24 +24 @@
 Expect = "100-continue"
 Expires = HTTP-date
-From = addr-spec
+From = mailbox
 GMT = %x47.4D.54 ; GMT
 
@@ -67 +67 @@
 accept-params = weight *accept-ext
 acceptable-ranges = ( *( "," OWS ) range-unit *( OWS "," [ OWS range-unit ] ) ) / "none"
-addr-spec = <addr-spec, defined in [RFC5322], Section 3.4.1>
 asctime-date = day-name SP date3 SP time-of-day SP year
 asterisk-form = "*"
@@ -140 +139 @@
 last-byte-pos = 1*DIGIT
 last-chunk = 1*"0" [ chunk-ext ] CRLF
+mailbox = <mailbox, defined in [RFC5322], Section 3.4>
 media-range = ( "*/*" / ( type "/*" ) / ( type "/" subtype ) ) *( OWS ";" OWS parameter )
 media-type = type "/" subtype *( OWS ";" OWS parameter )

draft-ietf-httpbis/latest/p2-semantics.html

@@ -2199 +2199 @@
                <h3 id="rfc.section.5.5.1"><a href="#rfc.section.5.5.1">5.5.1</a>&nbsp;<a href="#header.from">From</a></h3>
                <p id="rfc.section.5.5.1.p.1">The "From" header field contains an Internet email address for a human user who controls the requesting user agent. The address
-                  ought to be machine-usable, as defined by "addr-spec" in <a href="http://tools.ietf.org/html/rfc5322#section-3.4.1">Section 3.4.1</a> of <a href="#RFC5322" id="rfc.xref.RFC5322.1"><cite title="Internet Message Format">[RFC5322]</cite></a>:
-               </p>
-               <div id="rfc.figure.u.35"></div><pre class="inline"><span id="rfc.iref.g.30"></span>  <a href="#header.from" class="smpl">From</a>      = <a href="#header.from" class="smpl">addr-spec</a>
+                  ought to be machine-usable, as defined by "mailbox" in <a href="http://tools.ietf.org/html/rfc5322#section-3.4">Section 3.4</a> of <a href="#RFC5322" id="rfc.xref.RFC5322.1"><cite title="Internet Message Format">[RFC5322]</cite></a>:
+               </p>
+               <div id="rfc.figure.u.35"></div><pre class="inline"><span id="rfc.iref.g.30"></span>  <a href="#header.from" class="smpl">From</a>    = <a href="#header.from" class="smpl">mailbox</a>
   
-  <a href="#header.from" class="smpl">addr-spec</a> = &lt;addr-spec, defined in <a href="#RFC5322" id="rfc.xref.RFC5322.2"><cite title="Internet Message Format">[RFC5322]</cite></a>, <a href="http://tools.ietf.org/html/rfc5322#section-3.4.1">Section 3.4.1</a>&gt;
+  <a href="#header.from" class="smpl">mailbox</a> = &lt;mailbox, defined in <a href="#RFC5322" id="rfc.xref.RFC5322.2"><cite title="Internet Message Format">[RFC5322]</cite></a>, <a href="http://tools.ietf.org/html/rfc5322#section-3.4">Section 3.4</a>&gt;
 </pre><p id="rfc.section.5.5.1.p.3">An example is:</p>
                <div id="rfc.figure.u.36"></div><pre class="text">  From: webmaster@example.org
@@ -4647 +4647 @@
 <a href="#header.expect" class="smpl">Expect</a> = "100-continue"
 
-<a href="#header.from" class="smpl">From</a> = addr-spec
+<a href="#header.from" class="smpl">From</a> = mailbox
 
 <a href="#preferred.date.format" class="smpl">GMT</a> = %x47.4D.54 ; GMT
@@ -4676 +4676 @@
 <a href="#header.accept" class="smpl">accept-ext</a> = OWS ";" OWS token [ "=" word ]
 <a href="#header.accept" class="smpl">accept-params</a> = weight *accept-ext
-<a href="#header.from" class="smpl">addr-spec</a> = &lt;addr-spec, defined in [RFC5322], Section 3.4.1&gt;
 <a href="#obsolete.date.formats" class="smpl">asctime-date</a> = day-name SP date3 SP time-of-day SP year
 <a href="#rule.parameter" class="smpl">attribute</a> = token
@@ -4712 +4711 @@
 <a href="#language.tags" class="smpl">language-tag</a> = &lt;Language-Tag, defined in [RFC5646], Section 2.1&gt;
 
+<a href="#header.from" class="smpl">mailbox</a> = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;
 <a href="#header.accept" class="smpl">media-range</a> = ( "*/*" / ( type "/*" ) / ( type "/" subtype ) ) *( OWS
  ";" OWS parameter )
@@ -4771 +4771 @@
                </li>
                <li>&lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/501">http://tools.ietf.org/wg/httpbis/trac/ticket/501</a>&gt;: "idempotency: clarify 'effect'"
-               </li>
-               <li>&lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/504">http://tools.ietf.org/wg/httpbis/trac/ticket/504</a>&gt;: "does From: allow non addr-spec mailbox values?"
                </li>
             </ul>
@@ -5121 +5119 @@
                   <li><em>RFC5322</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC5322.1">5.5.1</a>, <a href="#rfc.xref.RFC5322.2">5.5.1</a>, <a href="#rfc.xref.RFC5322.3">7.1.1.1</a>, <a href="#rfc.xref.RFC5322.4">7.1.1.1</a>, <a href="#rfc.xref.RFC5322.5">7.1.1.1</a>, <a href="#rfc.xref.RFC5322.6">7.1.1.2</a>, <a href="#RFC5322"><b>11.2</b></a>, <a href="#rfc.xref.RFC5322.7">A</a><ul>
                         <li><em>Section 3.3</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC5322.4">7.1.1.1</a>, <a href="#rfc.xref.RFC5322.5">7.1.1.1</a></li>
-                        <li><em>Section 3.4.1</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC5322.1">5.5.1</a>, <a href="#rfc.xref.RFC5322.2">5.5.1</a></li>
+                        <li><em>Section 3.4</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC5322.1">5.5.1</a>, <a href="#rfc.xref.RFC5322.2">5.5.1</a></li>
                         <li><em>Section 3.6.1</em>&nbsp;&nbsp;<a href="#rfc.xref.RFC5322.6">7.1.1.2</a></li>
                      </ul>

draft-ietf-httpbis/latest/p2-semantics.xml

@@ -2432 +2432 @@
   <iref primary="true" item="From header field" x:for-anchor=""/>
   <x:anchor-alias value="From"/>
-  <x:anchor-alias value="addr-spec"/>
+  <x:anchor-alias value="mailbox"/>
 <t>
    The "From" header field contains an Internet email address for a human
    user who controls the requesting user agent. The address ought to be
-   machine-usable, as defined by "addr-spec"
-   in <xref x:sec="3.4.1" x:fmt="of" target="RFC5322"/>:
+   machine-usable, as defined by "mailbox"
+   in <xref x:sec="3.4" x:fmt="of" target="RFC5322"/>:
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="From"/>
-  <x:ref>From</x:ref>      = <x:ref>addr-spec</x:ref>
+  <x:ref>From</x:ref>    = <x:ref>mailbox</x:ref>
   
-  <x:ref>addr-spec</x:ref> = &lt;addr-spec, defined in <xref x:sec="3.4.1" x:fmt="," target="RFC5322"/>&gt;
+  <x:ref>mailbox</x:ref> = &lt;mailbox, defined in <xref x:sec="3.4" x:fmt="," target="RFC5322"/>&gt;
 </artwork></figure>
 <t>
@@ -6199 +6199 @@
 <x:ref>Expect</x:ref> = "100-continue"
 
-<x:ref>From</x:ref> = addr-spec
+<x:ref>From</x:ref> = mailbox
 
 <x:ref>GMT</x:ref> = %x47.4D.54 ; GMT
@@ -6228 +6228 @@
 <x:ref>accept-ext</x:ref> = OWS ";" OWS token [ "=" word ]
 <x:ref>accept-params</x:ref> = weight *accept-ext
-<x:ref>addr-spec</x:ref> = &lt;addr-spec, defined in [RFC5322], Section 3.4.1&gt;
 <x:ref>asctime-date</x:ref> = day-name SP date3 SP time-of-day SP year
 <x:ref>attribute</x:ref> = token
@@ -6264 +6263 @@
 <x:ref>language-tag</x:ref> = &lt;Language-Tag, defined in [RFC5646], Section 2.1&gt;
 
+<x:ref>mailbox</x:ref> = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;
 <x:ref>media-range</x:ref> = ( "*/*" / ( type "/*" ) / ( type "/" subtype ) ) *( OWS
  ";" OWS parameter )
@@ -6333 +6333 @@
       "idempotency: clarify 'effect'"
     </t>
-    <t>
-      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/504"/>:
-      "does From: allow non addr-spec mailbox values?"
-    </t>
   </list>
 </t>