Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/privoxy/files: privoxy-3.0.11-timeout.patch
Date: Sun, 22 Mar 2009 10:55:17
Message-Id: E1LlLKk-0002DT-EG@stork.gentoo.org
1 mrness 09/03/22 10:55:14
2
3 Added: privoxy-3.0.11-timeout.patch
4 Log:
5 Import upstream fix for a bug regarding timeout handling (#262820).
6 (Portage version: 2.1.6.7/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch?rev=1.1&content-type=text/plain
13
14 Index: privoxy-3.0.11-timeout.patch
15 ===================================================================
16 --- jcc.c 2009/03/08 14:19:23 1.231
17 +++ jcc.c 2009/03/08 19:29:16 1.232
18 @@ -2600,8 +2605,6 @@
19 struct timeval timeout;
20
21 memset(buf, 0, sizeof(buf));
22 - memset(&timeout, 0, sizeof(timeout));
23 - timeout.tv_sec = csp->config->socket_timeout;
24
25 http = csp->http;
26
27 @@ -2843,6 +2846,8 @@
28 }
29 #endif /* FEATURE_CONNECTION_KEEP_ALIVE */
30
31 + timeout.tv_sec = csp->config->socket_timeout;
32 + timeout.tv_usec = 0;
33 n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout);
34
35 if (n == 0)