Attachment #77870 for bug #112054

View | Details | Raw Unified | Return to bug 112054
Collapse All | Expand All

Lines 76-81 Link Here

(-)Makefile (+5 lines)
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.6.12	78	PORTVERSION= 2.6.12
		79	PORTREVISION= 1
79	CATEGORIES= www	80	CATEGORIES= www
80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	81	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
81	ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \	82	ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
Lines 279-285 Link Here
279	--with-openssl="${OPENSSLBASE}"	280	--with-openssl="${OPENSSLBASE}"
280	CFLAGS+= -I${OPENSSLINC}	281	CFLAGS+= -I${OPENSSLINC}
281	LDFLAGS+= -L${OPENSSLLIB}	282	LDFLAGS+= -L${OPENSSLLIB}
		283	.if defined(WITH_SQUID_ICAP)
		284	IGNORE= is currently broken with both ICAP and SSL support enabled because of conflicting patches. This will be resolved for Squid 2.6.13
282	.endif	285	.endif
		286	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-changeset_11375
		287	.endif
283	.if defined(WITH_SQUID_PINGER)	288	.if defined(WITH_SQUID_PINGER)
284	CONFIGURE_ARGS+= --enable-icmp	289	CONFIGURE_ARGS+= --enable-icmp
285	libexec+= pinger	290	libexec+= pinger




---------------------
PatchSet 11375 
Date: 2007/04/17 09:35:17
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Bug #1814: SSL memory leak on persistent SSL connections

Memory leak when attemting to reuse SSL-negotiated outgoing connections.

Mainly affects reverse proxy setups using SSL-enabled peers.

Merged changes:
2007/04/16 23:05:50 hno +8 -6 Bug #1814: SSL memory leak on persistent SSL connections

Members: 
	src/forward.c:1.120.2.2->1.120.2.3 

Note: this patchset was slightly modified for the FreeBSD port
      to make it apply cleanly (one hunk removed, path information stripped)

Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid/squid/src/forward.c,v
retrieving revision 1.120.2.2
retrieving revision 1.120.2.3
diff -u -r1.120.2.2 -r1.120.2.3
--- src/forward.c	26 Mar 2007 23:14:09 -0000	1.120.2.2
+++ src/forward.c	17 Apr 2007 09:35:17 -0000	1.120.2.3
@@ -319,6 +319,7 @@
     fd_table[fd].ssl = ssl;
     fd_table[fd].read_method = &ssl_read_method;
     fd_table[fd].write_method = &ssl_write_method;
+    fd_note(fd, "Negotiating SSL");
     fwdNegotiateSSL(fd, fwdState);
 }
 #endif
@@ -357,10 +358,6 @@
 	comm_close(server_fd);
     } else {
 	debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry));
