make httpsproxy more likely to work

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

svn:r3824

diff --git a/src/or/connection.c b/src/or/connection.c
index 402ae61b55ae197976845d57f72a78473340c2ea..1f09bc43a9d016e54ae21b571af61f0d1078736d 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -960,7 +960,7 @@ static int connection_read_to_buf(connection_t *conn, int *max_to_read) {
     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;
     if (conn->state == OR_CONN_STATE_HANDSHAKING) {
       /* continue handshaking even if global token bucket is empty */
@@ -1108,7 +1108,7 @@ int connection_handle_write(connection_t *conn) {
       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) {
       connection_stop_writing(conn);
       if (connection_tls_continue_handshake(conn) < 0) {