diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-08-07 15:31:20 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-08-07 15:31:20 +0000 |
| commit | 7eb4eba3819c3ab6845e448cae0abefad1150bd8 (patch) | |
| tree | 08fc3ba62abd73ae0ae5cf2a115dfa4ef0333ce0 | |
| parent | 630b99334c830cce334fc6edaff10f88437c960a (diff) | |
| download | tinyproxy-7eb4eba3819c3ab6845e448cae0abefad1150bd8.tar.gz tinyproxy-7eb4eba3819c3ab6845e448cae0abefad1150bd8.zip | |
# Merged in changes from the stable 1.6 branch.
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/child.c | 7 |
3 files changed, 17 insertions, 6 deletions
@@ -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); |