nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

make httpsproxy more likely to work

Browse Source 
(don't let OR conns do tls until they've finished connecting and
doing the proxy dance.)


svn:r3824
This commit is contained in:
Roger Dingledine 2005-03-22 23:57:18 +00:00
parent 21b1adefbb
commit e28b8aaa40
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.c
View File

@ -960,7 +960,7 @@ static int connection_read_to_buf(connection_t *conn, int *max_to_read) {
at_most = connection_bucket_read_limit(conn); at_most = connection_bucket_read_limit(conn);
} }
if (connection_speaks_cells(conn) && conn->state != OR_CONN_STATE_CONNECTING) { if (connection_speaks_cells(conn) && conn->state > OR_CONN_STATE_PROXY_READING) {
int pending; int pending;
if (conn->state == OR_CONN_STATE_HANDSHAKING) { if (conn->state == OR_CONN_STATE_HANDSHAKING) {
/* continue handshaking even if global token bucket is empty */ /* continue handshaking even if global token bucket is empty */
@ -1108,7 +1108,7 @@ int connection_handle_write(connection_t *conn) {
return -1; return -1;
} }
if (connection_speaks_cells(conn)) { if (connection_speaks_cells(conn) && conn->state > OR_CONN_STATE_PROXY_READING) {
if (conn->state == OR_CONN_STATE_HANDSHAKING) { if (conn->state == OR_CONN_STATE_HANDSHAKING) {
connection_stop_writing(conn); connection_stop_writing(conn);
if (connection_tls_continue_handshake(conn) < 0) { if (connection_tls_continue_handshake(conn) < 0) {