-	fd_note(server_fd, storeUrl(fwdState->entry));
-	fd_table[server_fd].uses++;
-	if (fd_table[server_fd].uses == 1 && fs->peer)
-	    peerConnectSucceded(fs->peer);
 #if USE_SSL
 	if ((fs->peer && fs->peer->use_ssl) ||
 	    (!fs->peer && request->protocol == PROTO_HTTPS)) {
@@ -535,7 +532,7 @@
 		hierarchyNote(&fwdState->request->hier, fs->code, fd_table[fd].ipaddr);
 	    else
 		hierarchyNote(&fwdState->request->hier, fs->code, name);
-	    fwdConnectDone(fd, COMM_OK, fwdState);
+	    fwdDispatch(fwdState);
 	    return;
 	} else {
 	    /* Discard the persistent connection to not cause
@@ -653,6 +650,7 @@
     StoreEntry *entry = fwdState->entry;
     ErrorState *err;
     int server_fd = fwdState->server_fd;
+    FwdServer *fs = fwdState->servers;
     debug(17, 3) ("fwdDispatch: FD %d: Fetching '%s %s'\n",
 	fwdState->client_fd,
 	RequestMethodStr[request->method],
@@ -667,6 +665,10 @@
     assert(entry->ping_status != PING_WAITING);
     assert(entry->lock_count);
     EBIT_SET(entry->flags, ENTRY_DISPATCHED);
+    fd_note(server_fd, storeUrl(fwdState->entry));
+    fd_table[server_fd].uses++;
+    if (fd_table[server_fd].uses == 1 && fs->peer)
+	peerConnectSucceded(fs->peer);
     netdbPingSite(request->host);
     entry->mem_obj->refresh_timestamp = squid_curtime;
     if (fwdState->servers && (p = fwdState->servers->peer)) {

Return to bug 112054

Line 0 Link Here

(-)files/extra-patch-changeset_11375 (+77 lines)
		1	---------------------
		2	PatchSet 11375
		3	Date: 2007/04/17 09:35:17
		4	Author: hno
		5	Branch: SQUID_2_6
		6	Tag: (none)
		7	Log:
		8	MFC: Bug #1814: SSL memory leak on persistent SSL connections
		9
		10	Memory leak when attemting to reuse SSL-negotiated outgoing connections.
		11
		12	Mainly affects reverse proxy setups using SSL-enabled peers.
		13
		14	Merged changes:
		15	2007/04/16 23:05:50 hno +8 -6 Bug #1814: SSL memory leak on persistent SSL connections
		16
		17	Members:
		18	src/forward.c:1.120.2.2->1.120.2.3
		19
		20	Note: this patchset was slightly modified for the FreeBSD port
		21	to make it apply cleanly (one hunk removed, path information stripped)
		22
		23	Index: squid/src/forward.c
		24	===================================================================
		25	RCS file: /cvsroot/squid/squid/src/forward.c,v
		26	retrieving revision 1.120.2.2
		27	retrieving revision 1.120.2.3
		28	diff -u -r1.120.2.2 -r1.120.2.3
		29	--- src/forward.c 26 Mar 2007 23:14:09 -0000 1.120.2.2
		30	+++ src/forward.c 17 Apr 2007 09:35:17 -0000 1.120.2.3
		31	@@ -319,6 +319,7 @@
		32	fd_table[fd].ssl = ssl;
		33	fd_table[fd].read_method = &ssl_read_method;
		34	fd_table[fd].write_method = &ssl_write_method;
		35	+ fd_note(fd, "Negotiating SSL");
		36	fwdNegotiateSSL(fd, fwdState);
		37	}
		38	#endif
		39	@@ -357,10 +358,6 @@
		40	comm_close(server_fd);
		41	} else {
		42	debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry));
		43	- fd_note(server_fd, storeUrl(fwdState->entry));
		44	- fd_table[server_fd].uses++;
		45	- if (fd_table[server_fd].uses == 1 && fs->peer)
		46	- peerConnectSucceded(fs->peer);
		47	#if USE_SSL
		48	if ((fs->peer && fs->peer->use_ssl) \|\|
		49	(!fs->peer && request->protocol == PROTO_HTTPS)) {
		50	@@ -535,7 +532,7 @@
		51	hierarchyNote(&fwdState->request->hier, fs->code, fd_table[fd].ipaddr);
		52	else
		53	hierarchyNote(&fwdState->request->hier, fs->code, name);
		54	- fwdConnectDone(fd, COMM_OK, fwdState);
		55	+ fwdDispatch(fwdState);
		56	return;
		57	} else {
		58	/* Discard the persistent connection to not cause
		59	@@ -653,6 +650,7 @@
		60	StoreEntry *entry = fwdState->entry;
		61	ErrorState *err;
		62	int server_fd = fwdState->server_fd;
		63	+ FwdServer *fs = fwdState->servers;
		64	debug(17, 3) ("fwdDispatch: FD %d: Fetching '%s %s'\n",
65	fwdState->client_fd,
66	RequestMethodStr[request->method],
67	@@ -667,6 +665,10 @@
68	assert(entry->ping_status != PING_WAITING);
69	assert(entry->lock_count);
70	EBIT_SET(entry->flags, ENTRY_DISPATCHED);
71	+ fd_note(server_fd, storeUrl(fwdState->entry));
72	+ fd_table[server_fd].uses++;
73	+ if (fd_table[server_fd].uses == 1 && fs->peer)
74	+ peerConnectSucceded(fs->peer);
75	netdbPingSite(request->host);
76	entry->mem_obj->refresh_timestamp = squid_curtime;
77	if (fwdState->servers && (p = fwdState->servers->peer)) {