Attachment 28566 Details for Bug 65895

[patch] squid.diff

squid.diff (text/plain), 2.02 KB, created by Thomas Biege on 2005-02-17 16:31:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-02-17 16:31:21 UTC

Size: 2.02 KB

patch

obsolete

>The folllowing applies to squid-2.4.STABLE6
>
>diff -rupN squid-2.4.STABLE6.orig/src/comm.c squid-2.4.STABLE6/src/comm.c
>--- squid-2.4.STABLE6.orig/src/comm.c	2001-02-23 12:43:15.000000000 -0700
>+++ squid-2.4.STABLE6/src/comm.c	2005-02-16 11:35:10.000000000 -0700
>@@ -370,8 +370,6 @@ commConnectHandle(int fd, void *data)
> 	cs->S.sin_family =3D AF_INET;
> 	cs->S.sin_addr =3D cs->in_addr;
> 	cs->S.sin_port =3D htons(cs->port);
>-	if (Config.onoff.log_fqdn)
>-	    fqdncache_gethostbyaddr(cs->S.sin_addr, FQDN_LOOKUP_IF_MISS);
>     }
>     switch (comm_connect_addr(fd, &cs->S)) {
>     case COMM_INPROGRESS:
>diff -rupN squid-2.4.STABLE6.orig/src/fqdncache.c squid-2.4.STABLE6/src/fqd=
>ncache.c
>--- squid-2.4.STABLE6.orig/src/fqdncache.c	2001-01-11 17:51:47.000000000 -0=
>700
>+++ squid-2.4.STABLE6/src/fqdncache.c	2005-02-16 11:37:35.000000000 -0700
>@@ -278,6 +278,8 @@ fqdncacheParse(rfc1035_rr * answers, int
> 	    continue;
> 	if (answers[k].class !=3D RFC1035_CLASS_IN)
> 	    continue;
>+	if (!answers[k].rdata[0])
>+	    continue;
> 	na++;
> 	f.flags.negcached =3D 0;
> 	f.names[0] =3D xstrdup(answers[k].rdata);
>diff -rupN squid-2.4.STABLE6.orig/src/ipcache.c squid-2.4.STABLE6/src/ipcac=
>he.c
>--- squid-2.4.STABLE6.orig/src/ipcache.c	2001-01-11 17:51:49.000000000 -0700
>+++ squid-2.4.STABLE6/src/ipcache.c	2005-02-16 11:38:46.000000000 -0700
>@@ -306,6 +306,10 @@ ipcacheParse(rfc1035_rr * answers, int n
> 	    continue;
> 	if (answers[k].class !=3D RFC1035_CLASS_IN)
> 	    continue;
>+	if (answers[k].rdlength !=3D 4) {
>+	    debug(14, 1) ("ipcacheParse: Invalid IP address in response to '%s'\n=
>", name);
>+	    continue;
>+	}
> 	na++;
>     }
>     if (na =3D=3D 0) {
>@@ -322,9 +326,10 @@ ipcacheParse(rfc1035_rr * answers, int n
> 	    continue;
> 	if (answers[k].class !=3D RFC1035_CLASS_IN)
> 	    continue;
>+	if (answers[k].rdlength !=3D 4)
>+	    continue;
> 	if (j =3D=3D 0)
> 	    i.expires =3D squid_curtime + answers[k].ttl;
>-	assert(answers[k].rdlength =3D=3D 4);
> 	xmemcpy(&i.addrs.in_addrs[j++], answers[k].rdata, 4);
> 	debug(14, 3) ("ipcacheParse: #%d %s\n",
> 	    j - 1,
>

Actions: View | Diff

Attachments on bug 65895: 28566 | 28567