diff -ruN squid-2.5.STABLE8-RC2/ChangeLog squid-2.5.STABLE8-RC3/ChangeLog --- squid-2.5.STABLE8-RC2/ChangeLog Mon Jan 24 03:20:13 2005 +++ squid-2.5.STABLE8-RC3/ChangeLog Mon Jan 31 15:53:57 2005 @@ -35,6 +35,9 @@ short_icon_urls is on (Bug #1203) - [Security] Harden Squid agains HTTP response splitting attacks (Bug #1200) + - [Medium security] Buffer overflow in WCCP recvfrom() call + (Bug #1217) + - [Security] Properly handle oversized reply headers (Bug #1216) Changes to squid-2.5.STABLE7 (11 Oct 2004) diff -ruN squid-2.5.STABLE8-RC2/configure squid-2.5.STABLE8-RC3/configure --- squid-2.5.STABLE8-RC2/configure Tue Jan 25 18:06:00 2005 +++ squid-2.5.STABLE8-RC3/configure Mon Jan 31 15:59:23 2005 @@ -1000,7 +1000,7 @@ # Define the identity of the package. PACKAGE=squid -VERSION=2.5.STABLE8-RC2 +VERSION=2.5.STABLE8-RC3 cat >> confdefs.h <&6 echo "configure:1057: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. diff -ruN squid-2.5.STABLE8-RC2/configure.in squid-2.5.STABLE8-RC3/configure.in --- squid-2.5.STABLE8-RC2/configure.in Tue Jan 25 18:06:00 2005 +++ squid-2.5.STABLE8-RC3/configure.in Mon Jan 31 15:59:23 2005 @@ -3,15 +3,15 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.251.2.75 2005/01/26 01:04:57 hno Exp $ +dnl $Id: configure.in,v 1.251.2.76 2005/01/31 22:57:55 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 2.5.STABLE8-RC2) +AM_INIT_AUTOMAKE(squid, 2.5.STABLE8-RC3) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.251.2.75 $)dnl +AC_REVISION($Revision: 1.251.2.76 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Czech/ERR_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_ACCESS_DENIED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_ACCESS_DENIED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_CACHE_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Czech/ERR_CACHE_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_CACHE_ACCESS_DENIED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_CACHE_ACCESS_DENIED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pristup ke cache serveru zamítnut @@ -31,6 +31,6 @@ Pro úspěšnou autorizaci potřebujete prohlížeče NETSCAPE 2.0 a vyšší, Microsoft Internet Explorer 3.0 nebo prohlížeč podporující protokol HTTP/1.1. V případě problému se prosím obraťte na cache -administratora nebo si změňte +administratora nebo si změňte heslo.

diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pristup ke cache manazeru zamitnut @@ -26,7 +26,7 @@ je dostupný pouze po Vaší autorizaci.

-

+

Pro úspěšnou autorizaci potřebujete prohlížeče NETSCAPE 2.0 a vyšší, Microsoft Internet Explorer 3.0 nebo prohlížeč podporující protokol HTTP/1.1. V případě problému se prosím obraťte na cache diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_CANNOT_FORWARD squid-2.5.STABLE8-RC3/errors/Czech/ERR_CANNOT_FORWARD --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_CANNOT_FORWARD Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_CANNOT_FORWARD Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_CONNECT_FAIL squid-2.5.STABLE8-RC3/errors/Czech/ERR_CONNECT_FAIL --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_CONNECT_FAIL Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_CONNECT_FAIL Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_DNS_FAIL squid-2.5.STABLE8-RC3/errors/Czech/ERR_DNS_FAIL --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_DNS_FAIL Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_DNS_FAIL Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FORWARDING_DENIED squid-2.5.STABLE8-RC3/errors/Czech/ERR_FORWARDING_DENIED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FORWARDING_DENIED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FORWARDING_DENIED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_DISABLED squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_DISABLED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_DISABLED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_DISABLED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_FAILURE squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_FAILURE --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_FAILURE Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_FAILURE Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_FORBIDDEN squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_FORBIDDEN --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_FORBIDDEN Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_FORBIDDEN Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_NOT_FOUND squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_NOT_FOUND --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_NOT_FOUND Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_NOT_FOUND Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_CREATED squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_CREATED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_CREATED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_CREATED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + FTP PUT: Soubor Vytvoren diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_ERROR squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_ERROR --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_ERROR Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_ERROR Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: neuspesny FTP upload diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_MODIFIED squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_MODIFIED --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_PUT_MODIFIED Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_PUT_MODIFIED Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + FTP PUT: Soubor aktualizovan diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_UNAVAILABLE squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_UNAVAILABLE --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_FTP_UNAVAILABLE Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_FTP_UNAVAILABLE Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_REQ squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_REQ --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_REQ Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_REQ Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_RESP squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_RESP --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_RESP Mon Jan 17 15:13:00 2005 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_RESP Mon Jan 31 08:38:43 2005 @@ -1,18 +1,19 @@ - -ERROR: The requested URL could not be retrieved + + +CHYBA: Pozadovany dokument je nedostupny

ERROR

-

The requested URL could not be retrieved

+

Požadovaný dokument je nedostupný

-While trying to process the request: +Při provádění požadavku: 

 %R

-The following error was encountered: +se objevila následující chyba:

-The HTTP Response message received from the contacted server -could not be understood or was otherwise malformed. Please contact -the site operator. Your cache administrator may be able to provide -you with more details about the exact nature of the problem if needed. - -

Your cache administrator is %w. +HTTP odpověď obdržená od vzdáleného serveru je nesrozumitelná či poškozená. +Kontaktujte prosím správce vzdáleného serveru. Další informace Vám poskytne +správce tohoto proxy serveru %w diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_URL squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_URL --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_INVALID_URL Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_INVALID_URL Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_LIFETIME_EXP squid-2.5.STABLE8-RC3/errors/Czech/ERR_LIFETIME_EXP --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_LIFETIME_EXP Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_LIFETIME_EXP Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny @@ -20,5 +20,5 @@

-Squid stornoval požadavek z důvodu překročení maximální délky trvání spojení. +Squid stornoval požadavek z důvodu překročení maximální délky trvání spojení.

diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_NO_RELAY squid-2.5.STABLE8-RC3/errors/Czech/ERR_NO_RELAY --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_NO_RELAY Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_NO_RELAY Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_ONLY_IF_CACHED_MISS squid-2.5.STABLE8-RC3/errors/Czech/ERR_ONLY_IF_CACHED_MISS --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_ONLY_IF_CACHED_MISS Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_ONLY_IF_CACHED_MISS Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_READ_ERROR squid-2.5.STABLE8-RC3/errors/Czech/ERR_READ_ERROR --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_READ_ERROR Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_READ_ERROR Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_READ_TIMEOUT squid-2.5.STABLE8-RC3/errors/Czech/ERR_READ_TIMEOUT --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_READ_TIMEOUT Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_READ_TIMEOUT Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_SHUTTING_DOWN squid-2.5.STABLE8-RC3/errors/Czech/ERR_SHUTTING_DOWN --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_SHUTTING_DOWN Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_SHUTTING_DOWN Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_SOCKET_FAILURE squid-2.5.STABLE8-RC3/errors/Czech/ERR_SOCKET_FAILURE --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_SOCKET_FAILURE Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_SOCKET_FAILURE Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_TOO_BIG squid-2.5.STABLE8-RC3/errors/Czech/ERR_TOO_BIG --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_TOO_BIG Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_TOO_BIG Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_UNSUP_REQ squid-2.5.STABLE8-RC3/errors/Czech/ERR_UNSUP_REQ --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_UNSUP_REQ Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_UNSUP_REQ Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_URN_RESOLVE squid-2.5.STABLE8-RC3/errors/Czech/ERR_URN_RESOLVE --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_URN_RESOLVE Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_URN_RESOLVE Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Požadované URN je nedostupné diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_WRITE_ERROR squid-2.5.STABLE8-RC3/errors/Czech/ERR_WRITE_ERROR --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_WRITE_ERROR Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_WRITE_ERROR Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Czech/ERR_ZERO_SIZE_OBJECT squid-2.5.STABLE8-RC3/errors/Czech/ERR_ZERO_SIZE_OBJECT --- squid-2.5.STABLE8-RC2/errors/Czech/ERR_ZERO_SIZE_OBJECT Mon Aug 26 19:16:58 2002 +++ squid-2.5.STABLE8-RC3/errors/Czech/ERR_ZERO_SIZE_OBJECT Mon Jan 31 08:39:33 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Estonian/ERR_INVALID_RESP squid-2.5.STABLE8-RC3/errors/Estonian/ERR_INVALID_RESP --- squid-2.5.STABLE8-RC2/errors/Estonian/ERR_INVALID_RESP Mon Jan 17 15:13:00 2005 +++ squid-2.5.STABLE8-RC3/errors/Estonian/ERR_INVALID_RESP Sun Jan 30 10:39:46 2005 @@ -1,29 +1,28 @@ -ERROR: The requested URL could not be retrieved +VIGA: Soovitud URLi ei őnnestu laadida -

ERROR

-

The requested URL could not be retrieved

+

VIGA

+

Soovitud URLi ei őnnestu laadida

-While trying to process the request: +Üritades käsitleda järgnevat päringut: 

 %R

-The following error was encountered: +Tekkis viga:

-The HTTP Response message received from the contacted server -could not be understood or was otherwise malformed. Please contact -the site operator. Your cache administrator may be able to provide -you with more details about the exact nature of the problem if needed. +Vasti vőetud HTTP vastus on tundmatu vői muidu katki. Palun kontakteeruge +saidi operaatoriga. Teie vehemälu serveri administraator vőib saada anda +täiendavat infot selle vea detailide kohta. -

Your cache administrator is %w. +

Teie vehemälu serveri administraator on %w. diff -ruN squid-2.5.STABLE8-RC2/errors/Estonian/README squid-2.5.STABLE8-RC3/errors/Estonian/README --- squid-2.5.STABLE8-RC2/errors/Estonian/README Mon Apr 27 10:23:04 1998 +++ squid-2.5.STABLE8-RC3/errors/Estonian/README Sun Jan 30 10:39:46 2005 @@ -1,2 +1,2 @@ -Thank you to Toomas Soome for +Thank you to Toomas Soome for creating these error pages in Estonian! diff -ruN squid-2.5.STABLE8-RC2/errors/German/ERR_INVALID_RESP squid-2.5.STABLE8-RC3/errors/German/ERR_INVALID_RESP --- squid-2.5.STABLE8-RC2/errors/German/ERR_INVALID_RESP Mon Jan 17 15:13:00 2005 +++ squid-2.5.STABLE8-RC3/errors/German/ERR_INVALID_RESP Mon Jan 31 08:05:10 2005 @@ -1,29 +1,29 @@ -ERROR: The requested URL could not be retrieved +FEHLER: Der angeforderte URL konnte nicht geholt werden -

ERROR

-

The requested URL could not be retrieved

+

FEHLER

+

Der angeforderte URL konnte nicht geholt werden

-While trying to process the request: +Während des Versuches, die Anfrage 

 %R

-The following error was encountered: +zu verarbeiten, trat der folgende Fehler auf:

-The HTTP Response message received from the contacted server -could not be understood or was otherwise malformed. Please contact -the site operator. Your cache administrator may be able to provide -you with more details about the exact nature of the problem if needed. +Die HTTP Antwortmeldung des kontaktierten Servers konnte nicht verstanden werden +oder war auf andere Weise missgebildet. Bitte kontaktieren Sie den Betreiber der +betreffenden Webseite. Wenn nötig kann Ihr Cache Administrator in der Lage sein, +Sie mit mehr Details über die genaue Ursache des Problems zu versorgen. -

Your cache administrator is %w. +

Ihr Cache Administrator ist %w. diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ACCESS_DENIED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ACCESS_DENIED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CACHE_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CACHE_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CACHE_ACCESS_DENIED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CACHE_ACCESS_DENIED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Cache Access Denied diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Cache Manager Access Denied diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CANNOT_FORWARD squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CANNOT_FORWARD --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CANNOT_FORWARD Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CANNOT_FORWARD Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CONNECT_FAIL squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CONNECT_FAIL --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_CONNECT_FAIL Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_CONNECT_FAIL Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_DNS_FAIL squid-2.5.STABLE8-RC3/errors/Slovak/ERR_DNS_FAIL --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_DNS_FAIL Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_DNS_FAIL Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FORWARDING_DENIED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FORWARDING_DENIED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FORWARDING_DENIED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FORWARDING_DENIED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_DISABLED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_DISABLED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_DISABLED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_DISABLED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_FAILURE squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_FAILURE --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_FAILURE Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_FAILURE Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_FORBIDDEN squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_FORBIDDEN --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_FORBIDDEN Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_FORBIDDEN Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_NOT_FOUND squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_NOT_FOUND --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_NOT_FOUND Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_NOT_FOUND Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovane URL je nedostupne diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_CREATED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_CREATED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_CREATED Mon Aug 26 19:17:27 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_CREATED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + operacia FTP PUT uspesna: subor vytvoreny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_ERROR squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_ERROR --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_ERROR Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_ERROR Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: neuspesny FTP upload diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_MODIFIED squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_MODIFIED --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_PUT_MODIFIED Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_PUT_MODIFIED Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + operacia FTP PUT uspesna: subor aktualizovany diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_UNAVAILABLE squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_UNAVAILABLE --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_FTP_UNAVAILABLE Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_FTP_UNAVAILABLE Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovane URL je nedostupne diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_REQ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_REQ --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_REQ Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_REQ Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny @@ -8,7 +8,7 @@

Požadovaný dokument je nedostupný

-While trying to process the request: +Pri pokuse o prístup k: 

 %R
@@ -32,3 +32,5 @@
  • Zakázaný znak v názve serveru; podtrhovník nie je povolený

    + +

    Vaším cache administrátorom je %w.

    diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_RESP squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_RESP --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_RESP Mon Jan 17 15:13:04 2005 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_RESP Mon Jan 31 08:23:36 2005 @@ -1,18 +1,19 @@ - -ERROR: The requested URL could not be retrieved + + +CHYBA: Pozadovany dokument je nedostupny -

    ERROR

    -

    The requested URL could not be retrieved

    +

    CHYBA

    +

    Požadovaný dokument je nedostupný

    -While trying to process the request: +Pri pokuse o prístup k: 

     %R

    -The following error was encountered: +došlo k nasledovnej chybe:

    • @@ -21,9 +22,10 @@

    -The HTTP Response message received from the contacted server -could not be understood or was otherwise malformed. Please contact -the site operator. Your cache administrator may be able to provide -you with more details about the exact nature of the problem if needed. +HTTP odpovedi obdržanej z kontaktovaného servera nebolo možné porozumieť +alebo bola nejako poškodená. Kontaktujte prosím správcu servera. V prípade +potreby Vám Váš cache administrátor môže poskytnúť detaily o presnej povahe +problému. +

    -

    Your cache administrator is %w. +

    Vaším cache administrátorom je %w.

    diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_URL squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_URL --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_INVALID_URL Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_INVALID_URL Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_LIFETIME_EXP squid-2.5.STABLE8-RC3/errors/Slovak/ERR_LIFETIME_EXP --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_LIFETIME_EXP Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_LIFETIME_EXP Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_NO_RELAY squid-2.5.STABLE8-RC3/errors/Slovak/ERR_NO_RELAY --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_NO_RELAY Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_NO_RELAY Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ONLY_IF_CACHED_MISS squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ONLY_IF_CACHED_MISS --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ONLY_IF_CACHED_MISS Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ONLY_IF_CACHED_MISS Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_READ_ERROR squid-2.5.STABLE8-RC3/errors/Slovak/ERR_READ_ERROR --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_READ_ERROR Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_READ_ERROR Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_READ_TIMEOUT squid-2.5.STABLE8-RC3/errors/Slovak/ERR_READ_TIMEOUT --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_READ_TIMEOUT Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_READ_TIMEOUT Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_SHUTTING_DOWN squid-2.5.STABLE8-RC3/errors/Slovak/ERR_SHUTTING_DOWN --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_SHUTTING_DOWN Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_SHUTTING_DOWN Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_SOCKET_FAILURE squid-2.5.STABLE8-RC3/errors/Slovak/ERR_SOCKET_FAILURE --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_SOCKET_FAILURE Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_SOCKET_FAILURE Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_TOO_BIG squid-2.5.STABLE8-RC3/errors/Slovak/ERR_TOO_BIG --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_TOO_BIG Wed Aug 28 15:08:14 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_TOO_BIG Mon Jan 31 08:28:40 2005 @@ -1,22 +1,24 @@ -ERROR: The requested URL could not be retrieved +CHYBA: Pozadovany dokument je nedostupny -

    ERROR

    -

    The requested URL could not be retrieved

    +

    CHYBA

    +

    Požadovaný dokument je nedostupný

    -While trying to retrieve the URL: +Pri pokuse o prístup k: %U

    -The following error was encountered: +došlo k nasledovnej chybe:

    • The request or reply is too large. +
    +

    If you are making a POST or PUT request, then your request body (the thing you are trying to upload) is too large. If you are @@ -24,6 +26,6 @@ to download) is too large. These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error. - -

    -Your cache administrator is %w. +

    + +

    Vaším cache administrátorom je %w.

    diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_UNSUP_REQ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_UNSUP_REQ --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_UNSUP_REQ Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_UNSUP_REQ Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_URN_RESOLVE squid-2.5.STABLE8-RC3/errors/Slovak/ERR_URN_RESOLVE --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_URN_RESOLVE Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_URN_RESOLVE Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovane URN je nedostupne diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_WRITE_ERROR squid-2.5.STABLE8-RC3/errors/Slovak/ERR_WRITE_ERROR --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_WRITE_ERROR Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_WRITE_ERROR Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ZERO_SIZE_OBJECT squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ZERO_SIZE_OBJECT --- squid-2.5.STABLE8-RC2/errors/Slovak/ERR_ZERO_SIZE_OBJECT Mon Aug 26 19:17:28 2002 +++ squid-2.5.STABLE8-RC3/errors/Slovak/ERR_ZERO_SIZE_OBJECT Mon Jan 31 08:26:00 2005 @@ -1,6 +1,6 @@ - + CHYBA: Pozadovany dokument je nedostupny diff -ruN squid-2.5.STABLE8-RC2/helpers/basic_auth/LDAP/squid_ldap_auth.8 squid-2.5.STABLE8-RC3/helpers/basic_auth/LDAP/squid_ldap_auth.8 --- squid-2.5.STABLE8-RC2/helpers/basic_auth/LDAP/squid_ldap_auth.8 Tue Oct 19 04:07:25 2004 +++ squid-2.5.STABLE8-RC3/helpers/basic_auth/LDAP/squid_ldap_auth.8 Sun Jan 30 12:28:56 2005 @@ -1,4 +1,4 @@ -.TH squid_ldap_auth 8 "17 July 2004" "Squid LDAP Auth" +.TH squid_ldap_auth 8 "14 January 2005" "Squid LDAP Auth" . .SH NAME squid_ldap_auth - Squid LDAP authentication helper @@ -13,6 +13,16 @@ .SH DESCRIPTION This helper allows Squid to connect to a LDAP directory to validate the user name and password of Basic HTTP authentication. +LDAP options are specified as parameters on the command line, +while the username(s) and password(s) to be checked against the +LDAP directory are specified on subsequent lines of input to the +helper, one username/password pair per line separated by a space. +.P +As expected by the basic authentication construct of Squid, after +specifying a username and password followed by a new line, this +helper will produce either OK or ERR on the following line +to show if the specified credentials are correct according to +the LDAP directory. .P The program has two major modes of operation. In the default mode of operation the users DN is constructed using the base DN and diff -ruN squid-2.5.STABLE8-RC2/helpers/external_acl/ldap_group/squid_ldap_group.8 squid-2.5.STABLE8-RC3/helpers/external_acl/ldap_group/squid_ldap_group.8 --- squid-2.5.STABLE8-RC2/helpers/external_acl/ldap_group/squid_ldap_group.8 Tue Oct 19 04:07:25 2004 +++ squid-2.5.STABLE8-RC3/helpers/external_acl/ldap_group/squid_ldap_group.8 Sun Jan 30 12:28:56 2005 @@ -1,4 +1,4 @@ -.TH squid_ldap_group 8 "17 July 2004" "Squid LDAP Group" +.TH squid_ldap_group 8 "14 January 2005" "Squid LDAP Group" . .SH NAME squid_ldap_group - Squid LDAP external acl group helper @@ -9,6 +9,15 @@ .SH DESCRIPTION This helper allows Squid to connect to a LDAP directory to authorize users via LDAP groups. +LDAP options are specified as parameters on the command line, +while the username(s) and group(s) to be checked against the +LDAP directory are specified on subsequent lines of input to the +helper, one username/group pair per line separated by a space. +.P +As expected by the external_acl construct of Squid, after +specifying a username and group followed by a new line, this +helper will produce either OK or ERR on the following line +to show if the user is a member of the specified group. .P The program operates by searching with a search filter based on the users user name and requested group, and if a match diff -ruN squid-2.5.STABLE8-RC2/include/version.h squid-2.5.STABLE8-RC3/include/version.h --- squid-2.5.STABLE8-RC2/include/version.h Tue Jan 25 18:06:00 2005 +++ squid-2.5.STABLE8-RC3/include/version.h Mon Jan 31 15:59:23 2005 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1106701557 +#define SQUID_RELEASE_TIME 1107212360 #endif diff -ruN squid-2.5.STABLE8-RC2/src/http.c squid-2.5.STABLE8-RC3/src/http.c --- squid-2.5.STABLE8-RC2/src/http.c Fri Jan 21 05:39:37 2005 +++ squid-2.5.STABLE8-RC3/src/http.c Mon Jan 31 15:44:18 2005 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.384.2.25 2005/01/21 12:39:37 hno Exp $ + * $Id: http.c,v 1.384.2.26 2005/01/31 22:44:18 hno Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -401,7 +401,7 @@ size_t hdr_len; size_t hdr_size = headersEnd(buf, size); HttpReply *reply = entry->mem_obj->reply; - Ctx ctx; + Ctx ctx = ctx_enter(entry->mem_obj->url); debug(11, 3) ("httpProcessReplyHeader: key '%s'\n", storeKeyText(entry->hash.key)); if (memBufIsNull(&httpState->reply_hdr)) @@ -418,6 +418,7 @@ memBufClean(&httpState->reply_hdr); httpBuildVersion(&reply->sline.version, 0, 9); reply->sline.status = HTTP_INVALID_HEADER; + ctx_exit(ctx); return; } if (hdr_size != hdr_len) @@ -429,21 +430,24 @@ if (!memBufIsNull(&httpState->reply_hdr)) memBufClean(&httpState->reply_hdr); reply->sline.status = HTTP_HEADER_TOO_LARGE; + httpState->reply_hdr_state += 2; + ctx_exit(ctx); return; } /* headers can be incomplete only if object still arriving */ if (!hdr_size) { if (httpState->eof) hdr_size = hdr_len; - else + else { + ctx_exit(ctx); return; /* headers not complete */ + } } /* Cut away any excess body data (only needed for debug?) */ memBufAppend(&httpState->reply_hdr, "\0", 1); httpState->reply_hdr.buf[hdr_size] = '\0'; httpState->reply_hdr_state++; assert(httpState->reply_hdr_state == 1); - ctx = ctx_enter(entry->mem_obj->url); httpState->reply_hdr_state++; debug(11, 9) ("GOT HTTP REPLY HDR:\n---------\n%s\n----------\n", httpState->reply_hdr.buf); @@ -453,6 +457,7 @@ if (reply->sline.status >= HTTP_INVALID_HEADER) { debug(11, 3) ("httpProcessReplyHeader: Non-HTTP-compliant header: '%s'\n", httpState->reply_hdr.buf); memBufClean(&httpState->reply_hdr); + ctx_exit(ctx); return; } storeTimestampsSet(entry); diff -ruN squid-2.5.STABLE8-RC2/src/store_digest.c squid-2.5.STABLE8-RC3/src/store_digest.c --- squid-2.5.STABLE8-RC2/src/store_digest.c Wed Oct 24 00:55:44 2001 +++ squid-2.5.STABLE8-RC3/src/store_digest.c Sun Jan 30 18:49:42 2005 @@ -1,6 +1,6 @@ /* - * $Id: store_digest.c,v 1.51 2001/10/24 06:55:44 hno Exp $ + * $Id: store_digest.c,v 1.51.2.1 2005/01/31 01:49:42 hno Exp $ * * DEBUG: section 71 Store Digest Manager * AUTHOR: Alex Rousskov @@ -387,6 +387,7 @@ (long int) e->mem_obj->reply->expires, (int) (e->mem_obj->reply->expires - squid_curtime)); storeBuffer(e); httpReplySwapOut(e->mem_obj->reply, e); + e->mem_obj->reply->hdr_sz = e->mem_obj->inmem_hi; storeDigestCBlockSwapOut(e); storeBufferFlush(e); eventAdd("storeDigestSwapOutStep", storeDigestSwapOutStep, sd_state.rewrite_lock, 0.0, 1); diff -ruN squid-2.5.STABLE8-RC2/src/wccp.c squid-2.5.STABLE8-RC3/src/wccp.c --- squid-2.5.STABLE8-RC2/src/wccp.c Tue Jan 11 23:07:12 2005 +++ squid-2.5.STABLE8-RC3/src/wccp.c Fri Jan 28 15:50:19 2005 @@ -1,6 +1,6 @@ /* - * $Id: wccp.c,v 1.19.2.6 2005/01/12 06:07:12 wessels Exp $ + * $Id: wccp.c,v 1.19.2.7 2005/01/28 22:50:19 wessels Exp $ * * DEBUG: section 80 WCCP Support * AUTHOR: Glenn Chisholm @@ -225,7 +225,7 @@ len = recvfrom(sock, (void *) &wccp_i_see_you, - WCCP_RESPONSE_SIZE, + sizeof(wccp_i_see_you), 0, (struct sockaddr *) &from, &from_len);