summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2002-05-08 03:29:23 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2002-05-08 03:29:23 +0000
commitcf2ecb83b84f79f92723b9e4efeca420af68647d (patch)
tree3591dbd685a9470e7a690ff05947b95b28f7cb42
parent14f83aec5549277e2efe1370dd1b1f76b1d8a1ca (diff)
downloadtinyproxy-cf2ecb83b84f79f92723b9e4efeca420af68647d.tar.gz
tinyproxy-cf2ecb83b84f79f92723b9e4efeca420af68647d.zip
Removed the request logging in the tunnel because it breaks the tunnel
concept since it blocks waiting for information from the client before any data from the remote is relayed.
-rw-r--r--ChangeLog5
-rw-r--r--src/reqs.c17
2 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 47c4d39..299655d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-07 Robert James Kaes <rjkaes@flarenet.com>
+
+ * src/reqs.c (connect_to_tunnel): Removed request logging code in
+ the tunnel method since it breaks the "tunnel" concept.
+
2002-05-02 Robert James Kaes <rjkaes@flarenet.com>
* configure.ac: Added code to figure out exactly where to install
diff --git a/src/reqs.c b/src/reqs.c
index 3af2b5c..746bd70 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -1,4 +1,4 @@
-/* $Id: reqs.c,v 1.70 2002-04-28 20:03:18 rjkaes Exp $
+/* $Id: reqs.c,v 1.71 2002-05-08 03:29:23 rjkaes Exp $
*
* This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then
@@ -1107,6 +1107,19 @@ connect_to_upstream(struct conn_s *connptr, struct request_s *request)
static int
connect_to_tunnel(struct conn_s *connptr)
{
+
+#if 0
+ /*
+ * NOTE: This must be fixed
+ *
+ * Needed to remove this for right now since it breaks the semantics
+ * of the "tunnel" concept since the information from the remote host
+ * wasn't being sent until _after_ data was sent by the client. This
+ * is not correct since we should be sending the data regardless of
+ * who sent it first.
+ *
+ * I'll have to look into this for the next release.
+ */
char *request_buf;
ssize_t len;
int pos;
@@ -1122,6 +1135,8 @@ connect_to_tunnel(struct conn_s *connptr)
safefree(request_buf);
}
+#endif
+
log_message(LOG_INFO, "Redirecting to %s:%d",
config.tunnel_name, config.tunnel_port);