[or-cvs] r10931: Patch from tup: correct grammar for asynchonous reply lines (in tor/trunk: . doc/spec)

[nickm at seul.org]

Author: nickm
Date: 2007-07-25 18:56:58 -0400 (Wed, 25 Jul 2007)
New Revision: 10931

Modified:
   tor/trunk/
   tor/trunk/doc/spec/control-spec.txt
Log:
 r13906 at catbus:  nickm | 2007-07-25 18:49:50 -0400
 Patch from tup: correct grammar for asynchonous reply lines in control-spec.txt



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13906] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/control-spec.txt
===================================================================
--- tor/trunk/doc/spec/control-spec.txt	2007-07-25 22:56:54 UTC (rev 10930)
+++ tor/trunk/doc/spec/control-spec.txt	2007-07-25 22:56:58 UTC (rev 10931)
@@ -62,14 +62,16 @@
 
 2.3. Replies from Tor to the controller
 
-    Reply = *(MidReplyLine / DataReplyLine) EndReplyLine
+    Reply = SyncReply / AsyncReply
+    SyncReply = *(MidReplyLine / DataReplyLine) EndReplyLine
+    AsyncReply = *MidReplyLine EndReplyLine / DataReplyLine
 
-    MidReplyLine = "-" ReplyLine
-    DataReplyLine = "+" ReplyLine Data
-    EndReplyLine = SP ReplyLine
-    ReplyLine = StatusCode [ SP ReplyText ]  CRLF
+    MidReplyLine = StatusCode "-" ReplyLine
+    DataReplyLine = StatusCode "+" ReplyLine Data
+    EndReplyLine = StatusCode SP ReplyLine
+    ReplyLine = [ReplyText] CRLF
     ReplyText = XXXX
-    StatusCode = XXXX
+    StatusCode = 3DIGIT
 
   Specific replies are mentioned below in section 3, and described more fully
   in section 4.