Changeset 1831 for draft-ietf-httpbis/latest/httpbis.abnf

Timestamp:

19/08/12 09:46:53 (10 years ago)

Author:

fielding@…

Message:

clean up TE, move qvalues to p2, and make its usage consistent for accept(-*)

File:

• draft-ietf-httpbis/latest/httpbis.abnf (modified) (5 diffs)

draft-ietf-httpbis/latest/httpbis.abnf

@@ -4 +4 @@
 
 Accept = [ ( "," / ( media-range [ accept-params ] ) ) *( OWS "," [ OWS ( media-range [ accept-params ] ) ] ) ]
-Accept-Charset = *( "," OWS ) ( ( charset / "*" ) [ OWS ";" OWS "q=" qvalue ] ) *( OWS "," [ OWS ( ( charset / "*" ) [ OWS ";" OWS "q=" qvalue ] ) ] )
-Accept-Encoding = [ ( "," / ( codings [ OWS ";" OWS "q=" qvalue ] ) ) *( OWS "," [ OWS ( codings [ OWS ";" OWS "q=" qvalue ] ) ] ) ]
-Accept-Language = *( "," OWS ) ( language-range [ OWS ";" OWS "q=" qvalue ] ) *( OWS "," [ OWS ( language-range [ OWS ";" OWS "q=" qvalue ] ) ] )
+Accept-Charset = *( "," OWS ) ( ( charset / "*" ) [ weight ] ) *( OWS "," [ OWS ( ( charset / "*" ) [ weight ] ) ] )
+Accept-Encoding = [ ( "," / ( codings [ weight ] ) ) *( OWS "," [ OWS ( codings [ weight ] ) ] ) ]
+Accept-Language = *( "," OWS ) ( language-range [ weight ] ) *( OWS "," [ OWS ( language-range [ weight ] ) ] )
 Accept-Ranges = acceptable-ranges
 Age = delta-seconds
@@ -64 +64 @@
 absolute-form = absolute-URI
 accept-ext = OWS ";" OWS token [ "=" word ]
-accept-params = OWS ";" OWS "q=" qvalue *accept-ext
+accept-params = weight *accept-ext
 acceptable-ranges = ( *( "," OWS ) range-unit *( OWS "," [ OWS range-unit ] ) ) / "none"
 asctime-date = day-name SP date3 SP time-of-day SP year
@@ -194 +194 @@
 qvalue = ( "0" [ "." *3DIGIT ] ) / ( "1" [ "." *3"0" ] )
 range-unit = bytes-unit / other-range-unit
+rank = ( "0" [ "." *3DIGIT ] ) / ( "1" [ "." *3"0" ] )
 reason-phrase = *( HTAB / SP / VCHAR / obs-text )
 received-by = ( uri-host [ ":" port ] ) / pseudonym
@@ -210 +211 @@
 suffix-byte-range-spec = "-" suffix-length
 suffix-length = 1*DIGIT
-t-codings = "trailers" / ( transfer-extension [ te-params ] )
+t-codings = "trailers" / ( transfer-coding [ t-ranking ] )
+t-ranking = OWS ";" OWS "q=" rank
 tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
-te-ext = OWS ";" OWS token [ "=" word ]
-te-params = OWS ";" OWS "q=" qvalue *te-ext
 time-of-day = hour ":" minute ":" second
 token = 1*tchar
@@ -231 +231 @@
 weak = %x57.2F ; W/
 
+weight = OWS ";" OWS "q=" qvalue
 word = token / quoted-string
 year = 4DIGIT