bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# Merged in changes from the stable 1.6 branch.

Browse Source
This commit is contained in:
Robert James Kaes 2003-08-07 15:31:20 +00:00
parent 630b99334c
commit 7eb4eba381
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2003-07-14 Robert James Kaes <rjkaes@flarenet.com>
Released tinyproxy 1.6.0 (2003-07-14) Released tinyproxy 1.6.0 (2003-07-14)

4
configure.ac
View File

@ -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 Devlopers, please strive to achieve this order:
dnl dnl
@ -14,7 +14,7 @@ dnl 8. System services
dnl dnl
dnl Read the Autoconf manual for details. 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_CONFIG_SRCDIR([src/tinyproxy.c])
AC_PREREQ(2.52) AC_PREREQ(2.52)

7
src/child.c
View File

@ -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 * Handles the creation/destruction of the various children required for
* processing incoming connections. * processing incoming connections.
@ -208,13 +208,12 @@ child_main(struct child_s* ptr)
SERVER_DEC(); SERVER_DEC();
handle_connection(connfd); handle_connection(connfd);
ptr->connects++;
if (child_config.maxrequestsperchild != 0) { if (child_config.maxrequestsperchild != 0) {
ptr->connects++;
DEBUG2("%u connections so far...", 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, log_message(LOG_NOTICE,
"Child has reached MaxRequestsPerChild (%u). Killing child.", "Child has reached MaxRequestsPerChild (%u). Killing child.",
ptr->connects); ptr->connects);