---------------------
PatchSet 5775 
Date: 2007/10/02 04:54:51
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Remove _res_ext variation glue from autoconf.

autoconf 2.59 with its regression seems to be to widely used to keep this here for now.

Members: 
	NOTES-IPv6:1.1.2.68->1.1.2.69 
	configure.in:1.63.2.62->1.63.2.63 
	src/dnsserver.cc:1.7.4.23->1.7.4.24 

Index: squid3/NOTES-IPv6
===================================================================
RCS file: /cvsroot/squid-sf//squid3/Attic/NOTES-IPv6,v
retrieving revision 1.1.2.68
retrieving revision 1.1.2.69
diff -u -r1.1.2.68 -r1.1.2.69
--- squid3/NOTES-IPv6	21 Sep 2007 09:08:24 -0000	1.1.2.68
+++ squid3/NOTES-IPv6	2 Oct 2007 04:54:51 -0000	1.1.2.69
@@ -1,4 +1,4 @@
-$Id: NOTES-IPv6,v 1.1.2.68 2007/09/21 09:08:24 amosjeffries Exp $
+$Id: NOTES-IPv6,v 1.1.2.69 2007/10/02 04:54:51 amosjeffries Exp $
 
 NP: Any problems with this version of squid please contact
 	squid3@treenet.co.nz for assistance.
@@ -53,7 +53,7 @@
 	when IPv6 extensions are not available via _res_ext from the system native
 	DNS resolver. This can be resolved by upgrading to autoconf 2.61 or later.
 	Systems where _res_ext is provided should not encounter this problem.
-
+UPDATE Oct 2007: glue for this feature, moved from autoconf to Squid source.
 
 
 PROBLEM: Testers report that "using WebDAV against my Squid-accelerated Apache gives
Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.63.2.62
retrieving revision 1.63.2.63
diff -u -r1.63.2.62 -r1.63.2.63
--- squid3/configure.in	30 Sep 2007 18:16:13 -0000	1.63.2.62
+++ squid3/configure.in	2 Oct 2007 04:54:51 -0000	1.63.2.63
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.63.2.62 2007/09/30 18:16:13 serassio Exp $
+dnl  $Id: configure.in,v 1.63.2.63 2007/10/02 04:54:51 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.63.2.62 $)dnl
+AC_REVISION($Revision: 1.63.2.63 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -3277,7 +3277,7 @@
 ac_cv_have_res_ext_nsaddr_list="yes",
 ac_cv_have_res_ext_nsaddr_list="no"))
 if test "$ac_cv_have_res_ext_nsaddr_list" = "yes" ; then
-  AC_DEFINE([_SQUID_RES_NSADDR6_LIST],[_res_ext.nsaddr_list[[(i)]].sin6_addr],[If _res_ext structure has nsaddr_list member])
+  AC_DEFINE(_SQUID_RES_NSADDR6_LARRAY,_res_ext.nsaddr_list,[If _res_ext structure has nsaddr_list member])
   AC_DEFINE(_SQUID_RES_NSADDR6_COUNT,ns6count,[Nameserver Counter for IPv6 _res_ext])
 fi
 
@@ -3304,8 +3304,8 @@
 ac_cv_have_res_ext_nsaddrs="yes",
 ac_cv_have_res_ext_nsaddrs="no"))
 if test "$ac_cv_have_res_ext_nsaddrs" = "yes" ; then
-  AC_DEFINE([_SQUID_RES_NSADDR6_LIST],[_res._u._ext.nsaddrs[[(i)]]->sin6_addr],[If _res structure has _ext.nsaddrs member])
-  AC_DEFINE(_SQUID_RES_NSADDR6_COUNT,[_res._u._ext.nscount6],[Nameserver Counter for IPv6 _res])
+  AC_DEFINE(_SQUID_RES_NSADDR6_LPTR,_res._u._ext.nsaddrs,[If _res structure has _ext.nsaddrs member])
+  AC_DEFINE(_SQUID_RES_NSADDR6_COUNT,_res._u._ext.nscount6,[Nameserver Counter for IPv6 _res])
 fi
 fi
 
Index: squid3/src/dnsserver.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/dnsserver.cc,v
retrieving revision 1.7.4.23
retrieving revision 1.7.4.24
diff -u -r1.7.4.23 -r1.7.4.24
--- squid3/src/dnsserver.cc	26 Sep 2007 03:59:51 -0000	1.7.4.23
+++ squid3/src/dnsserver.cc	2 Oct 2007 04:54:51 -0000	1.7.4.24
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dnsserver.cc,v 1.7.4.23 2007/09/26 03:59:51 amosjeffries Exp $
+ * $Id: dnsserver.cc,v 1.7.4.24 2007/10/02 04:54:51 amosjeffries Exp $
  *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
@@ -336,6 +336,13 @@
             );
 }
 
+#ifdef _SQUID_RES_NSADDR6_LARRAY
+#define _SQUID_RES_NSADDR6_LIST(i)	_SQUID_RES_NSADDR6_LARRAY[i].sin6_addr
+#endif
+#ifdef _SQUID_RES_NSADDR6_LPTR
+#define _SQUID_RES_NSADDR6_LIST(i)	_SQUID_RES_NSADDR6_LARRAY[i]->sin6_addr
+#endif
+
 int
 main(int argc, char *argv[])
 {