diff -ruN squid-2.6.STABLE12/ChangeLog squid-2.6.STABLE13/ChangeLog
--- squid-2.6.STABLE12/ChangeLog Tue Mar 20 15:34:20 2007
+++ squid-2.6.STABLE13/ChangeLog Thu May 10 17:56:28 2007
@@ -1,8 +1,29 @@
-Changes to squid-2.6.STABLE12 (Mar 20 2007)
+Changes to squid-2.6.STABLE13 (11 May 2007)
+
+ - Make sure reply headers gets sent even if there is no body available
+ yet, fixing RealMedia streaming over HTTP issues.
+ - Undo an accidental name change of storeUnregisterAbort.
+ - Kill an ancient malplaced storeUnregisterAbort call from ftp.c
+ - Bug #1814: SSL memory leak on persistent SSL connections
+ - Don't log ECONNREFUSED/ECONNABORTED accept failures in cache.log
+ - Cosmetic fix: added missing newline in WCCPv2 configuration dump.
+ - Ukrainan error messages
+ - Convert various error pages from DOS to UNIX text format
+ - Bug #1820: COSS assertion failure t->length == MD5_DIGEST_CHARS
+ - Clarify the max-conn=n cache_peer option syntax slightly
+ - Bug #1892: COSS segfault on shutdown
+ - Windows port: fix undefined ECONNABORTED
+ - Make refreshIsCachable handle ETag as a cache validator, not
+ only last-modified
+ - in_port_t is not portable, use unsigned short instead
+ - Fix fs / auth / snmp dependencies
+ - Portability: statfs() may reqire #include
+
+Changes to squid-2.6.STABLE12 (20 Mar 2007)
- Assertion error on TRACE
-Changes to squid-2.6.STABLE11 (Mar 17 2007)
+Changes to squid-2.6.STABLE11 (17 Mar 2007)
- Bug #1915: assertion failed: client_side.c:4055: "buf != NULL ||
!conn->body.request"
@@ -14,7 +35,7 @@
- Fix bswap16 & bwsap32 error on NetBSD
- Fix collapsed_forwarding for non-GET requests
-Changes to squid-2.6.STABLE10 (Mar 4 2007)
+Changes to squid-2.6.STABLE10 (4 Mar 2007)
- Upgrade HTTP/0.9 responses to our HTTP version (HTTP/1.0)
- various diskd bugfixes
@@ -45,12 +66,12 @@
- Added support for Subversion HTTP request methods MKACTIVITY,
CHECKOUT and MERGE.
-Changes to squid-2.6.STABLE9 (Jan 24 2007)
+Changes to squid-2.6.STABLE9 (24 Jan 2007)
- Bug #1878: If-Modified-Since broken in 2.6.STABLE8
- Bug #1877 diskd bug in storeDiskdIOCallback()
-Changes to squid-2.6.STABLE8 (Jan 21 2007)
+Changes to squid-2.6.STABLE8 (21 Jan 2007)
- Bug #1873: authenticateNTLMFixErrorHeader: state 4.
- Document the https_port vhost option, useful in combination with
@@ -69,7 +90,7 @@
- Fix how ftp://user@host URLs is rendered when Squid is built with
leak checking enabled
-Changes to squid-2.6.STABLE7 (Jan 13 2007)
+Changes to squid-2.6.STABLE7 (13 Jan 2007)
- Windows port: Fix intermittent build error using Visual Studio
- Add missing tproxy info from the dump of http port configuration
@@ -90,7 +111,7 @@
- Bug #1828: squid.conf docutemtation error for proxy_auth digest
- Bug #1867: squid.pid isn't removed on shutdown
-Changes to squid-2.6.STABLE6 (Dec 12 2006)
+Changes to squid-2.6.STABLE6 (12 Dec 2006)
- Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c htcpBuildAuth()
- Add client source port logformat tag >p
@@ -122,7 +143,7 @@
- Bug #1641: assertion failed: stmem.c:149: "size > 0" while processing certain Vary objects
- Fix build errors when using latest MinGW Windows environment
-Changes to squid-2.6.STABLE5 (Now 3 2006)
+Changes to squid-2.6.STABLE5 (3 Now 2006)
- Bug #1776: 2.6.STABLE4 aufs fails to compile if coss isn't enabled
- COSS improvements and cleanups
@@ -152,7 +173,7 @@
- Added a basic comm_select_simple comm loop only requiring minimal POSIX compliance.
- Safeguard from kb_t counter overflows on 32-bit platforms
-Changes to squid-2.6.STABLE4 (Sep 23 2006)
+Changes to squid-2.6.STABLE4 (23 Sep 2006)
- Bug #1736: Missing Italian translation of ERR_TOO_BIG error page
- Windows port enhancement: added native exception handler with signal emulation
@@ -191,7 +212,7 @@
- Cosmetic cleanup to not dump stacktraces on configuration errors
-Changes to squid-2.6.STABLE3 (Aug 18 2006)
+Changes to squid-2.6.STABLE3 (18 Aug 2006)
- Bug #1577: assertion failed "fm->max_n_files <= (1 << 24)" on
very large cache_dir. Limit number of objects stored to slightly
diff -ruN squid-2.6.STABLE12/RELEASENOTES.html squid-2.6.STABLE13/RELEASENOTES.html
--- squid-2.6.STABLE12/RELEASENOTES.html Tue Mar 20 15:36:18 2007
+++ squid-2.6.STABLE13/RELEASENOTES.html Thu May 10 18:00:09 2007
@@ -2,12 +2,12 @@
- Squid 2.6.STABLE12 release notes
+ Squid 2.6.STABLE13 release notes
-Squid 2.6.STABLE12 release notes
+Squid 2.6.STABLE13 release notes
-Squid Developers
$Id: release-2.6.html,v 1.44.2.6 2007/03/20 21:31:32 hno Exp $
+Squid Developers
$Id: release-2.6.html,v 1.44.2.8 2007/05/10 23:56:29 hno Exp $
This document contains the release notes for version 2.6 of Squid.
Squid is a WWW Cache application developed by the Web Caching community.
@@ -63,6 +63,9 @@
+
+
+
@@ -654,6 +657,20 @@
Assertion error on TRACE
See also the list of
squid-2.6.STABLE12 changes and the
+ChangeLog file for details.
+
+
+
+
+
+
+
+- Make sure reply headers gets sent even if there is no body available
+yet, fixing RealMedia streaming over HTTP issues.
+- Bug #1814: SSL memory leak on persistent SSL connections
+- Ukrainan error messages
+- See also the list of
+squid-2.6.STABLE13 changes and the
ChangeLog file for details.
diff -ruN squid-2.6.STABLE12/configure squid-2.6.STABLE13/configure
--- squid-2.6.STABLE12/configure Tue Mar 20 15:35:44 2007
+++ squid-2.6.STABLE13/configure Thu May 10 17:59:36 2007
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 1.416.2.8 .
+# From configure.in Revision: 1.416.2.10 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE12.
+# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE13.
#
# Report bugs to .
#
@@ -270,8 +270,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='2.6.STABLE12'
-PACKAGE_STRING='Squid Web Proxy 2.6.STABLE12'
+PACKAGE_VERSION='2.6.STABLE13'
+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE13'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_default_prefix=/usr/local/squid
@@ -781,7 +781,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Squid Web Proxy 2.6.STABLE12 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 2.6.STABLE13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -847,7 +847,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE12:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE13:";;
esac
cat <<\_ACEOF
@@ -1158,7 +1158,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 2.6.STABLE12
+Squid Web Proxy configure 2.6.STABLE13
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1172,7 +1172,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 2.6.STABLE12, which was
+It was created by Squid Web Proxy $as_me 2.6.STABLE13, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1818,7 +1818,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='2.6.STABLE12'
+ VERSION='2.6.STABLE13'
cat >>confdefs.h <<_ACEOF
@@ -7298,6 +7298,7 @@
+
for ac_header in sys/types.h \
stddef.h \
limits.h \
@@ -7355,6 +7356,7 @@
sys/poll.h \
sys/select.h \
sys/stat.h \
+ sys/statfs.h \
sys/statvfs.h \
syscall.h \
sys/syscall.h \
@@ -18612,7 +18614,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by Squid Web Proxy $as_me 2.6.STABLE12, which was
+This file was extended by Squid Web Proxy $as_me 2.6.STABLE13, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18675,7 +18677,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Squid Web Proxy config.status 2.6.STABLE12
+Squid Web Proxy config.status 2.6.STABLE13
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -ruN squid-2.6.STABLE12/configure.in squid-2.6.STABLE13/configure.in
--- squid-2.6.STABLE12/configure.in Tue Mar 20 15:35:44 2007
+++ squid-2.6.STABLE13/configure.in Thu May 10 17:59:36 2007
@@ -1,16 +1,16 @@
dnl
dnl Configuration input file for Squid
dnl
-dnl $Id: configure.in,v 1.416.2.8 2007/03/20 21:34:20 hno Exp $
+dnl $Id: configure.in,v 1.416.2.10 2007/05/10 23:56:28 hno Exp $
dnl
dnl
dnl
-AC_INIT(Squid Web Proxy, 2.6.STABLE12, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.6.STABLE13, http://www.squid-cache.org/bugs/, squid)
AC_PREREQ(2.52)
AM_CONFIG_HEADER(include/autoconf.h)
AC_CONFIG_AUX_DIR(cfgaux)
AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.416.2.8 $)dnl
+AC_REVISION($Revision: 1.416.2.10 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
@@ -1625,6 +1625,7 @@
sys/poll.h \
sys/select.h \
sys/stat.h \
+ sys/statfs.h \
sys/statvfs.h \
syscall.h \
sys/syscall.h \
diff -ruN squid-2.6.STABLE12/errors/Czech/ERR_SHUTTING_DOWN squid-2.6.STABLE13/errors/Czech/ERR_SHUTTING_DOWN
--- squid-2.6.STABLE12/errors/Czech/ERR_SHUTTING_DOWN Tue May 17 10:56:06 2005
+++ squid-2.6.STABLE13/errors/Czech/ERR_SHUTTING_DOWN Tue Apr 17 03:48:31 2007
@@ -1,23 +1,23 @@
-
-
-CHYBA: Pozadovany dokument je nedostupny
+
+
+CHYBA: Pozadovany dokument je nedostupny
-
-CHYBA
-Po¾adovaný dokument je nedostupný
-
-
-Pøi pokusu o pøístup k:
-%U
-
-se objevila následující chyba:
-
-
--
-
-Tento cache server je právì restartován a nemù¾e obslou¾it Vá¹ po¾adavek.
-Zkuste to za chvíli znova.
-
-
-
+
+CHYBA
+Po¾adovaný dokument je nedostupný
+
+
+Pøi pokusu o pøístup k:
+%U
+
+se objevila následující chyba:
+
+
+-
+
+Tento cache server je právì restartován a nemù¾e obslou¾it Vá¹ po¾adavek.
+Zkuste to za chvíli znova.
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ACCESS_DENIED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ACCESS_DENIED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ACCESS_DENIED Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ACCESS_DENIED Tue Apr 17 03:48:32 2007
@@ -1,31 +1,31 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Access Denied.
-
-
-¦s¨ú³Q©Úµ´
-
-
-Access control configuration prevents your request from
-being allowed at this time. Please contact your service provider if
-you feel this is incorrect.
-
-
-±ý³sµ²¤§ºô¯¸ªº¦s¨ú±±¨î³]©w¥Ø«e¸T¤î¤F±zªº³s½un¨D¡A¦pªG±zı±o±o¨ì³o¼Ëªº
-°T®§¨Ã¤£¥¿½T¡A½Ð»P´£¨Ñºô¸ôªA°ÈªººÞ²zªÌÁpô¡C
-
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Access Denied.
+
-
+¦s¨ú³Q©Úµ´
+
+
+Access control configuration prevents your request from
+being allowed at this time. Please contact your service provider if
+you feel this is incorrect.
+
+
+±ý³sµ²¤§ºô¯¸ªº¦s¨ú±±¨î³]©w¥Ø«e¸T¤î¤F±zªº³s½un¨D¡A¦pªG±zı±o±o¨ì³o¼Ëªº
+°T®§¨Ã¤£¥¿½T¡A½Ð»P´£¨Ñºô¸ôªA°ÈªººÞ²zªÌÁpô¡C
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED Tue May 17 10:56:22 2005
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED Tue Apr 17 03:48:32 2007
@@ -1,43 +1,43 @@
-
-¿ù»~¡Gºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+
+¿ù»~¡Gºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
-
-
-¿ù»~
-ºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Cache Access Denied.
-
-
-§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
-
-
-
-
-
-©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓºô¸ô§Ö¨ú¦øªA¾¹¶Ç¦^¤U¦C¦ì¸m¡G
-
%U
-°£«D±z³q¹L¤F§Ú̪º¨¥÷ÅçÃÒ¡C
-
-
-
-You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the cache administrator if you have
-difficulties authenticating yourself or
-change your default password.
-
-
-±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î§ó·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
-Explorer 3.0¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¦b¨¥÷ÅçÃÒ¤W
-µo¥Í§xÃø¡A½Ð»P ºÞ²zªÌ Ápô¡C
-©Î¬O§ó§ï±zªº±K½X¡C
-
+
+
+¿ù»~
+ºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Cache Access Denied.
+
-
+§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+
+
+
+
+
+©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓºô¸ô§Ö¨ú¦øªA¾¹¶Ç¦^¤U¦C¦ì¸m¡G
+
%U
+°£«D±z³q¹L¤F§Ú̪º¨¥÷ÅçÃÒ¡C
+
+
+
+You need to use Netscape version 2.0 or greater, or Microsoft Internet
+Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
+contact the cache administrator if you have
+difficulties authenticating yourself or
+change your default password.
+
+
+±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î§ó·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
+Explorer 3.0¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¦b¨¥÷ÅçÃÒ¤W
+µo¥Í§xÃø¡A½Ð»P ºÞ²zªÌ Ápô¡C
+©Î¬O§ó§ï±zªº±K½X¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED Tue May 17 10:56:22 2005
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED Tue Apr 17 03:48:32 2007
@@ -1,44 +1,44 @@
-
-¿ù»~¡G¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
+
+¿ù»~¡G¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
-
-
-¿ù»~
-¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Cache Manager Access Denied.
-
-
-§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¨Ï¥Î³Q©Ú
-
-
-
-
-
-©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓ§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¶Ç¦^¤U¦C¦ì¸m¡G
-
%U
-°£«D±z³q¹L§Ú̪º¨¥÷ÅçÃÒ¡C
-
-
- You need to use Netscape version 2.0 or greater, or Microsoft Internet
-Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
-contact the cache administrator if you have
-difficulties authenticating yourself or, if you are the
-administrator, read Squid documentation on cache manager interface and check
-cache log for more detailed error messages.
-
-
-±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î³Ì·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
-Explorer¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¬O¦b¨¥÷ÅçÃÒ¤Wµo
-¥Í°ÝÃD¡A½Ð¥ý½T©w±z¦³Åv¹ï§Ö¨ú¦øªA¾¹¨Ï¥ÎºÞ²zµ{¦¡¡C
-©Î¬O»PºÞ²zªÌÁpô¡C¦pªG±z´N¬OºÞ²zªÌ¡A½Ð¸Ô²Ó¾\Ū Squid ©Òªþ¤å¥ó¤¤»P
-cache manager ¦³Ãö³¡¥÷©ÎÀˬd cache log ¥H«K±o¨ì§ó¸ÔºÉªº²Ó¸`¡C
-
+
+
+¿ù»~
+¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Cache Manager Access Denied.
+
-
+§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¨Ï¥Î³Q©Ú
+
+
+
+
+
+©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓ§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¶Ç¦^¤U¦C¦ì¸m¡G
+
%U
+°£«D±z³q¹L§Ú̪º¨¥÷ÅçÃÒ¡C
+
+
+ You need to use Netscape version 2.0 or greater, or Microsoft Internet
+Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please
+contact the cache administrator if you have
+difficulties authenticating yourself or, if you are the
+administrator, read Squid documentation on cache manager interface and check
+cache log for more detailed error messages.
+
+
+±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î³Ì·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
+Explorer¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¬O¦b¨¥÷ÅçÃÒ¤Wµo
+¥Í°ÝÃD¡A½Ð¥ý½T©w±z¦³Åv¹ï§Ö¨ú¦øªA¾¹¨Ï¥ÎºÞ²zµ{¦¡¡C
+©Î¬O»PºÞ²zªÌÁpô¡C¦pªG±z´N¬OºÞ²zªÌ¡A½Ð¸Ô²Ó¾\Ū Squid ©Òªþ¤å¥ó¤¤»P
+cache manager ¦³Ãö³¡¥÷©ÎÀˬd cache log ¥H«K±o¨ì§ó¸ÔºÉªº²Ó¸`¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CANNOT_FORWARD squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CANNOT_FORWARD Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CANNOT_FORWARD Tue Apr 17 03:48:32 2007
@@ -1,38 +1,38 @@
-
-¿ù»~¡F±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡F±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Unable to forward this request at this time.
-
-
-¥Ø«eµLªk´À±zªººô¯¸³sµ²n¨D¶i¦æÂà¦V°Ê§@
-
-
-
-
-This request could not be forwarded to the origin server or to any
-parent caches. The most likely cause for this error is that:
-
-- The cache administrator does not allow this cache to make
- direct connections to origin servers, and
-
- All configured parent caches are currently unreachable.
-
-
-
-±zªº³sµ²n¨DµLªk³QÂà¦Vì©lºô¯¸¦øªA¾¹©Î¨ä¥Lªº¤W¼h§Ö¨ú¦øªA¾¹¡Aµo¥Í³oÓ°ÝÃDªº³Ì¥i¯àªºì¦]¥i¯à¬O¡G
-
-- ºô¸ô§Ö¨ú¦øªA¾¹ºÞ²zªÌ¤£¤¹³\¥»¦øªA¾¹³w¦æª½±µ³sµ²ì©lªººô¶¦ì¸m¡A©Î¬O
-
- ©Ò¦³¥»¦øªA¾¹³]©wªº¤W¼h¦øªA¾¹¥Ø«e³£¼È®ÉµLªk³sµ²¤W¡C
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Unable to forward this request at this time.
+
-
+¥Ø«eµLªk´À±zªººô¯¸³sµ²n¨D¶i¦æÂà¦V°Ê§@
+
+
+
+
+This request could not be forwarded to the origin server or to any
+parent caches. The most likely cause for this error is that:
+
+- The cache administrator does not allow this cache to make
+ direct connections to origin servers, and
+
- All configured parent caches are currently unreachable.
+
+
+
+±zªº³sµ²n¨DµLªk³QÂà¦Vì©lºô¯¸¦øªA¾¹©Î¨ä¥Lªº¤W¼h§Ö¨ú¦øªA¾¹¡Aµo¥Í³oÓ°ÝÃDªº³Ì¥i¯àªºì¦]¥i¯à¬O¡G
+
+- ºô¸ô§Ö¨ú¦øªA¾¹ºÞ²zªÌ¤£¤¹³\¥»¦øªA¾¹³w¦æª½±µ³sµ²ì©lªººô¶¦ì¸m¡A©Î¬O
+
- ©Ò¦³¥»¦øªA¾¹³]©wªº¤W¼h¦øªA¾¹¥Ø«e³£¼È®ÉµLªk³sµ²¤W¡C
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CONNECT_FAIL squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CONNECT_FAIL
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_CONNECT_FAIL Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_CONNECT_FAIL Tue Apr 17 03:48:32 2007
@@ -1,31 +1,31 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Connection Failed
-
-
-³s½u¥¢±Ñ
-
-
-
-
-¨t²Î¦^À³¤F¤U¦C¿ù»~°T®§¡G
-
%E
-
-
-The remote host or network may be down. Please try the request again.
-
-±z±ý³sµ²ªººô¯¸¦øªA¾¹©Î¬Oºô¸ô¥i¯àµo¥Í¬G»Ù¡C½Ðµy«á¦A¸Õ¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Connection Failed
+
-
+³s½u¥¢±Ñ
+
+
+
+
+¨t²Î¦^À³¤F¤U¦C¿ù»~°T®§¡G
+
%E
+
+
+The remote host or network may be down. Please try the request again.
+
+±z±ý³sµ²ªººô¯¸¦øªA¾¹©Î¬Oºô¸ô¥i¯àµo¥Í¬G»Ù¡C½Ðµy«á¦A¸Õ¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_DNS_FAIL squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_DNS_FAIL
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_DNS_FAIL Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_DNS_FAIL Tue Apr 17 03:48:32 2007
@@ -1,35 +1,35 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
-µLªk±N±z¿é¤Jªººô¯¸¥D¾÷¦ì¸mÂàͦ¨¥¿½Tªº IP ¦ì¸m¡G
-%H
-
-
-
-
-»â°ì¦WºÙ¦øªA¾¹¦^À³¤U¦C¿ù»~°T®§¡G
-
-%z
-
-
-
-³oªí¥Ü¡G
-
- The cache was not able to resolve the hostname presented in the URL.
- Check if the address is correct.
-
- ºô¸ô§Ö¨ú¦øªA¾¹¨S¦³¿ìªk¥¿½TÂàͱz¿é¤Jªººô¯¸¥D¾÷¦WºÙ¡A½ÐÀˬd±z¿é¤Jªººô
- §}¡]URL¡^¬O¥¿½Tªº¡C
-
-
-
+
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+µLªk±N±z¿é¤Jªººô¯¸¥D¾÷¦ì¸mÂàͦ¨¥¿½Tªº IP ¦ì¸m¡G
+%H
+
+
+
+
+»â°ì¦WºÙ¦øªA¾¹¦^À³¤U¦C¿ù»~°T®§¡G
+
+%z
+
+
+
+³oªí¥Ü¡G
+
+ The cache was not able to resolve the hostname presented in the URL.
+ Check if the address is correct.
+
+ ºô¸ô§Ö¨ú¦øªA¾¹¨S¦³¿ìªk¥¿½TÂàͱz¿é¤Jªººô¯¸¥D¾÷¦WºÙ¡A½ÐÀˬd±z¿é¤Jªººô
+ §}¡]URL¡^¬O¥¿½Tªº¡C
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FORWARDING_DENIED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FORWARDING_DENIED Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FORWARDING_DENIED Tue Apr 17 03:48:32 2007
@@ -1,30 +1,30 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Forwarding Denied.
-
-
-Âà°en¨D³Q©Ú
-
-
-
-
-This cache will not forward your request because it is trying to enforce a
-sibling relationship. Perhaps the client at %i is a cache which has been
-misconfigured.
-
-¥»§Ö¨ú¦øªA¾¹±NµLªk´À±zÂà¦V±zªº³s½un¨D¡A¤]³\¬O¦]¬°±z©Ò¨Ï¥Îªº§Ö¨ú¦øªA¾¹¡]%i¡^¨Ã¥¼³Q¥»§Ö¨ú¦øªA¾¹
-³]©w¬°ã³\¶i¦æ¦s¨ú¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Forwarding Denied.
+
-
+Âà°en¨D³Q©Ú
+
+
+
+
+This cache will not forward your request because it is trying to enforce a
+sibling relationship. Perhaps the client at %i is a cache which has been
+misconfigured.
+
+¥»§Ö¨ú¦øªA¾¹±NµLªk´À±zÂà¦V±zªº³s½un¨D¡A¤]³\¬O¦]¬°±z©Ò¨Ï¥Îªº§Ö¨ú¦øªA¾¹¡]%i¡^¨Ã¥¼³Q¥»§Ö¨ú¦øªA¾¹
+³]©w¬°ã³\¶i¦æ¦s¨ú¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_DISABLED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_DISABLED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_DISABLED Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_DISABLED Tue Apr 17 03:48:32 2007
@@ -1,27 +1,27 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-FTP is Disabled
-
-
-¸T¤î¨Ï¥ÎÀÉ®×¶Ç¿é
-
-
-
-
-This cache does not support FTP.
-
-¥»§Ö¨ú¦øªA¾¹¨Ã¥¼¶}©ñ¤ä´©ÀÉ®×¶Ç¿éªA°È¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+FTP is Disabled
+
-
+¸T¤î¨Ï¥ÎÀÉ®×¶Ç¿é
+
+
+
+
+This cache does not support FTP.
+
+¥»§Ö¨ú¦øªA¾¹¨Ã¥¼¶}©ñ¤ä´©ÀÉ®×¶Ç¿éªA°È¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_FAILURE squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_FAILURE
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_FAILURE Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_FAILURE Tue Apr 17 03:48:32 2007
@@ -1,26 +1,26 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-¦b¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®Éµo¥ÍÀÉ®×¶Ç¿é³q°T¨ó©w¿ù»~¡G
-%U
-
-PROXY ¦øªA¾¹´À±z°e¥X¤U¦CÀÉ®×¶Ç¿é©R¥O¡G
-
%f
-ÀH«á¦¬¨ì³o¼Ëªº¦^À³¡G
-%F
-%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
-
-³o¥i¯à¬O¦]¬°¥]§t¤Fµ´¹ï¸ô®|ªº FTP ºô§}¡]URL¡^©Ò¾ÉPªº¡]¤£²Å¦X RFC 1738¡^¡C¦pªG¯uªº¬O¦]¬°
-³oÓì¦]¾ÉP³o¼Ëªº¿ù»~¡AÀÉ®×¥i¯à¥i¥H¦b%B³Q§ä¨ì¡C
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+¦b¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®Éµo¥ÍÀÉ®×¶Ç¿é³q°T¨ó©w¿ù»~¡G
+%U
+
+PROXY ¦øªA¾¹´À±z°e¥X¤U¦CÀÉ®×¶Ç¿é©R¥O¡G
+
%f
+ÀH«á¦¬¨ì³o¼Ëªº¦^À³¡G
+%F
+%g
+
+This might be caused by an FTP URL with an absolute path (which does
+not comply with RFC 1738). If this is the cause, then the file
+can be found at %B.
+
+³o¥i¯à¬O¦]¬°¥]§t¤Fµ´¹ï¸ô®|ªº FTP ºô§}¡]URL¡^©Ò¾ÉPªº¡]¤£²Å¦X RFC 1738¡^¡C¦pªG¯uªº¬O¦]¬°
+³oÓì¦]¾ÉP³o¼Ëªº¿ù»~¡AÀÉ®×¥i¯à¥i¥H¦b%B³Q§ä¨ì¡C
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED Tue Apr 17 03:48:32 2007
@@ -1,11 +1,11 @@
-
-ÀÉ®×¶Ç¿é PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q«Ø¥ß
+
+ÀÉ®×¶Ç¿é PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q«Ø¥ß
-
-©Òn¨Dªº«ü¥O¦¨¥\¦a³Q§¹¦¨
-Àɮפw³Q¦¨¥\¦a«Ø¥ß
-
-
-
-
+
+©Òn¨Dªº«ü¥O¦¨¥\¦a³Q§¹¦¨
+Àɮפw³Q¦¨¥\¦a«Ø¥ß
+
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR Tue Apr 17 03:48:32 2007
@@ -1,29 +1,29 @@
-
-¿ù»~¡GÀɮפW¶Ç¥¢±Ñ
+
+¿ù»~¡GÀɮפW¶Ç¥¢±Ñ
-
-¿ù»~
-ÀÉ®×¶Ç¿é¤W¶Ç¡]PUT¡^¥¢±Ñ
-
-
-·í¹Á¸Õ¤W¶Ç¡]PUT¡^¤U¦C¦ì¸m®É¡G
-%U
-
-§Ö¨ú¦øªA¾¹´À±zÂà°e¥X¤U¦CÀÉ®×¶Ç¿é©R¥O¡G
-
- %f
-
-ÀH«á¦¬¨ì³o¼Ëªº°T®§
-
- %F
-
-
-³oªí¥Ü¡G
-
-Check path, permissions, diskspace and try again.
-
-½Ð±zÀˬd¤W¶Ç¸ô®|¡A¤W¶Ç¦ì¸mªºÅª¼gÅv¡A¥i¨Ï¥ÎªºªÅ¶¡¤§«á¦A¸Õ¤@¹M¡C
-
-
-
+
+¿ù»~
+ÀÉ®×¶Ç¿é¤W¶Ç¡]PUT¡^¥¢±Ñ
+
+
+·í¹Á¸Õ¤W¶Ç¡]PUT¡^¤U¦C¦ì¸m®É¡G
+%U
+
+§Ö¨ú¦øªA¾¹´À±zÂà°e¥X¤U¦CÀÉ®×¶Ç¿é©R¥O¡G
+
+ %f
+
+ÀH«á¦¬¨ì³o¼Ëªº°T®§
+
+ %F
+
+
+³oªí¥Ü¡G
+
+Check path, permissions, diskspace and try again.
+
+½Ð±zÀˬd¤W¶Ç¸ô®|¡A¤W¶Ç¦ì¸mªºÅª¼gÅv¡A¥i¨Ï¥ÎªºªÅ¶¡¤§«á¦A¸Õ¤@¹M¡C
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED Tue Apr 17 03:48:32 2007
@@ -1,11 +1,11 @@
-
-ÀÉ®×¶Ç¿é PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q§ó·s
+
+ÀÉ®×¶Ç¿é PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q§ó·s
-
-¦¨¥\§¹¦¨©Òn¨Dªº«ü¥O
-Àɮפw³Q§ó·s¤F
-
-
-
-
+
+¦¨¥\§¹¦¨©Òn¨Dªº«ü¥O
+Àɮפw³Q§ó·s¤F
+
+
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_INVALID_REQ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_INVALID_REQ
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_INVALID_REQ Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_INVALID_REQ Tue Apr 17 03:48:32 2007
@@ -1,43 +1,43 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶i¦æ±z©Òn¨Dªº¤U¦Cµ{§Ç®É¡G
-
-%R
-
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Invalid Request
-
-
-¤£¥¿½Tªºn¨D
-
-
-
-
-Some aspect of the HTTP Request is invalid. Possible problems:
-
-µo¥Í¤F¤@¨Ç¤£¥¿½Tªº HTTP n¨D¡C¥i¯à¬O¤U¦Cªº°ÝÃD¡G
-
-- Missing or unknown request method
-
n¨D¤è¦¡¿ò¥¢©Î¬O¥¼ª¾
- - Missing URL
-
ºô¯¸¦ì¸m¿ò¥¢
- - Missing HTTP Identifier (HTTP/1.0)
-
HTTP ¼Ð·Çªº«Å§i¿ò¥¢¡]HTTP/1.0¡^
- - Request is too large
-
n¨D©R¥O¹Lªø
- - Content-Length missing for POST or PUT requests
-
¯Ê¤Ö POST ©Î PUT n¨D
- - Illegal character in hostname; underscores are not allowed
-
±ý³sµ²ªº¥D¾÷¦WºÙ¥]§t¤£¦Xªkªº¦r¤¸¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\¦s¦bªº¡C
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶i¦æ±z©Òn¨Dªº¤U¦Cµ{§Ç®É¡G
+
+%R
+
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Invalid Request
+
-
+¤£¥¿½Tªºn¨D
+
+
+
+
+Some aspect of the HTTP Request is invalid. Possible problems:
+
+µo¥Í¤F¤@¨Ç¤£¥¿½Tªº HTTP n¨D¡C¥i¯à¬O¤U¦Cªº°ÝÃD¡G
+
+- Missing or unknown request method
+
n¨D¤è¦¡¿ò¥¢©Î¬O¥¼ª¾
+ - Missing URL
+
ºô¯¸¦ì¸m¿ò¥¢
+ - Missing HTTP Identifier (HTTP/1.0)
+
HTTP ¼Ð·Çªº«Å§i¿ò¥¢¡]HTTP/1.0¡^
+ - Request is too large
+
n¨D©R¥O¹Lªø
+ - Content-Length missing for POST or PUT requests
+
¯Ê¤Ö POST ©Î PUT n¨D
+ - Illegal character in hostname; underscores are not allowed
+
±ý³sµ²ªº¥D¾÷¦WºÙ¥]§t¤£¦Xªkªº¦r¤¸¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\¦s¦bªº¡C
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_INVALID_URL squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_INVALID_URL
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_INVALID_URL Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_INVALID_URL Tue Apr 17 03:48:32 2007
@@ -1,37 +1,37 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Invalid URL
-
-
-¤£¥¿½Tªº¦ì¸m
-
-
-
-
-Some aspect of the requested URL is incorrect. Possible problems:
-
-±ý³sµ²ªº¦ì¸m¦³¤@¨Ç¤£¥¿½T¡C¥i¯à¬O¦]¬°¤U¦C°ÝÃD¡G
-
-- Missing or incorrect access protocol (should be `http://'' or similar)
-
¯Ê¤Ö©Î¤£¥¿½Tªº³q°T¨ó©w«Å§i¡]À³¸Ó¬O `http://''©Î¬OÃþ¦üªº¶}ÀY¡^
- - Missing hostname
-
¯Ê¤Ö±ý³sµ²ªº¥D¾÷¦WºÙ
- - Illegal double-escape in the URL-Path
-
¤£¦Xªkªººô¯¸³sµ²¸ô®|¡]¯Ê¤Ö `//''¡^
- - Illegal character in hostname; underscores are not allowed
-
¤£¦Xªkªº¦r¤¸¦s¦b©ó±ý³sµ²ªº¥D¾÷¦WºÙ¤¤¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\ªº
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Invalid URL
+
-
+¤£¥¿½Tªº¦ì¸m
+
+
+
+
+Some aspect of the requested URL is incorrect. Possible problems:
+
+±ý³sµ²ªº¦ì¸m¦³¤@¨Ç¤£¥¿½T¡C¥i¯à¬O¦]¬°¤U¦C°ÝÃD¡G
+
+- Missing or incorrect access protocol (should be `http://'' or similar)
+
¯Ê¤Ö©Î¤£¥¿½Tªº³q°T¨ó©w«Å§i¡]À³¸Ó¬O `http://''©Î¬OÃþ¦üªº¶}ÀY¡^
+ - Missing hostname
+
¯Ê¤Ö±ý³sµ²ªº¥D¾÷¦WºÙ
+ - Illegal double-escape in the URL-Path
+
¤£¦Xªkªººô¯¸³sµ²¸ô®|¡]¯Ê¤Ö `//''¡^
+ - Illegal character in hostname; underscores are not allowed
+
¤£¦Xªkªº¦r¤¸¦s¦b©ó±ý³sµ²ªº¥D¾÷¦WºÙ¤¤¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\ªº
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_LIFETIME_EXP squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_LIFETIME_EXP
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_LIFETIME_EXP Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_LIFETIME_EXP Tue Apr 17 03:48:32 2007
@@ -1,28 +1,28 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Connection Lifetime Expired
-
-
-¶W¹L³s½uµ¥«Ý®É
-
-
-
-
-Squid has terminated the request because it has exceeded the maximum
-connection lifetime.
-
-§Ö¨ú¦øªA¾¹¤w²×¤î±zªº³s½un¨D¡A¦]¬°¤w¸g¶W¹L³s½uµ¥«Ý®É¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Connection Lifetime Expired
+
-
+¶W¹L³s½uµ¥«Ý®É
+
+
+
+
+Squid has terminated the request because it has exceeded the maximum
+connection lifetime.
+
+§Ö¨ú¦øªA¾¹¤w²×¤î±zªº³s½un¨D¡A¦]¬°¤w¸g¶W¹L³s½uµ¥«Ý®É¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_NO_RELAY squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_NO_RELAY
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_NO_RELAY Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_NO_RELAY Tue Apr 17 03:48:32 2007
@@ -1,27 +1,27 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-No Wais Relay
-
-
-¤£´£¨Ñ Wais¡]¼s°ì¸ê°T¦øªA¾¹¡^Âà±µ
-
-
-
-
-There is no WAIS Relay host defined for this Cache! Yell at the administrator.
-
-¥»§Ö¨ú¦øªA¾¹¥¼´£¨Ñ WAIS ¼s°ì¸ê°T¦øªA¾¹ªA°È¡I¦p¦³ºÃ°Ý½Ð¬¢§Ö¨ú¦øªA¾¹ºÞ²zªÌ¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+No Wais Relay
+
-
+¤£´£¨Ñ Wais¡]¼s°ì¸ê°T¦øªA¾¹¡^Âà±µ
+
+
+
+
+There is no WAIS Relay host defined for this Cache! Yell at the administrator.
+
+¥»§Ö¨ú¦øªA¾¹¥¼´£¨Ñ WAIS ¼s°ì¸ê°T¦øªA¾¹ªA°È¡I¦p¦³ºÃ°Ý½Ð¬¢§Ö¨ú¦øªA¾¹ºÞ²zªÌ¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS Tue Apr 17 03:48:32 2007
@@ -1,33 +1,33 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Valid document was not found in the cache and
only-if-cached
-directive was specified.
--
-±zn¨Dªº¤å¥ó¨Ã¥¼¦s¦b©ó¥»§Ö¨ú¦øªA¾¹¤W¡A¦Ó¥B±z³]©w¤F
only-if-cached
-«ü¥O¡C
-
-
-
-
-
-You have issued a request with a only-if-cached
cache control
-directive. The document was not found in the cache, or it required
-revalidation prohibited by only-if-cached
directive.
-
-±z°e¥X¤F¤@Ó¥]§t only-if-cached
§Ö¨ú±±¨î«ü¥Oªº³sµ²n¨D¡C¦Ó¤å¥ó¨Ã¥¼¦s¦b§Ö¨ú¦øªA¾¹¤¤¡A©ÎªÌ
-³oÓ³s½un¨D³Q only-if-cached
«ü¥O»{©w¬O¸T¥Îªº¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Valid document was not found in the cache and
only-if-cached
+directive was specified.
+-
+±zn¨Dªº¤å¥ó¨Ã¥¼¦s¦b©ó¥»§Ö¨ú¦øªA¾¹¤W¡A¦Ó¥B±z³]©w¤F
only-if-cached
+«ü¥O¡C
+
+
+
+
+
+You have issued a request with a only-if-cached
cache control
+directive. The document was not found in the cache, or it required
+revalidation prohibited by only-if-cached
directive.
+
+±z°e¥X¤F¤@Ó¥]§t only-if-cached
§Ö¨ú±±¨î«ü¥Oªº³sµ²n¨D¡C¦Ó¤å¥ó¨Ã¥¼¦s¦b§Ö¨ú¦øªA¾¹¤¤¡A©ÎªÌ
+³oÓ³s½un¨D³Q only-if-cached
«ü¥O»{©w¬O¸T¥Îªº¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_READ_ERROR squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_READ_ERROR
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_READ_ERROR Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_READ_ERROR Tue Apr 17 03:48:32 2007
@@ -1,32 +1,32 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Read Error
-
-
-Ū¨ú¿ù»~
-
-
-
-
-¨t²Î¦^À³¡G
-
%E
-
-
-An error condition occurred while reading data from the network. Please
-retry your request.
-
-¥¿¦b³z¹Lºô¸ôŪ¨ú¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð¦A¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Read Error
+
-
+Ū¨ú¿ù»~
+
+
+
+
+¨t²Î¦^À³¡G
+
%E
+
+
+An error condition occurred while reading data from the network. Please
+retry your request.
+
+¥¿¦b³z¹Lºô¸ôŪ¨ú¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð¦A¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_READ_TIMEOUT squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_READ_TIMEOUT
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_READ_TIMEOUT Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_READ_TIMEOUT Tue Apr 17 03:48:32 2007
@@ -1,33 +1,33 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Read Timeout
-
-
-¶W¹LŪ¨ú®É
-
-
-
-
-¨t²Î¦^À³¡G
-
%E
-
-
-A Timeout occurred while waiting to read data from the network. The network
-or server may be down or congested. Please retry your request.
-
-·í³z¹Lºô¸ôŪ¨ú¸ê®Æ®É¡A¶W¹L¤Fµ¥«Ý®É¡C³o¥i¯à¬O¦]¬°ºô¸ô©Î¬O±ý³sµ²ªººô¯¸¦øªA¾¹µo¥Í¾Ã¶ë©Î·lÃa¡C
-½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Read Timeout
+
-
+¶W¹LŪ¨ú®É
+
+
+
+
+¨t²Î¦^À³¡G
+
%E
+
+
+A Timeout occurred while waiting to read data from the network. The network
+or server may be down or congested. Please retry your request.
+
+·í³z¹Lºô¸ôŪ¨ú¸ê®Æ®É¡A¶W¹L¤Fµ¥«Ý®É¡C³o¥i¯à¬O¦]¬°ºô¸ô©Î¬O±ý³sµ²ªººô¯¸¦øªA¾¹µo¥Í¾Ã¶ë©Î·lÃa¡C
+½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_SHUTTING_DOWN squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_SHUTTING_DOWN Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_SHUTTING_DOWN Tue Apr 17 03:48:32 2007
@@ -1,22 +1,22 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-
-¥»ºô¸ô§Ö¨ú¦øªA¾¹¥Ø«e¥¿¦b¶i¦æÃö³¬µ{§Ç¡A¼È®ÉµLªk¹ï±zªº³s½un¨D´£¨ÑªA°È¡C
-½Ðµy«Ý¤ù¨è«·s¹Á¸Õ³s½u¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+
+This cache is in the process of shutting down and can not
+service your request at this time. Please retry your
+request again soon.
+
+¥»ºô¸ô§Ö¨ú¦øªA¾¹¥Ø«e¥¿¦b¶i¦æÃö³¬µ{§Ç¡A¼È®ÉµLªk¹ï±zªº³s½un¨D´£¨ÑªA°È¡C
+½Ðµy«Ý¤ù¨è«·s¹Á¸Õ³s½u¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_SOCKET_FAILURE squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_SOCKET_FAILURE Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_SOCKET_FAILURE Tue Apr 17 03:48:32 2007
@@ -1,33 +1,33 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Socket Failure
-
-
-Socket «Ø¥ß¥¢±Ñ
-
-
-
-
-¨t²Î¦^À³¡G
-
%E
-
-
-Squid is unable to create a TCP socket, presumably due to excessive load.
-Please retry your request.
-
-Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^µLªk«Ø¥ß TCP socket¡A¥i¯à¬O¦]¬°¹L«ªºt²ü¾ÉP³oÓ°ÝÃD¡A
-½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Socket Failure
+
-
+Socket «Ø¥ß¥¢±Ñ
+
+
+
+
+¨t²Î¦^À³¡G
+
%E
+
+
+Squid is unable to create a TCP socket, presumably due to excessive load.
+Please retry your request.
+
+Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^µLªk«Ø¥ß TCP socket¡A¥i¯à¬O¦]¬°¹L«ªºt²ü¾ÉP³oÓ°ÝÃD¡A
+½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_UNSUP_REQ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_UNSUP_REQ
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_UNSUP_REQ Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_UNSUP_REQ Tue Apr 17 03:48:32 2007
@@ -1,30 +1,30 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Unsupported Request Method and Protocol
-
-
-©|¥¼¤ä´©ªºn¨D¤è¦¡©Î³q°T¨ó©w
-
-
-
-
-Squid does not support all request methods for all access protocols.
-For example, you can not POST a Gopher request.
-
-¦]¬° Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¤ä´©©Ò¦³ªº³sµ²n¨D¤è¦¡¦b¦U¦¡³q°T¨ó©w¤W¡C
-¤ñ¦p»¡¡A§A¤£¯àn¨D¤@Ó GOPHER ªº POST ³sµ²n¨D¡C
-
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Unsupported Request Method and Protocol
+
-
+©|¥¼¤ä´©ªºn¨D¤è¦¡©Î³q°T¨ó©w
+
+
+
+
+Squid does not support all request methods for all access protocols.
+For example, you can not POST a Gopher request.
+
+¦]¬° Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¤ä´©©Ò¦³ªº³sµ²n¨D¤è¦¡¦b¦U¦¡³q°T¨ó©w¤W¡C
+¤ñ¦p»¡¡A§A¤£¯àn¨D¤@Ó GOPHER ªº POST ³sµ²n¨D¡C
+
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_URN_RESOLVE squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_URN_RESOLVE
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_URN_RESOLVE Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_URN_RESOLVE Tue Apr 17 03:48:32 2007
@@ -1,27 +1,27 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-URN ¤¤ªº¤@Óºô§}¡]URL¡^µLªk³Q¶Ç¦^
-
-
-·í¦b¹Á¸Õ¶Ç¦^¤U¦C URN ¦ì¸m®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Cannot Resolve URN
-
-
-µLªk¸ÑĶ URN
-
-
-
-
-Hey, don't expect too much from URNs on %T :)
-
-©êºp¡I±z¤£¯à¹ï URNs ¦b %T ¤W´Á«Ý¤Ó¦h :)
-
+
+¿ù»~
+URN ¤¤ªº¤@Óºô§}¡]URL¡^µLªk³Q¶Ç¦^
+
+
+·í¦b¹Á¸Õ¶Ç¦^¤U¦C URN ¦ì¸m®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Cannot Resolve URN
+
-
+µLªk¸ÑĶ URN
+
+
+
+
+Hey, don't expect too much from URNs on %T :)
+
+©êºp¡I±z¤£¯à¹ï URNs ¦b %T ¤W´Á«Ý¤Ó¦h :)
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_WRITE_ERROR squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_WRITE_ERROR
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_WRITE_ERROR Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_WRITE_ERROR Tue Apr 17 03:48:32 2007
@@ -1,32 +1,32 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Write Error
-
-
-¼g¤J¿ù»~
-
-
-
-
-¨t²Î¦^À³¡G
-
%E
-
-
-An error condition occurred while writing to the network. Please retry your
-request.
-
-¥¿¦b³z¹Lºô¸ô¼g¤J¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Write Error
+
-
+¼g¤J¿ù»~
+
+
+
+
+¨t²Î¦^À³¡G
+
%E
+
+
+An error condition occurred while writing to the network. Please retry your
+request.
+
+¥¿¦b³z¹Lºô¸ô¼g¤J¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+
diff -ruN squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
--- squid-2.6.STABLE12/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT Wed Aug 28 15:02:23 2002
+++ squid-2.6.STABLE13/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT Tue Apr 17 03:48:32 2007
@@ -1,27 +1,27 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
-
-
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
-%U
-
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
-
--
-
-Zero Sized Reply
-
-
-¤j¤p¬°¹sªº¸ê®Æ¦^À³
-
-
-
-
-Squid did not receive any data for this request.
-
-±zªº¦¹¦¸³s½un¨D¡ASquid¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¦Û±ý³sµ²ªººô¯¸¦øªA¾¹±µ¦¬¨ì¥ô¦ó¸ê®Æ¡C
-
+
+¿ù»~
+±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
+·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+%U
+
+µo¥Í¤F¤U¦Cªº¿ù»~¡G
+
+-
+
+Zero Sized Reply
+
-
+¤j¤p¬°¹sªº¸ê®Æ¦^À³
+
+
+
+
+Squid did not receive any data for this request.
+
+±zªº¦¹¦¸³s½un¨D¡ASquid¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¦Û±ý³sµ²ªººô¯¸¦øªA¾¹±µ¦¬¨ì¥ô¦ó¸ê®Æ¡C
+
diff -ruN squid-2.6.STABLE12/include/autoconf.h.in squid-2.6.STABLE13/include/autoconf.h.in
--- squid-2.6.STABLE12/include/autoconf.h.in Mon Mar 12 20:36:39 2007
+++ squid-2.6.STABLE13/include/autoconf.h.in Sat May 5 16:41:19 2007
@@ -534,6 +534,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_SOCKET_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STATFS_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_STATVFS_H
diff -ruN squid-2.6.STABLE12/include/squid_mswin.h squid-2.6.STABLE13/include/squid_mswin.h
--- squid-2.6.STABLE12/include/squid_mswin.h Sun Dec 10 06:36:23 2006
+++ squid-2.6.STABLE13/include/squid_mswin.h Thu Apr 26 17:09:46 2007
@@ -1,5 +1,5 @@
/*
- * $Id: squid_mswin.h,v 1.4 2006/12/10 13:36:23 serassio Exp $
+ * $Id: squid_mswin.h,v 1.4.2.1 2007/04/26 23:09:46 hno Exp $
*
* AUTHOR: Andrey Shorin
* AUTHOR: Guido Serassio
@@ -262,6 +262,7 @@
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EALREADY WSAEALREADY
#define ETIMEDOUT WSAETIMEDOUT
+#define ECONNABORTED WSAECONNABORTED
#define ECONNREFUSED WSAECONNREFUSED
#define ECONNRESET WSAECONNRESET
#define ERESTART WSATRY_AGAIN
diff -ruN squid-2.6.STABLE12/include/version.h squid-2.6.STABLE13/include/version.h
--- squid-2.6.STABLE12/include/version.h Tue Mar 20 15:35:44 2007
+++ squid-2.6.STABLE13/include/version.h Thu May 10 17:59:36 2007
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1174426541
+#define SQUID_RELEASE_TIME 1178841571
#endif
diff -ruN squid-2.6.STABLE12/src/Makefile.am squid-2.6.STABLE13/src/Makefile.am
--- squid-2.6.STABLE12/src/Makefile.am Sun Oct 29 17:07:33 2006
+++ squid-2.6.STABLE13/src/Makefile.am Sat May 5 16:06:55 2007
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.am,v 1.56 2006/10/30 00:07:33 hno Exp $
+# $Id: Makefile.am,v 1.56.2.1 2007/05/05 22:06:55 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -266,6 +266,12 @@
-lmiscutil \
@XTRA_LIBS@ \
$(MINGWEXLIB)
+
+squid_DEPENDENCIES = \
+ $(REPL_OBJS) \
+ $(STORE_OBJS) \
+ $(AUTH_OBJS) \
+ $(SNMPLIB)
unlinkd_SOURCES =
unlinkd_LDADD = unlinkd-daemon.o
diff -ruN squid-2.6.STABLE12/src/Makefile.in squid-2.6.STABLE13/src/Makefile.in
--- squid-2.6.STABLE12/src/Makefile.in Sat Nov 4 16:20:03 2006
+++ squid-2.6.STABLE13/src/Makefile.in Sat May 5 16:06:55 2007
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.281 2006/11/04 23:20:03 hno Exp $
+# $Id: Makefile.in,v 1.281.2.1 2007/05/05 22:06:55 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
@@ -162,7 +162,6 @@
string_arrays.$(OBJEXT)
squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS)
am__DEPENDENCIES_1 =
-squid_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_unlinkd_OBJECTS =
unlinkd_OBJECTS = $(am_unlinkd_OBJECTS)
unlinkd_DEPENDENCIES = unlinkd-daemon.o
@@ -564,6 +563,12 @@
-lmiscutil \
@XTRA_LIBS@ \
$(MINGWEXLIB)
+
+squid_DEPENDENCIES = \
+ $(REPL_OBJS) \
+ $(STORE_OBJS) \
+ $(AUTH_OBJS) \
+ $(SNMPLIB)
unlinkd_SOURCES =
unlinkd_LDADD = unlinkd-daemon.o
diff -ruN squid-2.6.STABLE12/src/cf.data.pre squid-2.6.STABLE13/src/cf.data.pre
--- squid-2.6.STABLE12/src/cf.data.pre Sat Feb 3 14:59:24 2007
+++ squid-2.6.STABLE13/src/cf.data.pre Tue Apr 24 15:30:03 2007
@@ -1,6 +1,6 @@
#
-# $Id: cf.data.pre,v 1.382.2.1 2007/02/03 21:59:24 hno Exp $
+# $Id: cf.data.pre,v 1.382.2.2 2007/04/24 21:30:03 hno Exp $
#
#
# SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -461,7 +461,7 @@
connect-timeout=nn
digest-url=url
allow-miss
- max-conn
+ max-conn=n
htcp
htcp-oldsquid
carp-load-factor
@@ -567,7 +567,7 @@
requests from peer by denying cache_peer_access if the
source is a peer)
- use 'max-conn' to limit the amount of connections Squid
+ use 'max-conn=n' to limit the amount of connections Squid
may open to this peer.
use 'htcp' to send HTCP, instead of ICP, queries
diff -ruN squid-2.6.STABLE12/src/comm.c squid-2.6.STABLE13/src/comm.c
--- squid-2.6.STABLE12/src/comm.c Mon Oct 23 05:22:21 2006
+++ squid-2.6.STABLE13/src/comm.c Tue Apr 17 03:39:56 2007
@@ -1,6 +1,6 @@
/*
- * $Id: comm.c,v 1.358 2006/10/23 11:22:21 hno Exp $
+ * $Id: comm.c,v 1.358.2.1 2007/04/17 09:39:56 hno Exp $
*
* DEBUG: section 5 Socket Functions
* AUTHOR: Harvest Derived
@@ -550,7 +550,7 @@
Slen = sizeof(P);
statCounter.syscalls.sock.accepts++;
if ((sock = accept(fd, (struct sockaddr *) &P, &Slen)) < 0) {
- if (ignoreErrno(errno)) {
+ if (ignoreErrno(errno) || errno == ECONNREFUSED || errno == ECONNABORTED) {
debug(5, 5) ("comm_accept: FD %d: %s\n", fd, xstrerror());
return COMM_NOMESSAGE;
} else if (ENFILE == errno || EMFILE == errno) {
diff -ruN squid-2.6.STABLE12/src/forward.c squid-2.6.STABLE13/src/forward.c
--- squid-2.6.STABLE12/src/forward.c Sat Feb 3 14:53:38 2007
+++ squid-2.6.STABLE13/src/forward.c Tue Apr 17 03:35:17 2007
@@ -1,6 +1,6 @@
/*
- * $Id: forward.c,v 1.120.2.1 2007/02/03 21:53:38 hno Exp $
+ * $Id: forward.c,v 1.120.2.3 2007/04/17 09:35:17 hno Exp $
*
* DEBUG: section 17 Request Forwarding
* AUTHOR: Duane Wessels
@@ -120,7 +120,7 @@
fwdState->request = NULL;
if (fwdState->err)
errorStateFree(fwdState->err);
- storeClientUnregisterAbort(e);
+ storeUnregisterAbort(e);
storeUnlockObject(e);
fwdState->entry = NULL;
sfd = fwdState->server_fd;
@@ -319,6 +319,7 @@
fd_table[fd].ssl = ssl;
fd_table[fd].read_method = &ssl_read_method;
fd_table[fd].write_method = &ssl_write_method;
+ fd_note(fd, "Negotiating SSL");
fwdNegotiateSSL(fd, fwdState);
}
#endif
@@ -357,10 +358,6 @@
comm_close(server_fd);
} else {
debug(17, 3) ("fwdConnectDone: FD %d: '%s'\n", server_fd, storeUrl(fwdState->entry));
- fd_note(server_fd, storeUrl(fwdState->entry));
- fd_table[server_fd].uses++;
- if (fd_table[server_fd].uses == 1 && fs->peer)
- peerConnectSucceded(fs->peer);
#if USE_SSL
if ((fs->peer && fs->peer->use_ssl) ||
(!fs->peer && request->protocol == PROTO_HTTPS)) {
@@ -535,7 +532,7 @@
hierarchyNote(&fwdState->request->hier, fs->code, fd_table[fd].ipaddr);
else
hierarchyNote(&fwdState->request->hier, fs->code, name);
- fwdConnectDone(fd, COMM_OK, fwdState);
+ fwdDispatch(fwdState);
return;
} else {
/* Discard the persistent connection to not cause
@@ -653,6 +650,7 @@
StoreEntry *entry = fwdState->entry;
ErrorState *err;
int server_fd = fwdState->server_fd;
+ FwdServer *fs = fwdState->servers;
debug(17, 3) ("fwdDispatch: FD %d: Fetching '%s %s'\n",
fwdState->client_fd,
RequestMethodStr[request->method],
@@ -667,6 +665,10 @@
assert(entry->ping_status != PING_WAITING);
assert(entry->lock_count);
EBIT_SET(entry->flags, ENTRY_DISPATCHED);
+ fd_note(server_fd, storeUrl(fwdState->entry));
+ fd_table[server_fd].uses++;
+ if (fd_table[server_fd].uses == 1 && fs->peer)
+ peerConnectSucceded(fs->peer);
netdbPingSite(request->host);
entry->mem_obj->refresh_timestamp = squid_curtime;
if (fwdState->servers && (p = fwdState->servers->peer)) {
diff -ruN squid-2.6.STABLE12/src/fs/coss/store_dir_coss.c squid-2.6.STABLE13/src/fs/coss/store_dir_coss.c
--- squid-2.6.STABLE12/src/fs/coss/store_dir_coss.c Sat Mar 3 06:32:44 2007
+++ squid-2.6.STABLE13/src/fs/coss/store_dir_coss.c Sat May 5 16:03:47 2007
@@ -1,6 +1,6 @@
/*
- * $Id: store_dir_coss.c,v 1.66.2.1 2007/03/03 13:32:44 hno Exp $
+ * $Id: store_dir_coss.c,v 1.66.2.4 2007/05/05 22:03:47 hno Exp $
*
* DEBUG: section 47 Store COSS Directory Routines
* AUTHOR: Eric Stern
@@ -1076,9 +1076,9 @@
} else if (choosenext) {
last_coss_pick_index = i;
return SD;
- } else if (last_coss_pick_index == i) {
- choosenext = 1;
}
+ } else if (last_coss_pick_index == i) {
+ choosenext = 1;
}
}
}
@@ -1260,7 +1260,7 @@
int j = 0;
int bl = 0;
int tmp;
- squid_off_t *l, len;
+ squid_off_t *l, len = 0;
int blocksize = cs->blksz_mask + 1;
StoreEntry tmpe;
cache_key key[MD5_DIGEST_CHARS];
@@ -1299,22 +1299,33 @@
debug(47, 3) ("Size: %" PRINTF_OFF_T " (len %d)\n", *l, t->length);
break;
case STORE_META_KEY:
- assert(t->length == MD5_DIGEST_CHARS);
+ if (t->length != MD5_DIGEST_CHARS) {
+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_KEY length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j);
+ goto nextobject;
+ }
xmemcpy(key, t->value, MD5_DIGEST_CHARS);
break;
#if SIZEOF_SQUID_FILE_SZ == SIZEOF_SIZE_T
case STORE_META_STD:
- assert(t->length == STORE_HDR_METASIZE);
+ if (t->length != STORE_HDR_METASIZE) {
+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j);
+ goto nextobject;
+ }
xmemcpy(&tmpe.timestamp, t->value, STORE_HDR_METASIZE);
break;
#else
case STORE_META_STD_LFS:
- assert(t->length == STORE_HDR_METASIZE);
+ if (t->length != STORE_HDR_METASIZE) {
+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD_LFS length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j);
+ goto nextobject;
+ }
xmemcpy(&tmpe.timestamp, t->value, STORE_HDR_METASIZE);
break;
case STORE_META_STD:
- assert(t->length == STORE_HDR_METASIZE_OLD);
- {
+ if (t->length != STORE_HDR_METASIZE_OLD) {
+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j);
+ goto nextobject;
+ } {
struct {
time_t timestamp;
time_t lastref;
diff -ruN squid-2.6.STABLE12/src/ftp.c squid-2.6.STABLE13/src/ftp.c
--- squid-2.6.STABLE12/src/ftp.c Mon Feb 26 15:48:48 2007
+++ squid-2.6.STABLE13/src/ftp.c Mon Mar 26 17:41:43 2007
@@ -1,6 +1,6 @@
/*
- * $Id: ftp.c,v 1.342.2.1 2007/02/26 22:48:48 hno Exp $
+ * $Id: ftp.c,v 1.342.2.2 2007/03/26 23:41:43 hno Exp $
*
* DEBUG: section 9 File Transfer Protocol (FTP)
* AUTHOR: Harvest Derived
@@ -282,7 +282,6 @@
if (ftpState == NULL)
return;
debug(9, 3) ("ftpStateFree: %s\n", storeUrl(ftpState->entry));
- storeClientUnregisterAbort(ftpState->entry);
storeUnlockObject(ftpState->entry);
if (ftpState->reply_hdr) {
memFree(ftpState->reply_hdr, MEM_8K_BUF);
diff -ruN squid-2.6.STABLE12/src/http.c squid-2.6.STABLE13/src/http.c
--- squid-2.6.STABLE12/src/http.c Mon Mar 12 16:27:09 2007
+++ squid-2.6.STABLE13/src/http.c Mon Mar 26 17:08:00 2007
@@ -1,6 +1,6 @@
/*
- * $Id: http.c,v 1.419.2.6 2007/03/12 22:27:09 hno Exp $
+ * $Id: http.c,v 1.419.2.7 2007/03/26 23:08:00 hno Exp $
*
* DEBUG: section 11 Hypertext Transfer Protocol (HTTP)
* AUTHOR: Harvest Derived
@@ -633,6 +633,7 @@
int fd = httpState->fd;
int complete = httpState->eof;
int keep_alive = !httpState->eof;
+ storeBuffer(entry);
while (len > 0) {
if (httpState->chunk_size > 0) {
size_t size = len;
@@ -707,6 +708,15 @@
return;
}
}
+ storeBufferFlush(entry);
+ if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
+ /*
+ * the above storeBufferFlush() call could ABORT this entry,
+ * in that case, the server FD should already be closed.
+ * there's nothing for us to do.
+ */
+ return;
+ }
if (!httpState->chunk_size && !httpState->flags.chunked)
complete = 1;
if (!complete && len == 0) {
@@ -912,6 +922,12 @@
return;
} else {
if (httpState->reply_hdr_state < 2) {
+ /* Temporarily buffer the entry. Main purpose is to ensure it gets
+ * flushed to the client side when the headers is complete as
+ * ENTRY_HDR_WAIT may delay the callback. It's flushed by
+ * httpAppendBody().
+ */
+ storeBuffer(entry);
done = httpProcessReplyHeader(httpState, buf, len);
if (httpState->reply_hdr_state == 2) {
http_status s = entry->mem_obj->reply->sline.status;
diff -ruN squid-2.6.STABLE12/src/protos.h squid-2.6.STABLE13/src/protos.h
--- squid-2.6.STABLE12/src/protos.h Sat Jan 6 10:22:45 2007
+++ squid-2.6.STABLE13/src/protos.h Mon Mar 26 17:14:09 2007
@@ -1,6 +1,6 @@
/*
- * $Id: protos.h,v 1.520 2007/01/06 17:22:45 hno Exp $
+ * $Id: protos.h,v 1.520.2.1 2007/03/26 23:14:09 hno Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -920,7 +920,7 @@
extern int storeEntryValidToSend(StoreEntry *);
extern void storeTimestampsSet(StoreEntry *);
extern void storeRegisterAbort(StoreEntry * e, STABH * cb, void *);
-extern void storeClientUnregisterAbort(StoreEntry * e);
+extern void storeUnregisterAbort(StoreEntry * e);
extern void storeMemObjectDump(MemObject * mem);
extern void storeEntryDump(const StoreEntry * e, int debug_lvl);
extern const char *storeUrl(const StoreEntry *);
diff -ruN squid-2.6.STABLE12/src/refresh.c squid-2.6.STABLE13/src/refresh.c
--- squid-2.6.STABLE12/src/refresh.c Thu Jan 18 17:21:01 2007
+++ squid-2.6.STABLE13/src/refresh.c Thu Apr 26 17:10:54 2007
@@ -1,6 +1,6 @@
/*
- * $Id: refresh.c,v 1.63 2007/01/19 00:21:01 hno Exp $
+ * $Id: refresh.c,v 1.63.2.1 2007/04/26 23:10:54 hno Exp $
*
* DEBUG: section 22 Refresh Calculation
* AUTHOR: Harvest Derived
@@ -344,23 +344,22 @@
* immediately, and which can't be refreshed.
*/
int reason = refreshCheck(entry, NULL, Config.minimum_expiry_time);
+ int can_revalidate = 0;
refreshCounts[rcStore].total++;
refreshCounts[rcStore].status[reason]++;
if (reason < 200)
/* Does not need refresh. This is certainly cachable */
return 1;
- if (entry->lastmod < 0)
- /* Last modified is needed to do a refresh */
- return 0;
- if (entry->mem_obj == NULL)
- /* no mem_obj? */
- return 1;
- if (entry->mem_obj->reply == NULL)
- /* no reply? */
- return 1;
- if (entry->mem_obj->reply->content_length == 0)
- /* No use refreshing (caching?) 0 byte objects */
+ if (entry->lastmod > 0)
+ can_revalidate = 1;
+ if (entry->mem_obj && entry->mem_obj->reply) {
+ if (httpHeaderHas(&entry->mem_obj->reply->header, HDR_ETAG))
+ can_revalidate = 1;
+ }
+ /* Last modified is needed to do a refresh */
+ if (!can_revalidate)
return 0;
+
/* This seems to be refreshable. Cache it */
return 1;
}
diff -ruN squid-2.6.STABLE12/src/store.c squid-2.6.STABLE13/src/store.c
--- squid-2.6.STABLE12/src/store.c Tue Feb 6 17:39:49 2007
+++ squid-2.6.STABLE13/src/store.c Mon Mar 26 17:14:10 2007
@@ -1,6 +1,6 @@
/*
- * $Id: store.c,v 1.570.2.2 2007/02/07 00:39:49 hno Exp $
+ * $Id: store.c,v 1.570.2.3 2007/03/26 23:14:10 hno Exp $
*
* DEBUG: section 20 Storage Manager
* AUTHOR: Harvest Derived
@@ -1708,7 +1708,7 @@
}
void
-storeClientUnregisterAbort(StoreEntry * e)
+storeUnregisterAbort(StoreEntry * e)
{
MemObject *mem = e->mem_obj;
assert(mem);
diff -ruN squid-2.6.STABLE12/src/store_dir.c squid-2.6.STABLE13/src/store_dir.c
--- squid-2.6.STABLE12/src/store_dir.c Sat Feb 3 14:56:56 2007
+++ squid-2.6.STABLE13/src/store_dir.c Sat May 5 16:41:21 2007
@@ -1,6 +1,6 @@
/*
- * $Id: store_dir.c,v 1.143.2.1 2007/02/03 21:56:56 hno Exp $
+ * $Id: store_dir.c,v 1.143.2.2 2007/05/05 22:41:21 hno Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Duane Wessels
@@ -43,6 +43,9 @@
/* Windows uses sys/vfs.h */
#if HAVE_SYS_VFS_H
#include
+#endif
+#if HAVE_SYS_STATFS_H
+#include
#endif
static int storeDirValidSwapDirSize(int, squid_off_t);
diff -ruN squid-2.6.STABLE12/src/structs.h squid-2.6.STABLE13/src/structs.h
--- squid-2.6.STABLE12/src/structs.h Mon Feb 26 18:20:01 2007
+++ squid-2.6.STABLE13/src/structs.h Thu Apr 26 17:11:51 2007
@@ -1,6 +1,6 @@
/*
- * $Id: structs.h,v 1.507.2.4 2007/02/27 01:20:01 hno Exp $
+ * $Id: structs.h,v 1.507.2.5 2007/04/26 23:11:51 hno Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -1884,7 +1884,7 @@
int imslen;
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
- in_port_t client_port;
+ unsigned short client_port;
struct in_addr client_addr;
#if FOLLOW_X_FORWARDED_FOR
struct in_addr indirect_client_addr; /* after following X-Forwarded-For */
diff -ruN squid-2.6.STABLE12/src/wccp2.c squid-2.6.STABLE13/src/wccp2.c
--- squid-2.6.STABLE12/src/wccp2.c Thu Dec 7 15:32:22 2006
+++ squid-2.6.STABLE13/src/wccp2.c Tue Apr 17 03:40:59 2007
@@ -1,6 +1,6 @@
/*
- * $Id: wccp2.c,v 1.30 2006/12/07 22:32:22 adrian Exp $
+ * $Id: wccp2.c,v 1.30.2.1 2007/04/17 09:40:59 hno Exp $
*
* DEBUG: section 80 WCCP Support
* AUTHOR: Steven WIlton
@@ -1629,6 +1629,7 @@
if (srv->wccp2_security_type == WCCP2_MD5_SECURITY) {
storeAppendPrintf(e, " %s", srv->wccp_password);
}
+ storeAppendPrintf(e, "\n");
srv = srv->next;
}
}