summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2001-10-18 21:45:54 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2001-10-18 21:45:54 +0000
commit26587ef1e74dcd1cfb12851d2b97eb76fb55f58b (patch)
treece789a6365a2dff0258deaff7b2b027744cde9c6
parentac111ee8c6fc454e9a51dfe9357e1c67603756b7 (diff)
downloadtinyproxy-26587ef1e74dcd1cfb12851d2b97eb76fb55f58b.tar.gz
tinyproxy-26587ef1e74dcd1cfb12851d2b97eb76fb55f58b.zip
Fixed a problem where a full buffer on the read side would cause the
connection to be closed.
-rw-r--r--ChangeLog6
-rw-r--r--src/buffer.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d6de12a..1154a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-18 Robert James Kaes <rjkaes@flarenet.com>
+
+ * src/buffer.c (readbuff): Fixed a problem where a full buffer
+ would cause the connection to be closed. Thanks to Jeffrey
+ Wheelhouse for helping me find this problem.
+
2001-09-29 Robert James Kaes <rjkaes@flarenet.com>
* configure.in: Uses any CFLAGS variable passed to the configure
diff --git a/src/buffer.c b/src/buffer.c
index 11c320e..30603a5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,4 +1,4 @@
-/* $Id: buffer.c,v 1.11 2001-09-15 21:24:18 rjkaes Exp $
+/* $Id: buffer.c,v 1.12 2001-10-18 21:45:54 rjkaes Exp $
*
* The buffer used in each connection is a linked list of lines. As the lines
* are read in and written out the buffer expands and contracts. Basically,
@@ -198,7 +198,7 @@ ssize_t readbuff(int fd, struct buffer_s *buffptr)
if (!buffer)
return 0;
- bytesin = read(fd, buffer, MAXBUFFSIZE - buffer_size(buffptr) - 1);
+ bytesin = read(fd, buffer, MAXBUFFSIZE - buffer_size(buffptr));
if (bytesin > 0) {
newbuffer = saferealloc(buffer, bytesin);