[or-cvs] r13958: Backport to 0.2.0.x branch: Fix bug spotted by mwenge: a ser (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-11 00:30:22 -0400 (Tue, 11 Mar 2008)
New Revision: 13958

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/control.c
Log:
 r18725 at catbus:  nickm | 2008-03-11 00:29:57 -0400
 Backport to 0.2.0.x branch: Fix bug spotted by mwenge: a server_event should not be a sever_event.  Not backporting to 0.1.2.x.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r18725] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-11 04:30:14 UTC (rev 13957)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-11 04:30:22 UTC (rev 13958)
@@ -23,6 +23,8 @@
     - We were sometimes miscounting the number of bytes read from the
       network, causing our rate limiting to not be followed exactly.
       Bugfix on 0.2.0.16-alpha. Reported by lodger.
+    - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER"
+      events.  Caught by mwenge; bugfix on 0.1.2.x.
 
   o Minor bugfixes:
     - Fix compilation with OpenSSL 0.9.8 and 0.9.8a.  All other supported

Modified: tor/branches/tor-0_2_0-patches/src/or/control.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/control.c	2008-03-11 04:30:14 UTC (rev 13957)
+++ tor/branches/tor-0_2_0-patches/src/or/control.c	2008-03-11 04:30:22 UTC (rev 13958)
@@ -3581,7 +3581,7 @@
       status = "STATUS_CLIENT";
       break;
     case EVENT_STATUS_SERVER:
-      status = "STATUS_SEVER";
+      status = "STATUS_SERVER";
       break;
     default:
       log_warn(LD_BUG, "Unrecognized status type %d", type);