From c02fb8997b14f39f14adce7b3082b7e2060495c5 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 22 Aug 2007 07:57:10 +0000 Subject: [PATCH] backport candidate: Make it possible to read the PROTOCOLINFO response in a way that conforms to our control-spec. Reported by Matt Edman. svn:r11251 --- ChangeLog | 2 ++ doc/spec/control-spec.txt | 2 +- src/or/control.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c9a55602b..4e381c7bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ Changes in version 0.2.0.6-alpha - 2007-??-?? - Stop putting the authentication cookie in a file called "0" in your working directory if you don't specify anything for the new CookieAuthFile option. Reported by Matt Edman. + - Make it possible to read the PROTOCOLINFO response in a way that + conforms to our control-spec. Reported by Matt Edman. - Fix a minor memory leak when we fail to find enough suitable servers to choose a circuit. Bugfix on 0.1.2.x. - Stop leaking part of the descriptor when we run into a particularly diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index d19965456e..ed9e9c3cd1 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -741,7 +741,7 @@ $Id$ "PROTOCOLINFO" *(SP PIVERSION) CRLF The server reply format is: - "250+PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF + "250-PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF InfoLine = AuthLine / VersionLine / OtherLine diff --git a/src/or/control.c b/src/or/control.c index f4aef02d40..3e6c14b0b7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2321,7 +2321,7 @@ handle_control_protocolinfo(control_connection_t *conn, uint32_t len, } connection_printf_to_buf(conn, - "250+PROTOCOLINFO 1\r\n" + "250-PROTOCOLINFO 1\r\n" "250-AUTH METHODS=%s%s%s\r\n" "250-VERSION Tor=%s\r\n" "250 OK\r\n",