]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Revert "Don't schedule excess_renegotiations_callback unless it's set"
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2011 00:49:20 +0000 (19:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2011 00:49:20 +0000 (19:49 -0500)
This reverts commit 617617e21a2d30a86cea9c8f7043333078f2e8f8.

src/common/tortls.c

index 9ac5c34f26d4a0321f75cd168df11866156ab94d..9a77bab09c9ea5d170d8bdabfd90efe071bd15f3 100644 (file)
@@ -1333,8 +1333,7 @@ tor_tls_got_client_hello(tor_tls_t *tls)
     }
 
     tls->got_renegotiate = 1;
-  } else if (tls->server_handshake_count > 2 &&
-             tls->excess_renegotiations_callback) {
+  } else if (tls->server_handshake_count > 2) {
     /* We got more than one renegotiation requests. The Tor protocol
        needs just one renegotiation; more than that probably means
        They are trying to DoS us and we have to stop them. We can't