forward-port some fixes

svn:r3631
This commit is contained in:
Roger Dingledine 2005-02-17 01:12:50 +00:00
parent d418cd5f70
commit cbb4803ec8
3 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
Changes in version 0.0.9.4 - 2005-02-03 Changes in version 0.0.9.4 - 2005-02-03
o Bugfixes on 0.0.9: o Bugfixes on 0.0.9:
- Fix an assert bug that took down most of our servers: when - Fix an assert bug that took down most of our servers: when
a server claims to have 500 GB of bandwidthburst, don't a server claims to have 1 GB of bandwidthburst, don't
freak out. freak out.
- Don't crash as badly if we have spawned the max allowed number - Don't crash as badly if we have spawned the max allowed number
of dnsworkers, or we're out of file descriptors. of dnsworkers, or we're out of file descriptors.

View File

@ -222,7 +222,7 @@ void connection_about_to_close_connection(connection_t *conn)
if (conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT) { if (conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT) {
if (!conn->has_sent_end) { if (!conn->has_sent_end) {
log_fn(LOG_WARN,"Bug: Edge connection hasn't sent end yet?"); log_fn(LOG_WARN,"Harmless bug: Edge connection hasn't sent end yet?");
#ifdef TOR_FRAGILE #ifdef TOR_FRAGILE
tor_assert(0); tor_assert(0);
#endif #endif

View File

@ -133,7 +133,7 @@ connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer)
circuit_t *circ; circuit_t *circ;
if (conn->has_sent_end) { if (conn->has_sent_end) {
log_fn(LOG_WARN,"Bug: Calling connection_edge_end on an already ended stream?"); log_fn(LOG_WARN,"Harmless bug: Calling connection_edge_end (reason %d) on an already ended stream?", reason);
#ifdef TOR_FRAGILE #ifdef TOR_FRAGILE
tor_assert(0); tor_assert(0);
#endif #endif