SOURCES: squid-2.5.STABLE11.accel_single_host_pconn.patch (NEW), s...

hawk hawk at pld-linux.org
Mon Oct 17 08:35:10 CEST 2005


Author: hawk                         Date: Mon Oct 17 06:35:10 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
f6ad18183bb3df2da1c5e6287b7162ea  squid-2.5.STABLE11.accel_single_host_pconn.patch
a43d8d7bed00dc0caebec7b440625a11  squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
263c1a76d470ad4553e05e686e422de2  squid-2.5.STABLE11-CNAME.patch
73bd15ae4853d9b0f45ac4277b35ed15  squid-2.5.STABLE11-delaypools_truncated.patch
a22867a5be67b3ff2dd35ab338b05d9e  squid-2.5.STABLE11-ldap_auth.patch
18846f871032c4d7c496373c24b9f4d9  squid-2.5.STABLE11-tcp_outgoing_xxx.patch

---- Files affected:
SOURCES:
   squid-2.5.STABLE11.accel_single_host_pconn.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE11-CACHE_HTTP_PORT.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE11-CNAME.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE11-delaypools_truncated.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE11-ldap_auth.patch (NONE -> 1.1)  (NEW), squid-2.5.STABLE11-tcp_outgoing_xxx.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/squid-2.5.STABLE11.accel_single_host_pconn.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11.accel_single_host_pconn.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11.accel_single_host_pconn.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,24 @@
+Index: squid/src/http.c
+diff -c squid/src/http.c:1.384.2.32 squid/src/http.c:1.384.2.33
+*** squid/src/http.c:1.384.2.32	Sat Sep 10 19:49:54 2005
+--- squid/src/http.c	Wed Sep 28 14:48:19 2005
+***************
+*** 738,744 ****
+  #endif
+  		    comm_remove_close_handler(fd, httpStateFree, httpState);
+  		    fwdUnregister(fd, httpState->fwd);
+! 		    pconnPush(fd, request->host, request->port);
+  		    fwdComplete(httpState->fwd);
+  		    httpState->fd = -1;
+  		    httpStateFree(fd, httpState);
+--- 738,747 ----
+  #endif
+  		    comm_remove_close_handler(fd, httpStateFree, httpState);
+  		    fwdUnregister(fd, httpState->fwd);
+! 		    if (request->flags.accelerated && Config.Accel.single_host && Config.Accel.host)
+! 			pconnPush(fd, Config.Accel.host, Config.Accel.port);
+! 		    else
+! 			pconnPush(fd, request->host, request->port);
+  		    fwdComplete(httpState->fwd);
+  		    httpState->fd = -1;
+  		    httpStateFree(fd, httpState);

================================================================
Index: SOURCES/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,132 @@
+Index: squid/configure.in
+diff -c squid/configure.in:1.251.2.101 squid/configure.in:1.251.2.102
+*** squid/configure.in:1.251.2.101	Thu Sep 22 02:15:05 2005
+--- squid/configure.in	Wed Sep 28 14:50:25 2005
+***************
+*** 68,74 ****
+--- 68,76 ----
+  
+  dnl Substitutions
+  AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT)
++ AC_SUBST(CACHE_HTTP_PORT)
+  AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT)
++ AC_SUBST(CACHE_ICP_PORT)
+  
+  AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host")
+  
+Index: squid/src/Makefile.am
+diff -c squid/src/Makefile.am:1.16.2.11 squid/src/Makefile.am:1.16.2.12
+*** squid/src/Makefile.am:1.16.2.11	Fri Apr 22 19:32:27 2005
+--- squid/src/Makefile.am	Wed Sep 28 14:50:25 2005
+***************
+*** 272,277 ****
+--- 272,279 ----
+  	cachemgr.conf \
+  	mime.conf.default
+  
++ DEFAULT_HTTP_PORT	= @CACHE_HTTP_PORT@
++ DEFAULT_ICP_PORT	= @CACHE_ICP_PORT@
+  DEFAULT_PREFIX		= $(prefix)
+  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
+  DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
+***************
+*** 325,330 ****
+--- 327,334 ----
+  ## depend on the Makefile. 
+  cf.data: cf.data.pre Makefile
+  	sed "\
++ 	s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
++ 	s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
+  	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
+  	s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
+  	s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
+Index: squid/src/cf.data.pre
+diff -c squid/src/cf.data.pre:1.245.2.100 squid/src/cf.data.pre:1.245.2.101
+*** squid/src/cf.data.pre:1.245.2.100	Wed Sep 28 06:29:45 2005
+--- squid/src/cf.data.pre	Wed Sep 28 14:50:25 2005
+***************
+*** 56,62 ****
+  NAME: http_port ascii_port
+  TYPE: sockaddr_in_list
+  DEFAULT: none
+! DEFAULT_IF_NONE: 3128
+  LOC: Config.Sockaddr.http
+  DOC_START
+  	Usage:	port
+--- 56,62 ----
+  NAME: http_port ascii_port
+  TYPE: sockaddr_in_list
+  DEFAULT: none
+! DEFAULT_IF_NONE: @DEFAULT_HTTP_PORT@
+  LOC: Config.Sockaddr.http
+  DOC_START
+  	Usage:	port
+***************
+*** 145,151 ****
+  
+  NAME: icp_port udp_port
+  TYPE: ushort
+! DEFAULT: 3130
+  LOC: Config.Port.icp
+  DOC_START
+  	The port number where Squid sends and receives ICP queries to
+--- 145,151 ----
+  
+  NAME: icp_port udp_port
+  TYPE: ushort
+! DEFAULT: @DEFAULT_ICP_PORT@
+  LOC: Config.Port.icp
+  DOC_START
+  	The port number where Squid sends and receives ICP queries to
+Index: squid/configure
+diff -c squid/configure:1.248.2.103 squid/configure:1.248.2.104
+*** squid/configure:1.248.2.103	Thu Sep 22 02:15:26 2005
+--- squid/configure	Wed Sep 28 14:57:13 2005
+***************
+*** 9055,9060 ****
+--- 9057,9064 ----
+  s%@CGIEXT@%$CGIEXT%g
+  s%@ENABLE_WIN32SPECIFIC_TRUE@%$ENABLE_WIN32SPECIFIC_TRUE%g
+  s%@ENABLE_WIN32SPECIFIC_FALSE@%$ENABLE_WIN32SPECIFIC_FALSE%g
++ s%@CACHE_HTTP_PORT@%$CACHE_HTTP_PORT%g
++ s%@CACHE_ICP_PORT@%$CACHE_ICP_PORT%g
+  s%@LIBDLMALLOC@%$LIBDLMALLOC%g
+  s%@LIB_MALLOC@%$LIB_MALLOC%g
+  s%@STORE_OBJS@%$STORE_OBJS%g
+Index: squid/src/Makefile.in
+diff -c squid/src/Makefile.in:1.225.2.24 squid/src/Makefile.in:1.225.2.25
+*** squid/src/Makefile.in:1.225.2.24	Sat Apr 23 18:12:08 2005
+--- squid/src/Makefile.in	Wed Sep 28 14:57:21 2005
+***************
+*** 73,78 ****
+--- 73,80 ----
+  AUTH_OBJS = @AUTH_OBJS@
+  AWK = @AWK@
+  BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
++ CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
++ CACHE_ICP_PORT = @CACHE_ICP_PORT@
+  CC = @CC@
+  CGIEXT = @CGIEXT@
+  CPP = @CPP@
+***************
+*** 375,380 ****
+--- 377,384 ----
+  	mime.conf.default
+  
+  
++ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
++ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
+  DEFAULT_PREFIX = $(prefix)
+  DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
+  DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
+***************
+*** 1144,1149 ****
+--- 1148,1155 ----
+  
+  cf.data: cf.data.pre Makefile
+  	sed "\
++ 	s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
++ 	s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
+  	s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
+  	s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
+  	s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\

