[or-cvs] r8782: Oops. Conform to spec. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-10-20 17:04:44 -0400 (Fri, 20 Oct 2006)
New Revision: 8782

Modified:
   tor/trunk/
   tor/trunk/src/or/control.c
Log:
 r9313@Kushana:  nickm | 2006-10-20 17:04:11 -0400
 Oops. Conform to spec.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9313] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-10-20 21:04:39 UTC (rev 8781)
+++ tor/trunk/src/or/control.c	2006-10-20 21:04:44 UTC (rev 8782)
@@ -2404,9 +2404,15 @@
   SMARTLIST_FOREACH(args, const char *, arg, {
       if (!strcasecmp(arg, "VERBOSE_NAMES"))
         verbose_names = 1;
-      else if (!strcasecmp(arg, "EXTENDED_FORMAT"))
+      else if (!strcasecmp(arg, "EXTENDED_EVENTS")) /* <- documented */
         extended_events = 1;
-      else {
+      else if (!strcasecmp(arg, "EXTENDED_FORMAT")) {
+        /* remove this in 0.1.2.4; EXTENDED_FORMAT only ever worked for a little
+         * while during 0.1.2.2-alpha-dev. */
+        log_warn(LD_GENERAL,
+                 "EXTENDED_FORMAT is deprecated; use EXTENDED_EVENTS instead.");
+        extended_events = 1;
+      } else {
         connection_printf_to_buf(conn, "552 Unrecognized feature \"%s\"\r\n",
                                  arg);
         bad = 1;