aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-01-15 22:11:21 +0000
committerNick Mathewson <nickm@torproject.org>2007-01-15 22:11:21 +0000
commit11ed4500ded3270ea376d75269200bb99574026e (patch)
treee1a48e81adc4048d054415e170c407eedd5afd87
parentdb6f0f36177469dee4a97f2d016496b1ba5d1e72 (diff)
downloadtor-11ed4500ded3270ea376d75269200bb99574026e.tar
tor-11ed4500ded3270ea376d75269200bb99574026e.tar.gz
r11975@Kushana: nickm | 2007-01-15 17:11:15 -0500
set or_conn->tls_error to 0 on non-error to avoid looking at stale errors. svn:r9359
-rw-r--r--doc/TODO5
-rw-r--r--src/or/connection.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/TODO b/doc/TODO
index dc2080517..8f3de8845 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -507,3 +507,8 @@ R - make a page with the hidden service diagrams.
- add a page for localizing all tor's components.
+ - It would be neat if we had a single place that described _all_ the
+ tor-related tools you can use, and what they give you, and how well they
+ work. Right now, we don't give a lot of guidance wrt
+ torbutton/foxproxy/privoxy/polipo in any consistent place.
+
diff --git a/src/or/connection.c b/src/or/connection.c
index 56401768d..8e4326c2c 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1462,6 +1462,8 @@ connection_read_to_buf(connection_t *conn, int *max_to_read)
result = read_to_buf_tls(or_conn->tls, at_most, conn->inbuf);
if (TOR_TLS_IS_ERROR(result) || result == TOR_TLS_CLOSE)
or_conn->tls_error = result;
+ else
+ or_conn->tls_error = 0;
switch (result) {
case TOR_TLS_CLOSE: