--- ./src/HttpHeaderTools.c	Tue May 20 19:51:15 2003
+++ ../squid-2.5.STABLE3/./src/HttpHeaderTools.c	Sun Jun 22 15:16:03 2003
@@ -246,9 +246,10 @@
     size_t len;
     char delim[2][3] =
     {
-	{'"', del, 0},
+      {'"', 0 /* del */, 0},
 	{'"', '\\', 0}};
     int quoted = 0;
+    delim[0][1] = del;
     assert(str && item && pos);
     if (*pos) {
 	if (!**pos)		/* end of string */
--- ./helpers/basic_auth/SASL/Makefile.in	Tue Feb 11 21:02:25 2003
+++ ../squid-2.5.STABLE3/./helpers/basic_auth/SASL/Makefile.in	Sun Jun 22 20:49:24 2003
@@ -123,7 +123,7 @@
 INCLUDES = -I$(top_srcdir)/include
 
 libexec_PROGRAMS = sasl_auth
-LDADD = -L$(top_builddir)/lib -lmiscutil -lsasl $(XTRA_LIBS)
+LDADD = -L$(top_builddir)/lib -lmiscutil -lsasl2 $(XTRA_LIBS)
 EXTRA_DIST = squid_sasl_auth squid_sasl_auth.conf
 subdir = helpers/basic_auth/SASL
 mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs
--- ./helpers/basic_auth/SASL/sasl_auth.c	Mon Aug 12 12:58:31 2002
+++ ../squid-2.5.STABLE3/./helpers/basic_auth/SASL/sasl_auth.c	Sun Jun 22 22:54:20 2003
@@ -33,7 +33,11 @@
 
 #include "util.h"
 
+#if SASL_VERSION_MAJOR > 1
+#define APP_NAME_SASL	"squid_sasl2_auth"
+#else
 #define APP_NAME_SASL	"squid_sasl_auth"
+#endif
 
 int
 main()
@@ -56,7 +60,11 @@
 		return 1;
 	}
 
-	rc = sasl_server_new( APP_NAME_SASL, NULL, NULL, NULL, 0, &conn );
+	rc = sasl_server_new( APP_NAME_SASL, NULL, NULL, 
+#if SASL_VERSION_MAJOR > 1
+			      NULL, NULL,
+#endif
+			      NULL, 0, &conn );
 
 	if ( rc != SASL_OK ) {
 		fprintf( stderr, "error %d %s\n", rc, sasl_errstring(rc, NULL, NULL ));
@@ -84,7 +92,12 @@
 		rfc1738_unescape(username);
 		rfc1738_unescape(password);
 
+#if SASL_VERSION_MAJOR > 1
+		rc = sasl_checkpass(conn, username, strlen(username), password, strlen(password));
+		errstr = sasl_errdetail(conn);
+#else
 		rc = sasl_checkpass(conn, username, strlen(username), password, strlen(password), &errstr);
+#endif
 
 		if ( rc != SASL_OK ) {
 			if ( errstr ) {
--- ./configure	Sun May 25 09:04:25 2003
+++ ../squid-2.5.STABLE3/./configure	Sun Jun 22 15:01:12 2003
@@ -1712,13 +1712,13 @@
         esac
     else
 	case "$host" in
-	*mips-sgi-irix6.*)
-	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-	    CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \
-		-woff 1009,1014,1110,1116,1185,1188,1204,1230,1233 \
-		-Wl,-woff,85,-woff,84,-woff,134 \
-		-nostdinc -I/usr/include -D_BSD_SIGNALS"
-	    ;;
+#	*mips-sgi-irix6.*)
+#	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
+#	    CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \
+#		-woff 1009,1014,1110,1116,1185,1188,1204,1230,1233 \
+#		-Wl,-woff,85,-woff,84,-woff,134 \
+#		-nostdinc -I/usr/include -D_BSD_SIGNALS"
+#	    ;;
 	alpha-dec-osf4.*)
 	    # Mogul says DEC compilers take both -g and -O2
 	    CFLAGS=`echo $CFLAGS | sed -e 's/-g/-g3/'`
@@ -1737,13 +1737,13 @@
     	    # nothing
 	    ;;
         esac
-    else
-	case "$host" in
-	*mips-sgi-irix6.*)
-	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-	    LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32"
-	    ;;
-	esac
+#    else
+#	case "$host" in
+#	*mips-sgi-irix6.*)
+#	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
+#	    LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32"
+#	    ;;
+#	esac
     fi
 fi
 
@@ -2180,7 +2180,7 @@
 #define SQUID_SNMP 1
 EOF
 
-    SNMPLIB='-L../snmplib -lsnmp'
+    SNMPLIB='../snmplib/libsnmp.a'
     
 
 if true; then