diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-03-22 10:55:14 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-03-22 10:55:14 +0000 |
| commit | bc0368d723460d67085ba4716d01a5df94584c9f (patch) | |
| tree | 241fad5d2855293e0be98be105753d8a23267428 /net-proxy/privoxy/files | |
| parent | Fix bug #260744 (compilation problems with GCC 4.3.3+). (diff) | |
| download | gentoo-2-bc0368d723460d67085ba4716d01a5df94584c9f.tar.gz gentoo-2-bc0368d723460d67085ba4716d01a5df94584c9f.tar.bz2 gentoo-2-bc0368d723460d67085ba4716d01a5df94584c9f.zip | |
Import upstream fix for a bug regarding timeout handling (#262820).
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/privoxy/files')
| -rw-r--r-- | net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch new file mode 100644 index 000000000000..0433e1d923ec --- /dev/null +++ b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch @@ -0,0 +1,20 @@ +--- jcc.c 2009/03/08 14:19:23 1.231 ++++ jcc.c 2009/03/08 19:29:16 1.232 +@@ -2600,8 +2605,6 @@ + struct timeval timeout; + + memset(buf, 0, sizeof(buf)); +- memset(&timeout, 0, sizeof(timeout)); +- timeout.tv_sec = csp->config->socket_timeout; + + http = csp->http; + +@@ -2843,6 +2846,8 @@ + } + #endif /* FEATURE_CONNECTION_KEEP_ALIVE */ + ++ timeout.tv_sec = csp->config->socket_timeout; ++ timeout.tv_usec = 0; + n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout); + + if (n == 0) |