summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac4
-rw-r--r--src/child.c7
3 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 900d00e..6572205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-08-06 Robert James Kaes <rjkaes@flarenet.com>
+
+ Released tinyproxy 1.6.1 (2003-08-06)
+
+ * heap.c (debugging_realloc):
+ Remove the assert on the ptr being NULL since a NULL pointer is
+ allowed by the realloc() spec.
+
+ * child.c (child_main):
+ Fixed an off-by-one error with the maxrequestsperchild
+ variable. [Fix proposed by Yannick Koehler]
+
2003-07-14 Robert James Kaes <rjkaes@flarenet.com>
Released tinyproxy 1.6.0 (2003-07-14)
diff --git a/configure.ac b/configure.ac
index f47c11f..c42b722 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 2.61 2003-07-24 15:13:00 rjkaes Exp $
+dnl $Id: configure.ac,v 2.62 2003-08-07 15:31:19 rjkaes Exp $
dnl Devlopers, please strive to achieve this order:
dnl
@@ -14,7 +14,7 @@ dnl 8. System services
dnl
dnl Read the Autoconf manual for details.
-AC_INIT([tinyproxy], [1.6.0a], [rjkaes@users.sourceforge.net])
+AC_INIT([tinyproxy], [1.7.0], [rjkaes@users.sourceforge.net])
AC_CONFIG_SRCDIR([src/tinyproxy.c])
AC_PREREQ(2.52)
diff --git a/src/child.c b/src/child.c
index 2aba1a3..f7ddf23 100644
--- a/src/child.c
+++ b/src/child.c
@@ -1,4 +1,4 @@
-/* $Id: child.c,v 1.12 2003-07-31 23:44:52 rjkaes Exp $
+/* $Id: child.c,v 1.13 2003-08-07 15:31:20 rjkaes Exp $
*
* Handles the creation/destruction of the various children required for
* processing incoming connections.
@@ -208,13 +208,12 @@ child_main(struct child_s* ptr)
SERVER_DEC();
handle_connection(connfd);
+ ptr->connects++;
if (child_config.maxrequestsperchild != 0) {
- ptr->connects++;
-
DEBUG2("%u connections so far...", ptr->connects);
- if (ptr->connects == child_config.maxrequestsperchild - 1) {
+ if (ptr->connects == child_config.maxrequestsperchild) {
log_message(LOG_NOTICE,
"Child has reached MaxRequestsPerChild (%u). Killing child.",
ptr->connects);