================================================================
Index: SOURCES/squid-2.5.STABLE11-CNAME.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11-CNAME.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11-CNAME.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,104 @@
+Index: squid/include/rfc1035.h
+diff -c squid/include/rfc1035.h:1.6.2.2 squid/include/rfc1035.h:1.6.2.3
+*** squid/include/rfc1035.h:1.6.2.2	Tue May 10 05:48:20 2005
+--- squid/include/rfc1035.h	Wed Sep 28 15:47:58 2005
+***************
+*** 100,105 ****
+--- 100,106 ----
+  extern const char *rfc1035_error_message;
+  
+  #define RFC1035_TYPE_A 1
++ #define RFC1035_TYPE_CNAME 5
+  #define RFC1035_TYPE_PTR 12
+  #define RFC1035_CLASS_IN 1
+  
+Index: squid/src/fqdncache.c
+diff -c squid/src/fqdncache.c:1.149.2.7 squid/src/fqdncache.c:1.149.2.8
+*** squid/src/fqdncache.c:1.149.2.7	Mon Feb 21 09:59:45 2005
+--- squid/src/fqdncache.c	Wed Sep 28 15:47:58 2005
+***************
+*** 299,317 ****
+      debug(35, 3) ("fqdncacheParse: %d answers for '%s'\n", nr, name);
+      assert(answers);
+      for (k = 0; k < nr; k++) {
+- 	if (answers[k].type != RFC1035_TYPE_PTR)
+- 	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	if (!answers[k].rdata[0]) {
+! 	    debug(35, 2) ("fqdncacheParse: blank PTR record for '%s'\n", name);
+! 	    continue;
+! 	}
+! 	if (strchr(answers[k].rdata, ' ')) {
+! 	    debug(35, 2) ("fqdncacheParse: invalid PTR record '%s' for '%s'\n", answers[k].rdata, name);
+  	    continue;
+- 	}
+- 	f->names[f->name_count++] = xstrdup(answers[k].rdata);
+  	if (ttl == 0 || answers[k].ttl < ttl)
+  	    ttl = answers[k].ttl;
+  	if (f->name_count >= FQDN_MAX_NAMES)
+--- 299,318 ----
+      debug(35, 3) ("fqdncacheParse: %d answers for '%s'\n", nr, name);
+      assert(answers);
+      for (k = 0; k < nr; k++) {
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	if (answers[k].type == RFC1035_TYPE_PTR) {
+! 	    if (!answers[k].rdata[0]) {
+! 		debug(35, 2) ("fqdncacheParse: blank PTR record for '%s'\n", name);
+! 		continue;
+! 	    }
+! 	    if (strchr(answers[k].rdata, ' ')) {
+! 		debug(35, 2) ("fqdncacheParse: invalid PTR record '%s' for '%s'\n", answers[k].rdata, name);
+! 		continue;
+! 	    }
+! 	    f->names[f->name_count++] = xstrdup(answers[k].rdata);
+! 	} else if (answers[k].type != RFC1035_TYPE_CNAME)
+  	    continue;
+  	if (ttl == 0 || answers[k].ttl < ttl)
+  	    ttl = answers[k].ttl;
+  	if (f->name_count >= FQDN_MAX_NAMES)
+Index: squid/src/ipcache.c
+diff -c squid/src/ipcache.c:1.236.2.6 squid/src/ipcache.c:1.236.2.7
+*** squid/src/ipcache.c:1.236.2.6	Sat Feb 12 22:53:56 2005
+--- squid/src/ipcache.c	Wed Sep 28 15:47:58 2005
+***************
+*** 353,370 ****
+      i->addrs.in_addrs = xcalloc(na, sizeof(struct in_addr));
+      i->addrs.bad_mask = xcalloc(na, sizeof(unsigned char));
+      for (j = 0, k = 0; k < nr; k++) {
+- 	if (answers[k].type != RFC1035_TYPE_A)
+- 	    continue;
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	if (answers[k].rdlength != 4)
+  	    continue;
+  	if (ttl == 0 || ttl > answers[k].ttl)
+  	    ttl = answers[k].ttl;
+- 	xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
+- 	debug(14, 3) ("ipcacheParse: #%d %s\n",
+- 	    j - 1,
+- 	    inet_ntoa(i->addrs.in_addrs[j - 1]));
+      }
+      i->addrs.count = (unsigned char) na;
+      if (ttl == 0 || ttl > Config.positiveDnsTtl)
+--- 353,371 ----
+      i->addrs.in_addrs = xcalloc(na, sizeof(struct in_addr));
+      i->addrs.bad_mask = xcalloc(na, sizeof(unsigned char));
+      for (j = 0, k = 0; k < nr; k++) {
+  	if (answers[k].class != RFC1035_CLASS_IN)
+  	    continue;
+! 	if (answers[k].type == RFC1035_TYPE_A) {
+! 	    if (answers[k].rdlength != 4)
+! 		continue;
+! 	    xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
+! 	    debug(14, 3) ("ipcacheParse: #%d %s\n",
+! 		j - 1,
+! 		inet_ntoa(i->addrs.in_addrs[j - 1]));
+! 	} else if (answers[k].type != RFC1035_TYPE_CNAME)
+  	    continue;
+  	if (ttl == 0 || ttl > answers[k].ttl)
+  	    ttl = answers[k].ttl;
+      }
+      i->addrs.count = (unsigned char) na;
+      if (ttl == 0 || ttl > Config.positiveDnsTtl)

================================================================
Index: SOURCES/squid-2.5.STABLE11-delaypools_truncated.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11-delaypools_truncated.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11-delaypools_truncated.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,26 @@
+Index: squid/src/delay_pools.c
+diff -c squid/src/delay_pools.c:1.19.2.9 squid/src/delay_pools.c:1.19.2.10
+*** squid/src/delay_pools.c:1.19.2.9	Sat Sep 10 19:49:53 2005
+--- squid/src/delay_pools.c	Tue Sep 27 16:25:30 2005
+***************
+*** 676,683 ****
+  	    d = sc->delay_id;
+  	}
+      }
+!     if (jmax >= 0 && jmax < (int) *read_sz)
+  	*read_sz = (size_t) jmax;
+      return d;
+  }
+  
+--- 676,686 ----
+  	    d = sc->delay_id;
+  	}
+      }
+!     if (jmax >= 0 && jmax < (int) *read_sz) {
+! 	if (jmax == 0)
+! 	    jmax = 1;
+  	*read_sz = (size_t) jmax;
++     }
+      return d;
+  }
+  

================================================================
Index: SOURCES/squid-2.5.STABLE11-ldap_auth.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11-ldap_auth.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11-ldap_auth.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,172 @@
+Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.8
+diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.9 squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.10
+*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.9	Sun Jan 30 12:28:56 2005
+--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.8	Wed Sep 28 12:33:42 2005
+***************
+*** 199,205 ****
+  a user DN and password to log in as to perform the searches, as in the
+  following complex Active Directory example
+  .IP
+! squid_ldap_auth -p -R -b "dc=your,dc=domain" -D "cn=squid,cn=users,dc=your,dc=domain" -w "secretsquidpassword" -f "(&(userPrincipalName=%s)(objectClass=Person))" activedirectoryserver
+  .
+  .SH NOTES
+  .
+--- 199,205 ----
+  a user DN and password to log in as to perform the searches, as in the
+  following complex Active Directory example
+  .IP
+! squid_ldap_auth -P -R -b "dc=your,dc=domain" -D "cn=squid,cn=users,dc=your,dc=domain" -w "secretsquidpassword" -f "(&(userPrincipalName=%s)(objectClass=Person))" activedirectoryserver
+  .
+  .SH NOTES
+  .
+Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
+diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.23 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.24
+*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.23	Sat Sep 10 18:53:23 2005
+--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c	Wed Sep 28 12:33:42 2005
+***************
+*** 187,193 ****
+      else
+  	ld->ld_options &= ~LDAP_OPT_REFERRALS;
+  }
+! static void 
+  squid_ldap_set_timelimit(LDAP * ld, int timelimit)
+  {
+      ld->ld_timelimit = timelimit;
+--- 187,193 ----
+      else
+  	ld->ld_options &= ~LDAP_OPT_REFERRALS;
+  }
+! static void
+  squid_ldap_set_timelimit(LDAP * ld, int timelimit)
+  {
+      ld->ld_timelimit = timelimit;
+***************
+*** 259,265 ****
+      }
+      if (use_tls) {
+  #ifdef LDAP_OPT_X_TLS
+!         if (version != LDAP_VERSION3) {
+  	    fprintf(stderr, "TLS requires LDAP version 3\n");
+  	    exit(1);
+  	} else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
+--- 259,265 ----
+      }
+      if (use_tls) {
+  #ifdef LDAP_OPT_X_TLS
+! 	if (version != LDAP_VERSION3) {
+  	    fprintf(stderr, "TLS requires LDAP version 3\n");
+  	    exit(1);
+  	} else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
+***************
+*** 282,293 ****
+  static int
+  validUsername(const char *user)
+  {
+!     const unsigned char *p = (const unsigned char *)user;
+  
+      /* Leading whitespace? */
+      if (isspace(p[0]))
+  	return 0;
+!     while(p[0] && p[1]) {
+  	if (isspace(p[0])) {
+  	    /* More than one consequitive space? */
+  	    if (isspace(p[1]))
+--- 282,293 ----
+  static int
+  validUsername(const char *user)
+  {
+!     const unsigned char *p = (const unsigned char *) user;
+  
+      /* Leading whitespace? */
+      if (isspace(p[0]))
+  	return 0;
+!     while (p[0] && p[1]) {
+  	if (isspace(p[0])) {
+  	    /* More than one consequitive space? */
+  	    if (isspace(p[1]))
+***************
+*** 581,597 ****
+--- 581,603 ----
+      return n;
+  }
+  
++ /* Check the userid & password.
++  * Return 0 on success, 1 on failure
++  */
+  static int
+  checkLDAP(LDAP * persistent_ld, const char *userid, const char *password, const char *ldapServer, int port)
+  {
+      char dn[256];
+      int ret = 0;
+      LDAP *bind_ld = NULL;
++     int rc;
+  
+      if (!*password) {
+  	/* LDAP can't bind with a blank password. Seen as "anonymous"
+  	 * and always granted access
+  	 */
++ 	if (debug)
++ 	    fprintf(stderr, "Blank password given\n");
+  	return 1;
+      }
+      if (searchfilter) {
+***************
+*** 599,607 ****
+  	char escaped_login[256];
+  	LDAPMessage *res = NULL;
+  	LDAPMessage *entry;
+! 	char *searchattr[] = {LDAP_NO_ATTRS, NULL};
+  	char *userdn;
+- 	int rc;
+  	LDAP *search_ld = persistent_ld;
+  
+  	if (!search_ld)
+--- 605,613 ----
+  	char escaped_login[256];
+  	LDAPMessage *res = NULL;
+  	LDAPMessage *entry;
+! 	char *searchattr[] =
+! 	{LDAP_NO_ATTRS, NULL};
+  	char *userdn;
+  	LDAP *search_ld = persistent_ld;
+  
+  	if (!search_ld)
+***************
+*** 625,630 ****
+--- 631,638 ----
+  		/* Everything is fine. This is expected when referrals
+  		 * are disabled.
+  		 */
++ 		if (debug)
++ 		    fprintf(stderr, "noreferrals && rc == LDAP_PARTIAL_RESULTS\n");
+  	    } else {
+  		fprintf(stderr, PROGRAM_NAME ": WARNING, LDAP search error '%s'\n", ldap_err2string(rc));
+  #if defined(NETSCAPE_SSL)
+***************
+*** 639,644 ****
+--- 647,654 ----
+  	}
+  	entry = ldap_first_entry(search_ld, res);
+  	if (!entry) {
++ 	    if (debug)
++ 		fprintf(stderr, "Ldap search returned nothing\n");
+  	    ret = 1;
+  	    goto search_done;
+  	}
+***************
+*** 690,696 ****
+      return ret;
+  }
+  
+! int 
+  readSecret(const char *filename)
+  {
+      char buf[BUFSIZ];
+--- 700,706 ----
+      return ret;
+  }
+  
+! int
+  readSecret(const char *filename)
+  {
+      char buf[BUFSIZ];

================================================================
Index: SOURCES/squid-2.5.STABLE11-tcp_outgoing_xxx.patch
diff -u /dev/null SOURCES/squid-2.5.STABLE11-tcp_outgoing_xxx.patch:1.1
--- /dev/null	Mon Oct 17 08:35:10 2005
+++ SOURCES/squid-2.5.STABLE11-tcp_outgoing_xxx.patch	Mon Oct 17 08:35:05 2005
@@ -0,0 +1,32 @@
+Index: squid/src/cf.data.pre
+diff -c squid/src/cf.data.pre:1.245.2.99 squid/src/cf.data.pre:1.245.2.100
+*** squid/src/cf.data.pre:1.245.2.99	Tue Sep 13 07:44:35 2005
+--- squid/src/cf.data.pre	Wed Sep 28 06:29:45 2005
+***************
+*** 2359,2364 ****
+--- 2359,2369 ----
+  
+  	Processing proceeds in the order specified, and stops at first fully
+  	matching line.
++ 
++ 	Note: The use of this directive using client dependent ACLs is
++ 	incompatible with the use of server side persistent connetions. To
++ 	ensure correct results it is best to set server_persisten_connections
++ 	to off when using this directive in such configurations.
+  DOC_END
+  
+  NAME: tcp_outgoing_address
+***************
+*** 2385,2390 ****
+--- 2390,2400 ----
+  
+  	Processing proceeds in the order specified, and stops at first fully
+  	matching line.
++ 
++ 	Note: The use of this directive using client dependent ACLs is
++ 	incompatible with the use of server side persistent connetions. To
++ 	ensure correct results it is best to set server_persisten_connections
++ 	to off when using this directive in such configurations.
+  DOC_END
+  
+  NAME: reply_header_max_size
================================================================



More information about the pld-cvs-commit mailing list