[tor-commits] [tor/master] Don't say OOS unless the ConnLimit thresholds have been set

[nickm at torproject.org]

commit 4f253d4c676caba979ddf4bc2668273700f279ae
Author: Andrea Shepard <andrea at torproject.org>
Date:   Thu Jun 30 10:58:17 2016 +0000

    Don't say OOS unless the ConnLimit thresholds have been set
---
 src/or/connection.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 3939531..77ad567 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4523,9 +4523,13 @@ connection_handle_oos(int n_socks, int failed)
 
   /*
    * Check if we're really handling an OOS condition, and if so decide how
-   * many sockets we want to get down to.
+   * many sockets we want to get down to.  Be sure we check if the threshold
+   * is distinct from zero first; it's possible for this to be called a few
+   * times before we've finished reading the config.
    */
-  if (n_socks > get_options()->ConnLimit_high_thresh) {
+  if (n_socks >= get_options()->ConnLimit_high_thresh &&
+      get_options()->ConnLimit_high_thresh != 0 &&
+      get_options()->ConnLimit_ != 0) {
     /* Try to get down to the low threshold */
     target_n_socks = get_options()->ConnLimit_low_thresh;
     log_notice(LD_NET,