[or-cvs] r10406: Just in case we have one of the bugs that turned up in the a (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-30 00:53:27 -0400 (Wed, 30 May 2007)
New Revision: 10406

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/src/or/directory.c
Log:
 r13082 at catbus:  nickm | 2007-05-30 00:53:20 -0400
 Just in case we have one of the bugs that turned up in the alpha series, backport the patch to tolerate a null reason_phrase in our status line.



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

Modified: tor/branches/tor-0_1_2-patches/src/or/directory.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-05-30 04:53:24 UTC (rev 10405)
+++ tor/branches/tor-0_1_2-patches/src/or/directory.c	2007-05-30 04:53:27 UTC (rev 10406)
@@ -1361,7 +1361,7 @@
 {
   char buf[256];
   if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
-      status, reason_phrase) < 0) {
+                   status, reason_phrase ? reason_phrase : "OK") < 0) {
     log_warn(LD_BUG,"Bug: status line too long.");
     return;
   }