summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2013-09-11 01:07:48 +0800
committerJunio C Hamano <gitster@pobox.com>2013-09-11 14:07:14 -0700
commitb3145afff1bd0b767cfa1596268a326169cdafe1 (patch)
tree08b3f9bcbf73995f8aed202f0396a9cf682bf067
parent1c42a3a0cb4065f80ea6bbc656e8ba435e46411d (diff)
downloadgit-b3145afff1bd0b767cfa1596268a326169cdafe1.tar.gz
normalize rules with RFC 5234
Drop LF, SP which are defined in RFC 5234. Replace HT with HTAB (also defined in the RFC). Use '/' instead of '|', as the RFC does. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/technical/http-protocol.txt26
1 files changed, 9 insertions, 17 deletions
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 55753bbb48..ff91bb0a07 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -192,16 +192,13 @@ according to the C locale ordering. The file SHOULD NOT include
the default ref named 'HEAD'.
info_refs = *( ref_record )
- ref_record = any_ref | peeled_ref
+ ref_record = any_ref / peeled_ref
- any_ref = id HT name LF
- peeled_ref = id HT name LF
- id HT name "^{}" LF
+ any_ref = id HTAB name LF
+ peeled_ref = id HTAB name LF
+ id HTAB name "^{}" LF
id = 40*HEX
- HEX = "0".."9" | "a".."f"
- LF = <US-ASCII LF, linefeed (10)>
- HT = <US-ASCII HT, horizontal-tab (9)>
Smart Clients
~~~~~~~~~~~~~
@@ -288,7 +285,7 @@ declarations behind a NUL on the first ref.
smart_reply = PKT-LINE("# service=$servicename" LF)
ref_list
"0000"
- ref_list = empty_list | non_empty_list
+ ref_list = empty_list / non_empty_list
empty_list = PKT-LINE(id SP "capabilities^{}" NUL cap_list LF)
@@ -296,18 +293,13 @@ declarations behind a NUL on the first ref.
*ref_record
cap_list = *(SP capability) SP
- ref_record = any_ref | peeled_ref
+ ref_record = any_ref / peeled_ref
any_ref = PKT-LINE(id SP name LF)
peeled_ref = PKT-LINE(id SP name LF)
PKT-LINE(id SP name "^{}" LF
id = 40*HEX
- HEX = "0".."9" | "a".."f"
- NL = <US-ASCII NUL, null (0)>
- LF = <US-ASCII LF, linefeed (10)>
- SP = <US-ASCII SP, horizontal-tab (9)>
-
Smart Service git-upload-pack
------------------------------
@@ -343,7 +335,7 @@ appear in the response obtained through ref discovery.
compute_request = want_list
have_list
request_end
- request_end = "0000" | "done"
+ request_end = "0000" / "done"
want_list = PKT-LINE(want NUL cap_list LF)
*(want_pkt)
@@ -353,7 +345,7 @@ appear in the response obtained through ref discovery.
have_list = *PKT-LINE("have" SP id LF)
- command = create | delete | update
+ command = create / delete / update
create = 40*"0" SP new_id SP name
delete = old_id SP 40*"0" SP name
update = old_id SP new_id SP name
@@ -530,7 +522,7 @@ the id obtained through ref discovery as old_id.
command_pkt = PKT-LINE(command LF)
cap_list = *(SP capability) SP
- command = create | delete | update
+ command = create / delete / update
create = 40*"0" SP new_id SP name
delete = old_id SP 40*"0" SP name
update = old_id SP new_id SP name