Merge commit 'origin/maint-0.2.1'

Conflicts:
	src/or/reasons.c
This commit is contained in:
Nick Mathewson 2010-08-18 13:48:39 -04:00
commit 8c528bc320

View File

@ -169,7 +169,13 @@ errno_to_stream_end_reason(int e)
S_CASE(ENETUNREACH): S_CASE(ENETUNREACH):
return END_STREAM_REASON_INTERNAL; return END_STREAM_REASON_INTERNAL;
E_CASE(EHOSTUNREACH): E_CASE(EHOSTUNREACH):
return END_STREAM_REASON_NOROUTE; /* XXXX022
* The correct behavior is END_STREAM_REASON_NOROUTE, but older
* clients don't recognize it. So we're going to continue sending
* "MISC" until 0.2.1.27 or later is "well established".
*/
/* return END_STREAM_REASON_NOROUTE; */
return END_STREAM_REASON_MISC;
S_CASE(ECONNREFUSED): S_CASE(ECONNREFUSED):
return END_STREAM_REASON_CONNECTREFUSED; return END_STREAM_REASON_CONNECTREFUSED;
S_CASE(ECONNRESET): S_CASE(ECONNRESET):