stop most cases of hanging up on a socks connection without sending

the socks reject. audit for remaining ones. also make things more
uniform so we always remember to hold-open-until-flushed, etc.


svn:r3891

1 files changed, 4 insertions, 1 deletions

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index a9cbdd6b7..b44c03e6f 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -741,7 +741,10 @@ hibernate_go_dormant(time_t now) {
       connection_edge_end(conn, END_STREAM_REASON_HIBERNATING,
                           conn->cpath_layer);
     log_fn(LOG_INFO,"Closing conn type %d", conn->type);
-    connection_mark_for_close(conn);
+    if (conn->type == CONN_TYPE_AP) /* send socks failure if needed */
+      connection_close_unattached_ap(conn, END_STREAM_REASON_HIBERNATING);
+    else
+      connection_mark_for_close(conn);
   }
 
   accounting_record_bandwidth_usage(now);