Merge remote-tracking branch 'public/bug4710'

This commit is contained in:
Nick Mathewson 2012-06-05 10:16:28 -04:00
commit c19a2ff691
2 changed files with 7 additions and 0 deletions

5
changes/bug4710 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Exit nodes now correcly report EADDRINUSE and EADDRNOTAVAIL as
resource exhaustion, so that clients can adjust their load to
try other exits. Fix for bug 4710; bugfix on 0.1.0.1-rc, which
started using END_STREAM_REASON_RESOURCELIMIT.

View File

@ -184,6 +184,8 @@ errno_to_stream_end_reason(int e)
S_CASE(ENOBUFS): S_CASE(ENOBUFS):
case ENOMEM: case ENOMEM:
case ENFILE: case ENFILE:
S_CASE(EADDRINUSE):
S_CASE(EADDRNOTAVAIL):
E_CASE(EMFILE): E_CASE(EMFILE):
return END_STREAM_REASON_RESOURCELIMIT; return END_STREAM_REASON_RESOURCELIMIT;
default: default: