Resume using the correct "REASON=" stream when telling the

controller why we closed a stream. Bugfix in 0.2.1.1-alpha.


svn:r17547
This commit is contained in:
Roger Dingledine 2008-12-10 01:34:24 +00:00
parent 8054fdc51a
commit 145e589b6c
2 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,4 @@
Changes in version 0.2.1.9-alpha - 200?-??-?? Changes in version 0.2.1.9-alpha - 200?-??-??
o Minor features: o Minor features:
- Give a better error message when an overzealous init script says, - Give a better error message when an overzealous init script says,
"sudo -u username tor --user username". Makes Bug 882 easier "sudo -u username tor --user username". Makes Bug 882 easier
@ -11,6 +10,10 @@ Changes in version 0.2.1.9-alpha - 200?-??-??
- Finally remove deprecated "EXTENEDED_FORMAT" feature. It has - Finally remove deprecated "EXTENEDED_FORMAT" feature. It has
been called EXTENDED_EVENTS since 0.1.2.4-alpha. been called EXTENDED_EVENTS since 0.1.2.4-alpha.
o Minor bugfixes:
- Resume using the correct "REASON=" stream when telling the
controller why we closed a stream. Bugfix in 0.2.1.1-alpha.
Changes in version 0.2.1.8-alpha - 2008-12-08 Changes in version 0.2.1.8-alpha - 2008-12-08
o Major features: o Major features:

View File

@ -3092,7 +3092,7 @@ control_event_stream_status(edge_connection_t *conn, stream_status_event_t tp,
if (reason_code && (tp == STREAM_EVENT_FAILED || if (reason_code && (tp == STREAM_EVENT_FAILED ||
tp == STREAM_EVENT_CLOSED || tp == STREAM_EVENT_CLOSED ||
tp == STREAM_EVENT_FAILED_RETRIABLE)) { tp == STREAM_EVENT_FAILED_RETRIABLE)) {
const char *reason_str = stream_end_reason_to_string(reason_code); const char *reason_str = stream_end_reason_to_control_string(reason_code);
char *r = NULL; char *r = NULL;
if (!reason_str) { if (!reason_str) {
r = tor_malloc(16); r = tor_malloc(16);