Changeset 334 for draft-ietf-httpbis/latest/p1-messaging.xml
- Timestamp:
- 05/11/08 14:50:10 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
draft-ietf-httpbis/latest/p1-messaging.xml
r331 r334 700 700 </t> 701 701 <t> 702 rule1 |rule2702 rule1 / rule2 703 703 <list> 704 704 <t> 705 Elements separated by a bar ("|") are alternatives, e.g., "yes |705 Elements separated by a forward slash ("/") are alternatives, e.g., "yes / 706 706 no" will accept yes or no. 707 707 </t> … … 713 713 <t> 714 714 Elements enclosed in parentheses are treated as a single element. 715 Thus, "(elem (foo |bar) elem)" allows the token sequences "elem715 Thus, "(elem (foo / bar) elem)" allows the token sequences "elem 716 716 foo elem" and "elem bar elem". 717 717 </t> … … 829 829 <x:ref>CHAR</x:ref> = %x01-7F 830 830 ; any US-ASCII character, excluding NUL 831 <x:ref>ALPHA</x:ref> = %x41-5A |%x61-7A832 ; A-Z |a-z831 <x:ref>ALPHA</x:ref> = %x41-5A / %x61-7A 832 ; A-Z / a-z 833 833 <x:ref>DIGIT</x:ref> = %x30-39 834 834 ; any US-ASCII digit "0".."9" 835 <x:ref>CTL</x:ref> = %x00-1F |%x7F835 <x:ref>CTL</x:ref> = %x00-1F / %x7F 836 836 ; (octets 0 - 31) and DEL (127) 837 837 <x:ref>CR</x:ref> = %x0D … … 865 865 </t> 866 866 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="LWS"/> 867 <x:ref>LWS</x:ref> = [<x:ref>CRLF</x:ref>] 1*( <x:ref>SP</x:ref> |<x:ref>HTAB</x:ref> )867 <x:ref>LWS</x:ref> = [<x:ref>CRLF</x:ref>] 1*( <x:ref>SP</x:ref> / <x:ref>HTAB</x:ref> ) 868 868 </artwork></figure> 869 869 <t anchor="rule.TEXT"> … … 876 876 </t> 877 877 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="TEXT"/> 878 <x:ref>TEXT</x:ref> = %x20-7E | %x80-FF |<x:ref>LWS</x:ref>878 <x:ref>TEXT</x:ref> = %x20-7E / %x80-FF / <x:ref>LWS</x:ref> 879 879 ; any <x:ref>OCTET</x:ref> except <x:ref>CTL</x:ref>s, but including <x:ref>LWS</x:ref> 880 880 </artwork></figure> … … 889 889 </t> 890 890 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HEXDIG"/> 891 <x:ref>HEXDIG</x:ref> = "A" | "B" | "C" | "D" | "E" |"F"892 | "a" | "b" | "c" | "d" | "e" | "f" |<x:ref>DIGIT</x:ref>891 <x:ref>HEXDIG</x:ref> = "A" / "B" / "C" / "D" / "E" / "F" 892 / "a" / "b" / "c" / "d" / "e" / "f" / <x:ref>DIGIT</x:ref> 893 893 </artwork></figure> 894 894 <t anchor="rule.token.separators"> … … 902 902 </t> 903 903 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="token"/><iref primary="true" item="Grammar" subitem="tchar"/><iref primary="true" item="Grammar" subitem="separators"/> 904 <x:ref>separators</x:ref> = "(" | ")" | "<" | ">" |"@"905 | "," | ";" | ":" | "\" |<x:ref>DQUOTE</x:ref>906 | "/" | "[" | "]" | "?" |"="907 | "{" | "}" | <x:ref>SP</x:ref> |<x:ref>HTAB</x:ref>904 <x:ref>separators</x:ref> = "(" / ")" / "<" / ">" / "@" 905 / "," / ";" / ":" / "\" / <x:ref>DQUOTE</x:ref> 906 / "/" / "[" / "]" / "?" / "=" 907 / "{" / "}" / <x:ref>SP</x:ref> / <x:ref>HTAB</x:ref> 908 908 909 <x:ref>tchar</x:ref> = "!" | "#" | "$" | "%" | "&" | "'" |"*"910 | "+" | "-" | "." | "^" | "_" | "`" | "|" |"~"911 | <x:ref>DIGIT</x:ref> |<x:ref>ALPHA</x:ref>909 <x:ref>tchar</x:ref> = "!" / "#" / "$" / "%" / "&" / "'" / "*" 910 / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~" 911 / <x:ref>DIGIT</x:ref> / <x:ref>ALPHA</x:ref> 912 912 ; any <x:ref>CHAR</x:ref> except <x:ref>CTL</x:ref>s or <x:ref>separators</x:ref> 913 913 … … 924 924 </t> 925 925 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="comment"/><iref primary="true" item="Grammar" subitem="ctext"/> 926 <x:ref>comment</x:ref> = "(" *( <x:ref>ctext</x:ref> | <x:ref>quoted-pair</x:ref> |<x:ref>comment</x:ref> ) ")"926 <x:ref>comment</x:ref> = "(" *( <x:ref>ctext</x:ref> / <x:ref>quoted-pair</x:ref> / <x:ref>comment</x:ref> ) ")" 927 927 <x:ref>ctext</x:ref> = <any <x:ref>TEXT</x:ref> excluding "(" and ")"> 928 928 </artwork></figure> … … 934 934 </t> 935 935 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="quoted-string"/><iref primary="true" item="Grammar" subitem="qdtext"/> 936 <x:ref>quoted-string</x:ref> = ( <x:ref>DQUOTE</x:ref> *(<x:ref>qdtext</x:ref> |<x:ref>quoted-pair</x:ref> ) <x:ref>DQUOTE</x:ref> )936 <x:ref>quoted-string</x:ref> = ( <x:ref>DQUOTE</x:ref> *(<x:ref>qdtext</x:ref> / <x:ref>quoted-pair</x:ref> ) <x:ref>DQUOTE</x:ref> ) 937 937 <x:ref>qdtext</x:ref> = <any <x:ref>TEXT</x:ref> excluding <x:ref>DQUOTE</x:ref> and "\"> 938 938 </artwork></figure> … … 944 944 </t> 945 945 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="quoted-text"/><iref primary="true" item="Grammar" subitem="quoted-pair"/> 946 <x:ref>quoted-text</x:ref> = %x01-09 |947 %x0B-0C |946 <x:ref>quoted-text</x:ref> = %x01-09 / 947 %x0B-0C / 948 948 %x0E-FF ; Characters excluding NUL, <x:ref>CR</x:ref> and <x:ref>LF</x:ref> 949 949 <x:ref>quoted-pair</x:ref> = "\" <x:ref>quoted-text</x:ref> … … 1228 1228 </t> 1229 1229 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HTTP-date"/><iref primary="true" item="Grammar" subitem="rfc1123-date"/><iref primary="true" item="Grammar" subitem="obsolete-date"/><iref primary="true" item="Grammar" subitem="rfc850-date"/><iref primary="true" item="Grammar" subitem="asctime-date"/><iref primary="true" item="Grammar" subitem="date1"/><iref primary="true" item="Grammar" subitem="date2"/><iref primary="true" item="Grammar" subitem="date3"/><iref primary="true" item="Grammar" subitem="time"/><iref primary="true" item="Grammar" subitem="wkday"/><iref primary="true" item="Grammar" subitem="weekday"/><iref primary="true" item="Grammar" subitem="month"/> 1230 <x:ref>HTTP-date</x:ref> = <x:ref>rfc1123-date</x:ref> |<x:ref>obsolete-date</x:ref>1231 <x:ref>obsolete-date</x:ref> = <x:ref>rfc850-date</x:ref> |<x:ref>asctime-date</x:ref>1230 <x:ref>HTTP-date</x:ref> = <x:ref>rfc1123-date</x:ref> / <x:ref>obsolete-date</x:ref> 1231 <x:ref>obsolete-date</x:ref> = <x:ref>rfc850-date</x:ref> / <x:ref>asctime-date</x:ref> 1232 1232 <x:ref>rfc1123-date</x:ref> = <x:ref>wkday</x:ref> "," <x:ref>SP</x:ref> date1 <x:ref>SP</x:ref> time <x:ref>SP</x:ref> GMT 1233 1233 <x:ref>rfc850-date</x:ref> = <x:ref>weekday</x:ref> "," <x:ref>SP</x:ref> date2 <x:ref>SP</x:ref> time <x:ref>SP</x:ref> GMT … … 1237 1237 <x:ref>date2</x:ref> = 2<x:ref>DIGIT</x:ref> "-" <x:ref>month</x:ref> "-" 2<x:ref>DIGIT</x:ref> 1238 1238 ; day-month-year (e.g., 02-Jun-82) 1239 <x:ref>date3</x:ref> = <x:ref>month</x:ref> <x:ref>SP</x:ref> ( 2<x:ref>DIGIT</x:ref> |( <x:ref>SP</x:ref> 1<x:ref>DIGIT</x:ref> ))1239 <x:ref>date3</x:ref> = <x:ref>month</x:ref> <x:ref>SP</x:ref> ( 2<x:ref>DIGIT</x:ref> / ( <x:ref>SP</x:ref> 1<x:ref>DIGIT</x:ref> )) 1240 1240 ; month day (e.g., Jun 2) 1241 1241 <x:ref>time</x:ref> = 2<x:ref>DIGIT</x:ref> ":" 2<x:ref>DIGIT</x:ref> ":" 2<x:ref>DIGIT</x:ref> 1242 1242 ; 00:00:00 - 23:59:59 1243 <x:ref>wkday</x:ref> = s-Mon | s-Tue |s-Wed1244 | s-Thu | s-Fri | s-Sat |s-Sun1245 <x:ref>weekday</x:ref> = l-Mon | l-Tue |l-Wed1246 | l-Thu | l-Fri | l-Sat |l-Sun1247 <x:ref>month</x:ref> = s-Jan | s-Feb | s-Mar |s-Apr1248 | s-May | s-Jun | s-Jul |s-Aug1249 | s-Sep | s-Oct | s-Nov |s-Dec1243 <x:ref>wkday</x:ref> = s-Mon / s-Tue / s-Wed 1244 / s-Thu / s-Fri / s-Sat / s-Sun 1245 <x:ref>weekday</x:ref> = l-Mon / l-Tue / l-Wed 1246 / l-Thu / l-Fri / l-Sat / l-Sun 1247 <x:ref>month</x:ref> = s-Jan / s-Feb / s-Mar / s-Apr 1248 / s-May / s-Jun / s-Jul / s-Aug 1249 / s-Sep / s-Oct / s-Nov / s-Dec 1250 1250 1251 1251 GMT = <x:abnf-char-sequence>"GMT"</x:abnf-char-sequence> ; "GMT", case-sensitive … … 1301 1301 </t> 1302 1302 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="transfer-coding"/><iref primary="true" item="Grammar" subitem="transfer-extension"/> 1303 <x:ref>transfer-coding</x:ref> = "chunked" |<x:ref>transfer-extension</x:ref>1303 <x:ref>transfer-coding</x:ref> = "chunked" / <x:ref>transfer-extension</x:ref> 1304 1304 <x:ref>transfer-extension</x:ref> = <x:ref>token</x:ref> *( ";" <x:ref>parameter</x:ref> ) 1305 1305 </artwork></figure> … … 1313 1313 <x:ref>parameter</x:ref> = <x:ref>attribute</x:ref> "=" <x:ref>value</x:ref> 1314 1314 <x:ref>attribute</x:ref> = <x:ref>token</x:ref> 1315 <x:ref>value</x:ref> = <x:ref>token</x:ref> |<x:ref>quoted-string</x:ref>1315 <x:ref>value</x:ref> = <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> 1316 1316 </artwork></figure> 1317 1317 <t> … … 1386 1386 <x:ref>chunk-extension</x:ref>= *( ";" <x:ref>chunk-ext-name</x:ref> [ "=" <x:ref>chunk-ext-val</x:ref> ] ) 1387 1387 <x:ref>chunk-ext-name</x:ref> = <x:ref>token</x:ref> 1388 <x:ref>chunk-ext-val</x:ref> = <x:ref>token</x:ref> |<x:ref>quoted-string</x:ref>1388 <x:ref>chunk-ext-val</x:ref> = <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> 1389 1389 <x:ref>chunk-data</x:ref> = 1*<x:ref>OCTET</x:ref> ; a sequence of chunk-size octets 1390 1390 <x:ref>trailer-part</x:ref> = *(<x:ref>entity-header</x:ref> <x:ref>CRLF</x:ref>) … … 1499 1499 </t> 1500 1500 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HTTP-message"/> 1501 <x:ref>HTTP-message</x:ref> = <x:ref>Request</x:ref> |<x:ref>Response</x:ref> ; HTTP/1.1 messages1501 <x:ref>HTTP-message</x:ref> = <x:ref>Request</x:ref> / <x:ref>Response</x:ref> ; HTTP/1.1 messages 1502 1502 </artwork></figure> 1503 1503 <t> … … 1514 1514 <x:ref>CRLF</x:ref> 1515 1515 [ <x:ref>message-body</x:ref> ] 1516 <x:ref>start-line</x:ref> = <x:ref>Request-Line</x:ref> |<x:ref>Status-Line</x:ref>1516 <x:ref>start-line</x:ref> = <x:ref>Request-Line</x:ref> / <x:ref>Status-Line</x:ref> 1517 1517 </artwork></figure> 1518 1518 <t> … … 1552 1552 <x:ref>message-header</x:ref> = <x:ref>field-name</x:ref> ":" [ <x:ref>field-value</x:ref> ] 1553 1553 <x:ref>field-name</x:ref> = <x:ref>token</x:ref> 1554 <x:ref>field-value</x:ref> = *( <x:ref>field-content</x:ref> |<x:ref>LWS</x:ref> )1554 <x:ref>field-value</x:ref> = *( <x:ref>field-content</x:ref> / <x:ref>LWS</x:ref> ) 1555 1555 <x:ref>field-content</x:ref> = <field content> 1556 1556 ; the <x:ref>OCTET</x:ref>s making up the field-value … … 1609 1609 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="message-body"/> 1610 1610 <x:ref>message-body</x:ref> = <x:ref>entity-body</x:ref> 1611 |<entity-body encoded as per <x:ref>Transfer-Encoding</x:ref>>1611 / <entity-body encoded as per <x:ref>Transfer-Encoding</x:ref>> 1612 1612 </artwork></figure> 1613 1613 <t> … … 1742 1742 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="general-header"/> 1743 1743 <x:ref>general-header</x:ref> = <x:ref>Cache-Control</x:ref> ; &header-cache-control; 1744 |<x:ref>Connection</x:ref> ; <xref target="header.connection"/>1745 |<x:ref>Date</x:ref> ; <xref target="header.date"/>1746 |<x:ref>Pragma</x:ref> ; &header-pragma;1747 |<x:ref>Trailer</x:ref> ; <xref target="header.trailer"/>1748 |<x:ref>Transfer-Encoding</x:ref> ; <xref target="header.transfer-encoding"/>1749 |<x:ref>Upgrade</x:ref> ; <xref target="header.upgrade"/>1750 |<x:ref>Via</x:ref> ; <xref target="header.via"/>1751 |<x:ref>Warning</x:ref> ; &header-warning;1744 / <x:ref>Connection</x:ref> ; <xref target="header.connection"/> 1745 / <x:ref>Date</x:ref> ; <xref target="header.date"/> 1746 / <x:ref>Pragma</x:ref> ; &header-pragma; 1747 / <x:ref>Trailer</x:ref> ; <xref target="header.trailer"/> 1748 / <x:ref>Transfer-Encoding</x:ref> ; <xref target="header.transfer-encoding"/> 1749 / <x:ref>Upgrade</x:ref> ; <xref target="header.upgrade"/> 1750 / <x:ref>Via</x:ref> ; <xref target="header.via"/> 1751 / <x:ref>Warning</x:ref> ; &header-warning; 1752 1752 </artwork></figure> 1753 1753 <t> … … 1773 1773 <x:ref>Request</x:ref> = <x:ref>Request-Line</x:ref> ; <xref target="request-line"/> 1774 1774 *(( <x:ref>general-header</x:ref> ; <xref target="general.header.fields"/> 1775 |<x:ref>request-header</x:ref> ; &request-header-fields;1776 |<x:ref>entity-header</x:ref> ) <x:ref>CRLF</x:ref>) ; &entity-header-fields;1775 / <x:ref>request-header</x:ref> ; &request-header-fields; 1776 / <x:ref>entity-header</x:ref> ) <x:ref>CRLF</x:ref>) ; &entity-header-fields; 1777 1777 <x:ref>CRLF</x:ref> 1778 1778 [ <x:ref>message-body</x:ref> ] ; <xref target="message.body"/> … … 1810 1810 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Request-URI"/> 1811 1811 <x:ref>Request-URI</x:ref> = "*" 1812 |<x:ref>absoluteURI</x:ref>1813 |( <x:ref>path-absolute</x:ref> [ "?" <x:ref>query</x:ref> ] )1814 |<x:ref>authority</x:ref>1812 / <x:ref>absoluteURI</x:ref> 1813 / ( <x:ref>path-absolute</x:ref> [ "?" <x:ref>query</x:ref> ] ) 1814 / <x:ref>authority</x:ref> 1815 1815 </artwork></figure> 1816 1816 <t> … … 1939 1939 <x:ref>Response</x:ref> = <x:ref>Status-Line</x:ref> ; <xref target="status-line"/> 1940 1940 *(( <x:ref>general-header</x:ref> ; <xref target="general.header.fields"/> 1941 |<x:ref>response-header</x:ref> ; &response-header-fields;1942 |<x:ref>entity-header</x:ref> ) <x:ref>CRLF</x:ref>) ; &entity-header-fields;1941 / <x:ref>response-header</x:ref> ; &response-header-fields; 1942 / <x:ref>entity-header</x:ref> ) <x:ref>CRLF</x:ref>) ; &entity-header-fields; 1943 1943 <x:ref>CRLF</x:ref> 1944 1944 [ <x:ref>message-body</x:ref> ] ; <xref target="message.body"/> … … 2652 2652 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="TE"/><iref primary="true" item="Grammar" subitem="t-codings"/> 2653 2653 <x:ref>TE</x:ref> = "TE" ":" #( <x:ref>t-codings</x:ref> ) 2654 <x:ref>t-codings</x:ref> = "trailers" |( <x:ref>transfer-extension</x:ref> [ <x:ref>accept-params</x:ref> ] )2654 <x:ref>t-codings</x:ref> = "trailers" / ( <x:ref>transfer-extension</x:ref> [ <x:ref>accept-params</x:ref> ] ) 2655 2655 </artwork></figure> 2656 2656 <t> … … 2866 2866 <x:ref>protocol-name</x:ref> = <x:ref>token</x:ref> 2867 2867 <x:ref>protocol-version</x:ref> = <x:ref>token</x:ref> 2868 <x:ref>received-by</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) |<x:ref>pseudonym</x:ref>2868 <x:ref>received-by</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) / <x:ref>pseudonym</x:ref> 2869 2869 <x:ref>pseudonym</x:ref> = <x:ref>token</x:ref> 2870 2870 </artwork></figure> … … 4708 4708 </list> 4709 4709 </t> 4710 <t> 4711 Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>): 4712 <list style="symbols"> 4713 <t> 4714 Use "/" instead of "|" for alternatives. 4715 </t> 4716 </list> 4717 </t> 4710 4718 </section> 4711 4719
Note: See TracChangeset
for help on using the changeset viewer.