Ignore:
Timestamp:
03/06/13 07:49:30 (7 years ago)
Author:
fielding@…
Message:

add optional fragment to the URI definitions, as required by RFC3986; addresses #451

File:
1 edited

Legend:

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

    r2278 r2279  
    789789  <x:anchor-alias value="relative-part"/>
    790790  <x:anchor-alias value="authority"/>
     791  <x:anchor-alias value="uri-host"/>
     792  <x:anchor-alias value="port"/>
    791793  <x:anchor-alias value="path-abempty"/>
    792   <x:anchor-alias value="port"/>
     794  <x:anchor-alias value="segment"/>
    793795  <x:anchor-alias value="query"/>
    794   <x:anchor-alias value="segment"/>
    795   <x:anchor-alias value="uri-host"/>
     796  <x:anchor-alias value="fragment"/>
    796797  <x:anchor-alias value="absolute-path"/>
    797798  <x:anchor-alias value="partial-URI"/>
    798799<t>
    799800   This specification adopts the definitions of "URI-reference",
    800    "absolute-URI", "relative-part", "port", "host",
    801    "path-abempty", "query", "segment", and "authority" from the
     801   "absolute-URI", "relative-part", "authority", "port", "host",
     802   "path-abempty", "segment", "query", and "fragment" from the
    802803   URI generic syntax.
    803804   In addition, we define an "absolute-path" rule (that differs from
     
    806807   that allow a relative URI but not a fragment.
    807808</t>
    808 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="URI-reference"><!--exported production--></iref><iref primary="true" item="Grammar" subitem="absolute-URI"/><iref primary="true" item="Grammar" subitem="authority"/><iref primary="true" item="Grammar" subitem="absolute-path"/><iref primary="true" item="Grammar" subitem="port"/><iref primary="true" item="Grammar" subitem="query"/><iref primary="true" item="Grammar" subitem="segment"/><iref primary="true" item="Grammar" subitem="uri-host"/><iref primary="true" item="Grammar" subitem="partial-URI"><!--exported production--></iref>
     809<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="URI-reference"><!--exported production--></iref><iref primary="true" item="Grammar" subitem="absolute-URI"/><iref primary="true" item="Grammar" subitem="authority"/><iref primary="true" item="Grammar" subitem="absolute-path"/><iref primary="true" item="Grammar" subitem="port"/><iref primary="true" item="Grammar" subitem="query"/><iref primary="true" item="Grammar" subitem="fragment"/><iref primary="true" item="Grammar" subitem="segment"/><iref primary="true" item="Grammar" subitem="uri-host"/><iref primary="true" item="Grammar" subitem="partial-URI"><!--exported production--></iref>
    809810  <x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in <xref target="RFC3986" x:fmt="," x:sec="4.1"/>&gt;
    810811  <x:ref>absolute-URI</x:ref>  = &lt;absolute-URI, defined in <xref target="RFC3986" x:fmt="," x:sec="4.3"/>&gt;
    811812  <x:ref>relative-part</x:ref> = &lt;relative-part, defined in <xref target="RFC3986" x:fmt="," x:sec="4.2"/>&gt;
    812813  <x:ref>authority</x:ref>     = &lt;authority, defined in <xref target="RFC3986" x:fmt="," x:sec="3.2"/>&gt;
     814  <x:ref>uri-host</x:ref>      = &lt;host, defined in <xref target="RFC3986" x:fmt="," x:sec="3.2.2"/>&gt;
     815  <x:ref>port</x:ref>          = &lt;port, defined in <xref target="RFC3986" x:fmt="," x:sec="3.2.3"/>&gt;
    813816  <x:ref>path-abempty</x:ref>  = &lt;path-abempty, defined in <xref target="RFC3986" x:fmt="," x:sec="3.3"/>&gt;
    814   <x:ref>port</x:ref>          = &lt;port, defined in <xref target="RFC3986" x:fmt="," x:sec="3.2.3"/>&gt;
     817  <x:ref>segment</x:ref>       = &lt;segment, defined in <xref target="RFC3986" x:fmt="," x:sec="3.3"/>&gt;
    815818  <x:ref>query</x:ref>         = &lt;query, defined in <xref target="RFC3986" x:fmt="," x:sec="3.4"/>&gt;
    816   <x:ref>segment</x:ref>       = &lt;segment, defined in <xref target="RFC3986" x:fmt="," x:sec="3.3"/>&gt;
    817   <x:ref>uri-host</x:ref>      = &lt;host, defined in <xref target="RFC3986" x:fmt="," x:sec="3.2.2"/>&gt;
     819  <x:ref>fragment</x:ref>      = &lt;fragment, defined in <xref target="RFC3986" x:fmt="," x:sec="3.5"/>&gt;
    818820 
    819821  <x:ref>absolute-path</x:ref> = 1*( "/" segment )
     
    842844<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="http-URI"><!--terminal production--></iref>
    843845  <x:ref>http-URI</x:ref> = "http:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
     846             [ "#" <x:ref>fragment</x:ref> ]
    844847</artwork></figure>
    845848<t>
     
    932935<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="https-URI"><!--terminal production--></iref>
    933936  <x:ref>https-URI</x:ref> = "https:" "//" <x:ref>authority</x:ref> <x:ref>path-abempty</x:ref> [ "?" <x:ref>query</x:ref> ]
     937              [ "#" <x:ref>fragment</x:ref> ]
    934938</artwork></figure>
    935939<t>
     
    22002204   would resolve to its absolute form in order to obtain the
    22012205   "<x:dfn>target URI</x:dfn>".  The target URI
    2202    excludes the reference's fragment identifier component, if any,
     2206   excludes the reference's fragment component, if any,
    22032207   since fragment identifiers are reserved for client-side processing
    22042208   (<xref target="RFC3986" x:fmt="," x:sec="3.5"/>).
     
    51525156<x:ref>field-name</x:ref> = token
    51535157<x:ref>field-value</x:ref> = *( field-content / obs-fold )
     5158fragment = &lt;fragment, defined in [RFC3986], Section 3.5&gt;
    51545159
    51555160<x:ref>header-field</x:ref> = field-name ":" OWS field-value OWS
    5156 <x:ref>http-URI</x:ref> = "http://" authority path-abempty [ "?" query ]
    5157 <x:ref>https-URI</x:ref> = "https://" authority path-abempty [ "?" query ]
     5161<x:ref>http-URI</x:ref> = "http://" authority path-abempty [ "?" query ] [ "#"
     5162 fragment ]
     5163<x:ref>https-URI</x:ref> = "https://" authority path-abempty [ "?" query ] [ "#"
     5164 fragment ]
    51585165
    51595166<x:ref>last-chunk</x:ref> = 1*"0" [ chunk-ext ] CRLF
Note: See TracChangeset for help on using the changeset viewer.