current gateway.c, 1.100, 1.101 gateway.h, 1.24, 1.25 loadcfg.c, 1.160, 1.161
Fabian Keil <[email protected]> Sun, 04 Jun 2017 14:42:15 +0000
| Newsgroups | gmane.comp.web.privoxy.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22966
Modified Files:
gateway.c gateway.h loadcfg.c
Log Message:
Remove code that has been pointless since 2009
This should have been done with gateway.c r1.52 which
rendered the global keep_alive_timeout obsolete.
Index: gateway.h
===================================================================
RCS file: /cvsroot/ijbswa/current/gateway.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** gateway.h 24 Dec 2016 16:00:49 -0000 1.24
--- gateway.h 4 Jun 2017 14:42:13 -0000 1.25
***************
*** 53,57 ****
#ifdef FEATURE_CONNECTION_SHARING
- extern void set_keep_alive_timeout(unsigned int timeout);
extern void initialize_reusable_connections(void);
extern void forget_connection(jb_socket sfd);
--- 53,56 ----
Index: gateway.c
===================================================================
RCS file: /cvsroot/ijbswa/current/gateway.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** gateway.c 24 Dec 2016 16:00:49 -0000 1.100
--- gateway.c 4 Jun 2017 14:42:13 -0000 1.101
***************
*** 135,139 ****
#define MAX_REUSABLE_CONNECTIONS 100
- static unsigned int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
static struct reusable_connection reusable_connection[MAX_REUSABLE_CONNECTIONS];
--- 135,138 ----
***************
*** 561,583 ****
}
-
-
- /*********************************************************************
- *
- * Function : set_keep_alive_timeout
- *
- * Description : Sets the timeout after which open
- * connections will no longer be reused.
- *
- * Parameters :
- * 1 : timeout = The timeout in seconds.
- *
- * Returns : void
- *
- *********************************************************************/
- void set_keep_alive_timeout(unsigned int timeout)
- {
- keep_alive_timeout = timeout;
- }
#endif /* def FEATURE_CONNECTION_SHARING */
--- 560,563 ----
Index: loadcfg.c
===================================================================
RCS file: /cvsroot/ijbswa/current/loadcfg.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** loadcfg.c 29 May 2017 10:02:11 -0000 1.160
--- loadcfg.c 4 Jun 2017 14:42:13 -0000 1.161
***************
*** 1837,1845 ****
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{
! if (config->multi_threaded)
! {
! set_keep_alive_timeout(config->keep_alive_timeout);
! }
! else
{
/*
--- 1837,1841 ----
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{
! if (!config->multi_threaded)
{
/*
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot