X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jbsockets.c;h=6f66e1ced353afd0e1dbd8048ca8659c640b051b;hp=c3f4be677b982a398478ef6fc933bec376900e20;hb=c54228f0ef0172341cfe4f9acb7e955fa1e269b7;hpb=9e8f57a4bb2ccb727d54fa7e05204b1e10443fdf diff --git a/jbsockets.c b/jbsockets.c index c3f4be67..6f66e1ce 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.42 2007/04/01 17:37:07 fabiankeil Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.44 2007/09/15 13:01:31 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -35,6 +35,17 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.42 2007/04/01 17:37:07 fabian * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.44 2007/09/15 13:01:31 fabiankeil + * Increase listen() backlog to SOMAXCONN (or 128) to decrease + * chances of dropped connections under load. Problem reported + * and fix suggested by nobody in BR#1795281. + * + * Revision 1.43 2007/06/01 18:16:36 fabiankeil + * Use the same mutex for gethostbyname() and gethostbyaddr() to prevent + * deadlocks and crashes on OpenBSD and possibly other OS with neither + * gethostbyname_r() nor gethostaddr_r(). Closes BR#1729174. + * Thanks to Ralf Horstmann for report and solution. + * * Revision 1.42 2007/04/01 17:37:07 fabiankeil * - Add DNS retries for Solaris and other systems * whose gethostbyname_r version takes five arguments. @@ -300,6 +311,9 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; */ #define MAX_DNS_RETRIES 10 +#define MAX_LISTEN_BACKLOG 128 + + /********************************************************************* * * Function : connect_to @@ -647,7 +661,7 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd) * duplicate instances of Privoxy from being caught. * * On UNIX, we assume the user is sensible enough not - * to start Junkbuster multiple times on the same IP. + * to start Privoxy multiple times on the same IP. * Without this, stopping and restarting Privoxy * from a script fails. * Note: SO_REUSEADDR is meant to only take over @@ -676,7 +690,7 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd) } } - while (listen(fd, 5) == -1) + while (listen(fd, MAX_LISTEN_BACKLOG) == -1) { if (errno != EINTR) {