diff -u -r -N squid-3.1.0.17/ChangeLog squid-3.1.0.18/ChangeLog
--- squid-3.1.0.17/ChangeLog 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/ChangeLog 2010-03-14 20:06:08.000000000 +1300
@@ -1,3 +1,14 @@
+Changes to squid-3.1.0.18 (14 Mar 2010):
+
+ - Regression Fix: IPv4-mapped prefix, broken in 3.1.0.16
+ - Bug 2869: Remove unused external reference
+ - Bug 2866: Support OpenSSL 1.0
+ - Bug 2813: Random unix_group crash at startup
+ - Send HTTP1.1 compliant 417 responses
+ - Associate external acl message with the request
+ - Various Digest parser fixes
+ - ... and all bug fixes from 3.0 up to 3.0.STABLE25
+
Changes to squid-3.1.0.17 (24 Feb 2010):
- Regression Fix: Non-English error page UTF encoding
@@ -289,6 +300,14 @@
- Bug #2223: Follow XFF extensions added
- ... and many code and documentation cleanups
+Changes to squid-3.0.STABLE25 (14 Mar 2010):
+
+ - Bug 2845: Rework the http digest auth parser
+ - Bug 2787: unknown/unexpected status code messages
+ - Bug 2507: squid_ldap_group: Strip Domain name separated by +
+ - Bug 2367: stale=true on digest requests with unknown nonce
+ - ... and several other minor corrections
+
Changes to squid-3.0.STABLE24 (13 Feb 2010):
- Bug 2858: Segment violation in HTCP
diff -u -r -N squid-3.1.0.17/configure squid-3.1.0.18/configure
--- squid-3.1.0.17/configure 2010-02-25 01:01:41.000000000 +1300
+++ squid-3.1.0.18/configure 2010-03-14 20:06:46.000000000 +1300
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.in Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.1.0.17.
+# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.1.0.18.
#
# Report bugs to .
#
@@ -751,8 +751,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.1.0.17'
-PACKAGE_STRING='Squid Web Proxy 3.1.0.17'
+PACKAGE_VERSION='3.1.0.18'
+PACKAGE_STRING='Squid Web Proxy 3.1.0.18'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_unique_file="src/main.cc"
@@ -1692,7 +1692,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 3.1.0.17 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.1.0.18 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1762,7 +1762,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.1.0.17:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.1.0.18:";;
esac
cat <<\_ACEOF
@@ -2094,7 +2094,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.1.0.17
+Squid Web Proxy configure 3.1.0.18
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2108,7 +2108,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 3.1.0.17, which was
+It was created by Squid Web Proxy $as_me 3.1.0.18, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2826,7 +2826,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.1.0.17'
+ VERSION='3.1.0.18'
cat >>confdefs.h <<_ACEOF
@@ -51116,7 +51116,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 3.1.0.17, which was
+This file was extended by Squid Web Proxy $as_me 3.1.0.18, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -51169,7 +51169,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-Squid Web Proxy config.status 3.1.0.17
+Squid Web Proxy config.status 3.1.0.18
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -u -r -N squid-3.1.0.17/configure.in squid-3.1.0.18/configure.in
--- squid-3.1.0.17/configure.in 2010-02-25 01:01:41.000000000 +1300
+++ squid-3.1.0.18/configure.in 2010-03-14 20:06:46.000000000 +1300
@@ -2,7 +2,7 @@
dnl
dnl $Id$
dnl
-AC_INIT([Squid Web Proxy],[3.1.0.17],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.1.0.18],[http://www.squid-cache.org/bugs/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.1.0.17/errors/af/ERR_INVALID_REQ squid-3.1.0.18/errors/af/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/af/ERR_INVALID_REQ 2010-02-25 01:03:00.000000000 +1300
+++ squid-3.1.0.18/errors/af/ERR_INVALID_REQ 2010-03-14 20:08:14.000000000 +1300
@@ -1 +1 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/aliases squid-3.1.0.18/errors/aliases
--- squid-3.1.0.17/errors/aliases 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/errors/aliases 2010-03-14 20:06:08.000000000 +1300
@@ -27,7 +27,7 @@
ro ro-ro ro-md
ru ru-ru
sk sk-sk
-sr sr-sp
+sr-latn sr sr-sp sr-latn-cs
sv sv-fi sv-se
th th-th
tr tr-tr
diff -u -r -N squid-3.1.0.17/errors/ar/ERR_INVALID_REQ squid-3.1.0.18/errors/ar/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ar/ERR_INVALID_REQ 2010-02-25 01:03:15.000000000 +1300
+++ squid-3.1.0.18/errors/ar/ERR_INVALID_REQ 2010-03-14 20:08:29.000000000 +1300
@@ -1 +1 @@
- خطأ: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ خطأ: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/az/ERR_INVALID_REQ squid-3.1.0.18/errors/az/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/az/ERR_INVALID_REQ 2010-02-25 01:03:30.000000000 +1300
+++ squid-3.1.0.18/errors/az/ERR_INVALID_REQ 2010-03-14 20:08:45.000000000 +1300
@@ -1 +1 @@
- SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mümkün probleml�^�rd�^�n b�^�zil�^�ri:
(GET, POST) sorğusunun metodu məlum deyil və ya umumiyyətlə yoxdur.
URL yoxdur.
HTTP identifikator yoxdur (HTTP/1.0).
Sorğu həddən ziyadə böyükdür.
POST və PUT sorğuları üçün Content-Length göstərilməmişdir
Server adında qadağan edilmiş simvol; altxətt yol verilməzdir.
Your cache administrator is %w.
\ No newline at end of file
+ SƏHV: Sorğulanan URL ilə əlaqə yaradılmadı
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mümkün probleml�^�rd�^�n b�^�zil�^�ri:
(GET, POST) sorğusunun metodu məlum deyil və ya umumiyyətlə yoxdur.
URL yoxdur.
HTTP identifikator yoxdur (HTTP/1.0).
Sorğu həddən ziyadə böyükdür.
POST və PUT sorğuları üçün Content-Length göstərilməmişdir
Server adında qadağan edilmiş simvol; altxətt yol verilməzdir.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/bg/ERR_INVALID_REQ squid-3.1.0.18/errors/bg/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/bg/ERR_INVALID_REQ 2010-02-25 01:03:45.000000000 +1300
+++ squid-3.1.0.18/errors/bg/ERR_INVALID_REQ 2010-03-14 20:09:00.000000000 +1300
@@ -1 +1 @@
- ГРЕШКА: Заявеният адрес е недостъпен.
ERROR
The requested URL could not be retrieved
При опит за обработка на заявката възникна следната грешка - Невалидна заявка:
%R
Възможни грешки:
Липсващ или непознат метод за достъп.
Липсващ адрес.
Липсващ HTTP идентификатор (HTTP/1.0).
Заявката е прекалено голяма.
Липсващо поле Content-Length за заявка от тип POST или PUT.
Невалиден символ в името на сървъра (напр. символът за подчертаване е недопустим)
Вашият кеш администратор е %w.
\ No newline at end of file
+ ГРЕШКА: Заявеният адрес е недостъпен.
ERROR
The requested URL could not be retrieved
При опит за обработка на заявката възникна следната грешка - Невалидна заявка:
%R
Възможни грешки:
Липсващ или непознат метод за достъп.
Липсващ адрес.
Липсващ HTTP идентификатор (HTTP/1.0).
Заявката е прекалено голяма.
Липсващо поле Content-Length за заявка от тип POST или PUT.
Невалиден символ в името на сървъра (напр. символът за подчертаване е недопустим)
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Вашият кеш администратор е %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ca/ERR_INVALID_REQ squid-3.1.0.18/errors/ca/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ca/ERR_INVALID_REQ 2010-02-25 01:04:00.000000000 +1300
+++ squid-3.1.0.18/errors/ca/ERR_INVALID_REQ 2010-03-14 20:09:15.000000000 +1300
@@ -1 +1 @@
- ERROR: No es pot mostrar la URL que heu sol.licitat
ERROR
No es pot mostrar la URL que heu sol.licitat
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Mètode de petició desconegut o absent.
no hi ha URL.
Falta l'identificador HTTP (HTTP/1.0).
La petici&ocute; és massa llarga.
Falta el camp Content-Length
.
Caràcter no permès en el nom del servidor.
L'administrador d'aquesta cache és %w.
\ No newline at end of file
+ ERROR: No es pot mostrar la URL que heu sol.licitat
ERROR
No es pot mostrar la URL que heu sol.licitat
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Mètode de petició desconegut o absent.
no hi ha URL.
Falta l'identificador HTTP (HTTP/1.0).
La petici&ocute; és massa llarga.
Falta el camp Content-Length
.
Caràcter no permès en el nom del servidor.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
L'administrador d'aquesta cache és %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/cs/ERR_INVALID_REQ squid-3.1.0.18/errors/cs/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/cs/ERR_INVALID_REQ 2010-02-25 01:04:15.000000000 +1300
+++ squid-3.1.0.18/errors/cs/ERR_INVALID_REQ 2010-03-14 20:09:31.000000000 +1300
@@ -1 +1 @@
- CHYBA: Požadovaný dokument je nedostupný
ERROR
The requested URL could not be retrieved
Došlo k chybě Invalid Request (Neplatný požadavek) během zpracování požadavku:
%R
Some possible problems are:
Chybná nebo chybějící HTTP metoda (POST, GET)
Chybějící URL.
Chybějící identifikátor HTTP (HTTP/1.0).
Požadavek může být příliš velký
Chybí 'Content-Lenght' požadavku POST nebo PUT.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ CHYBA: Požadovaný dokument je nedostupný
ERROR
The requested URL could not be retrieved
Došlo k chybě Invalid Request (Neplatný požadavek) během zpracování požadavku:
%R
Some possible problems are:
Chybná nebo chybějící HTTP metoda (POST, GET)
Chybějící URL.
Chybějící identifikátor HTTP (HTTP/1.0).
Požadavek může být příliš velký
Chybí 'Content-Lenght' požadavku POST nebo PUT.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/da/ERR_INVALID_REQ squid-3.1.0.18/errors/da/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/da/ERR_INVALID_REQ 2010-02-25 01:04:30.000000000 +1300
+++ squid-3.1.0.18/errors/da/ERR_INVALID_REQ 2010-03-14 20:09:46.000000000 +1300
@@ -1 +1 @@
- FEJL: Den angivne URL kunne ikke hentes
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mulige problemer kan være:
Manglende eller ukendt forespørgsels metode.
Manglende URL.
Manglende HTTP Identifikator (ved HTTP/1.0)
Forespørgslen er for stor.
Content-Length mangler til POST eller PUT forespørgsler
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ FEJL: Den angivne URL kunne ikke hentes
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mulige problemer kan være:
Manglende eller ukendt forespørgsels metode.
Manglende URL.
Manglende HTTP Identifikator (ved HTTP/1.0)
Forespørgslen er for stor.
Content-Length mangler til POST eller PUT forespørgsler
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/de/ERR_INVALID_REQ squid-3.1.0.18/errors/de/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/de/ERR_INVALID_REQ 2010-02-25 01:04:45.000000000 +1300
+++ squid-3.1.0.18/errors/de/ERR_INVALID_REQ 2010-03-14 20:10:02.000000000 +1300
@@ -1 +1 @@
- FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Ungültige Anfrage Fehler erhalten als versucht wurde die Anfrage zu Bearbeiten:
%R
Mögliche Probleme sind:
Fehlende oder unbekannte Anfragemethode.
Fehlende URL.
Fehlende HTTP-Version (HTTP/1.0).
Anfrage ist zu lang.
Content-Length fehlt für POST oder PUT Anfragen.
Ungültiges Zeichen im Hostname; Unterstriche sind nicht erlaubt.
Ihr Cache Administrator ist %w.
\ No newline at end of file
+ FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Ungültige Anfrage Fehler erhalten als versucht wurde die Anfrage zu Bearbeiten:
%R
Mögliche Probleme sind:
Fehlende oder unbekannte Anfragemethode.
Fehlende URL.
Fehlende HTTP-Version (HTTP/1.0).
Anfrage ist zu lang.
Content-Length fehlt für POST oder PUT Anfragen.
Ungültiges Zeichen im Hostname; Unterstriche sind nicht erlaubt.
HTTP/1.1 Expect wird von einer HTTP/1.0 Software erfragt
Ihr Cache Administrator ist %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/de/ERR_SOCKET_FAILURE squid-3.1.0.18/errors/de/ERR_SOCKET_FAILURE
--- squid-3.1.0.17/errors/de/ERR_SOCKET_FAILURE 2010-02-25 01:04:38.000000000 +1300
+++ squid-3.1.0.18/errors/de/ERR_SOCKET_FAILURE 2010-03-14 20:09:55.000000000 +1300
@@ -1 +1 @@
- FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:
Socketfehler
Das System antwortete: %E
Squid kann keinen TCP Socket erstellen, warscheinlich aufgrund von großer Systemlast. Bitte wiederholen sie die Anfrage.
Ihr Cache Administrator ist %w.
\ No newline at end of file
+ FEHLER: Die angeforderte URL konnte nicht gefunden werden
ERROR
The requested URL could not be retrieved
Der folgende Fehler wurde beim Versuch die URL %U zu holen festgestellt:
Socketfehler
Das System antwortete: %E
Squid kann keinen TCP-Socket erstellen, wahrscheinlich aufgrund von großer Systemlast. Bitte wiederholen Sie die Anfrage.
Ihr Cache Administrator ist %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/el/ERR_INVALID_REQ squid-3.1.0.18/errors/el/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/el/ERR_INVALID_REQ 2010-02-25 01:05:00.000000000 +1300
+++ squid-3.1.0.18/errors/el/ERR_INVALID_REQ 2010-03-14 20:10:19.000000000 +1300
@@ -1 +1 @@
- ΣΦΑΛΜΑ: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Ελλιπής ή άγνωστη μέθοδος αίτησης.
Missing URL.
Ελλιπές αναγνωριστικό HTTP (HTTP/1.0)
Η αίτηση είναι υπερμεγέθης.
Έλειπες Περιεχόμενο- Μήκος για τις αιτήσεις POST ή PUT
Άκυροι χαρακτήρες στο όνομα υπολογιστή, οι υπογεγραμμένες δεν επιτρέπονται.
Ο διαχειριστής του μεσολαβητή σας είναι ο %w.
\ No newline at end of file
+ ΣΦΑΛΜΑ: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Ελλιπής ή άγνωστη μέθοδος αίτησης.
Missing URL.
Ελλιπές αναγνωριστικό HTTP (HTTP/1.0)
Η αίτηση είναι υπερμεγέθης.
Έλειπες Περιεχόμενο- Μήκος για τις αιτήσεις POST ή PUT
Άκυροι χαρακτήρες στο όνομα υπολογιστή, οι υπογεγραμμένες δεν επιτρέπονται.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Ο διαχειριστής του μεσολαβητή σας είναι ο %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/en/ERR_INVALID_REQ squid-3.1.0.18/errors/en/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/en/ERR_INVALID_REQ 2010-02-25 01:05:16.000000000 +1300
+++ squid-3.1.0.18/errors/en/ERR_INVALID_REQ 2010-03-14 20:10:35.000000000 +1300
@@ -1 +1 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/es/ERR_INVALID_REQ squid-3.1.0.18/errors/es/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/es/ERR_INVALID_REQ 2010-02-25 01:05:32.000000000 +1300
+++ squid-3.1.0.18/errors/es/ERR_INVALID_REQ 2010-03-14 20:10:50.000000000 +1300
@@ -1 +1 @@
- ERROR: El URL solicitado no se ha podido conseguir
ERROR
El URL solicitado no se ha podido conseguir
Petición Incorrecta se ha encontrado un error mientras se intentaba procesar la petición:
%R
Algunos posibles problemas son:
Falta o es desconocido el método de la petición (no es GET ni POST)
URL Perdido.
Falta el identificador HTTP (HTTP/1.0)
La petición es demasiado grande.
Falta Content-Length en las peticiones POST o PUT
Hay caracteres ilegales en el nombre de máquina; el carácter subrayado (_) no está permitido.
Su administrador del caché es %w.
\ No newline at end of file
+ ERROR: El URL solicitado no se ha podido conseguir
ERROR
El URL solicitado no se ha podido conseguir
Petición Incorrecta se ha encontrado un error mientras se intentaba procesar la petición:
%R
Algunos posibles problemas son:
Falta o es desconocido el método de la petición (no es GET ni POST)
URL Perdido.
Falta el identificador HTTP (HTTP/1.0)
La petición es demasiado grande.
Falta Content-Length en las peticiones POST o PUT
Hay caracteres ilegales en el nombre de máquina; el carácter subrayado (_) no está permitido.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Su administrador del caché es %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/et/ERR_INVALID_REQ squid-3.1.0.18/errors/et/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/et/ERR_INVALID_REQ 2010-02-25 01:05:47.000000000 +1300
+++ squid-3.1.0.18/errors/et/ERR_INVALID_REQ 2010-03-14 20:11:06.000000000 +1300
@@ -1 +1 @@
- VIGA: Päring URLile ei saa vastust
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Puudub või tundmatu päringu meetod (GET, POST)
Puudub URL
Puudub HTTP identifikaator (HTTP/1.0)
Päring võib olla liiga suur
POST või PUT päringutel puudub Content-Length
keelatud sümbolid hosti nimes; alakriipsud pole lubatud
Teie teenusepakkuja aadress on %w.
\ No newline at end of file
+ VIGA: Päring URLile ei saa vastust
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Puudub või tundmatu päringu meetod (GET, POST)
Puudub URL
Puudub HTTP identifikaator (HTTP/1.0)
Päring võib olla liiga suur
POST või PUT päringutel puudub Content-Length
keelatud sümbolid hosti nimes; alakriipsud pole lubatud
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Teie teenusepakkuja aadress on %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/fa/ERR_INVALID_REQ squid-3.1.0.18/errors/fa/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/fa/ERR_INVALID_REQ 2010-02-25 01:06:02.000000000 +1300
+++ squid-3.1.0.18/errors/fa/ERR_INVALID_REQ 2010-03-14 20:11:23.000000000 +1300
@@ -1 +1 @@
- خطا: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
درخواست نامعتبر این خطا در زمان پردازش درخواست روی داده بود:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ خطا: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
درخواست نامعتبر این خطا در زمان پردازش درخواست روی داده بود:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/fi/ERR_INVALID_REQ squid-3.1.0.18/errors/fi/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/fi/ERR_INVALID_REQ 2010-02-25 01:06:17.000000000 +1300
+++ squid-3.1.0.18/errors/fi/ERR_INVALID_REQ 2010-03-14 20:11:41.000000000 +1300
@@ -1 +1 @@
- VIRHE: Pyydettyä URL-osoitetta ei voitu hakea
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mahdollisia ongelmia:
Puuttuva tai tuntematon hakupyynnön tyyppi
Puuttuva URL
Puuttuva HTTP-tunniste (HTTP/1.0).
Hakupyyntö on liian suuri
Content-Length
puuttuu POST- tai PUT-hakupyynnostä
Virheellinen merkki palvelinnimessä; alaviivat eivät ole sallittuja
Your cache administrator is %w.
\ No newline at end of file
+ VIRHE: Pyydettyä URL-osoitetta ei voitu hakea
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mahdollisia ongelmia:
Puuttuva tai tuntematon hakupyynnön tyyppi
Puuttuva URL
Puuttuva HTTP-tunniste (HTTP/1.0).
Hakupyyntö on liian suuri
Content-Length
puuttuu POST- tai PUT-hakupyynnostä
Virheellinen merkki palvelinnimessä; alaviivat eivät ole sallittuja
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/fr/ERR_INVALID_REQ squid-3.1.0.18/errors/fr/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/fr/ERR_INVALID_REQ 2010-02-25 01:06:33.000000000 +1300
+++ squid-3.1.0.18/errors/fr/ERR_INVALID_REQ 2010-03-14 20:11:56.000000000 +1300
@@ -1 +1 @@
- ERREUR: L'URL demandée n'a pu être chargée
ERROR
The requested URL could not be retrieved
Une erreur Requête Invalide a été rencontrée en essayant de traiter la requête :
%R
Problèmes envisageables :
Méthode de requête inconnue ou perdue.
Absence d'URL
Absence d'identifiant HTTP (HTTP/1.0)
La requête est peut-être trop volumineuse
Champ Content-Length absent pour les requêtes POST ou PUT
Caractère illégal dans le nom de la machine, les les soulignés (underscores) ne sont pas autorisés.
Votre administrateur de cache est %w.
\ No newline at end of file
+ ERREUR: L'URL demandée n'a pu être chargée
ERROR
The requested URL could not be retrieved
Une erreur Requête Invalide a été rencontrée en essayant de traiter la requête :
%R
Problèmes envisageables :
Méthode de requête inconnue ou perdue.
Absence d'URL
Absence d'identifiant HTTP (HTTP/1.0)
La requête est peut-être trop volumineuse
Champ Content-Length absent pour les requêtes POST ou PUT
Caractère illégal dans le nom de la machine, les les soulignés (underscores) ne sont pas autorisés.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Votre administrateur de cache est %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/he/ERR_INVALID_REQ squid-3.1.0.18/errors/he/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/he/ERR_INVALID_REQ 2010-02-25 01:06:48.000000000 +1300
+++ squid-3.1.0.18/errors/he/ERR_INVALID_REQ 2010-03-14 20:12:11.000000000 +1300
@@ -1 +1 @@
- שגיאה: לא ניתן לגשת אל הכתובת המבוקשת
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
סוג בקשה לא ידוע או חסר
כתובת חסרה
Missing HTTP Identifier (HTTP/1.0).
הבקשה ארוכה מדי
חסר Content-Length בשביל בקשות POST או PUT
תווים לא חוקיים בשם השרת; קווים תחתונים אסורים
מנהל השרת הוא %w.
\ No newline at end of file
+ שגיאה: לא ניתן לגשת אל הכתובת המבוקשת
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
סוג בקשה לא ידוע או חסר
כתובת חסרה
Missing HTTP Identifier (HTTP/1.0).
הבקשה ארוכה מדי
חסר Content-Length בשביל בקשות POST או PUT
תווים לא חוקיים בשם השרת; קווים תחתונים אסורים
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
מנהל השרת הוא %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/hu/ERR_INVALID_REQ squid-3.1.0.18/errors/hu/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/hu/ERR_INVALID_REQ 2010-02-25 01:07:02.000000000 +1300
+++ squid-3.1.0.18/errors/hu/ERR_INVALID_REQ 2010-03-14 20:12:26.000000000 +1300
@@ -1 +1 @@
- HIBA: A kért URL nem tölthető le
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Hiányzó URL
Hiányzó HTTP azonosító (HTTP/1.0)
A kérés vagy a válasz túl nagy méretű.
Content-Length hiányzik a POST vagy PUT kérésből
A szervernévben nem megengedett karakter található; az aláhúzás karakter például ilyen
Your cache administrator is %w.
\ No newline at end of file
+ HIBA: A kért URL nem tölthető le
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
Hiányzó URL
Hiányzó HTTP azonosító (HTTP/1.0)
A kérés vagy a válasz túl nagy méretű.
Content-Length hiányzik a POST vagy PUT kérésből
A szervernévben nem megengedett karakter található; az aláhúzás karakter például ilyen
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/hy/ERR_INVALID_REQ squid-3.1.0.18/errors/hy/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/hy/ERR_INVALID_REQ 2010-02-25 01:07:17.000000000 +1300
+++ squid-3.1.0.18/errors/hy/ERR_INVALID_REQ 2010-03-14 20:12:41.000000000 +1300
@@ -1 +1 @@
- ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Հարցման մեթոդը բացակայում է կամ անհայտ է
URL -ն բացակայում է
HTTP իդենտիֆիկատորը բացակայում է (HTTP/1.0)
Հարցման ծավալը շատ մեծ է
POST կամ PUT հարցումների համար Content-Length չի նշված
Անթույլատրելի նիշ սերվերի անվան մեջ;ընդգծման նիշն անթույլատրելի է
Ձեր քեշի կառավարիչը %w է.
\ No newline at end of file
+ ՍԽԱԼ: Պահանջվող URL չի կարող առաքվել
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Հարցման մեթոդը բացակայում է կամ անհայտ է
URL -ն բացակայում է
HTTP իդենտիֆիկատորը բացակայում է (HTTP/1.0)
Հարցման ծավալը շատ մեծ է
POST կամ PUT հարցումների համար Content-Length չի նշված
Անթույլատրելի նիշ սերվերի անվան մեջ;ընդգծման նիշն անթույլատրելի է
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Ձեր քեշի կառավարիչը %w է.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/id/ERR_INVALID_REQ squid-3.1.0.18/errors/id/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/id/ERR_INVALID_REQ 2010-02-25 01:07:32.000000000 +1300
+++ squid-3.1.0.18/errors/id/ERR_INVALID_REQ 2010-03-14 20:12:56.000000000 +1300
@@ -1 +1 @@
- ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Cacat Meminta kesalahan ditemukan sedangkan mencoba mengolah permintaan:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ ERROR: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Cacat Meminta kesalahan ditemukan sedangkan mencoba mengolah permintaan:
%R
Some possible problems are:
Missing or unknown request method.
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/it/ERR_INVALID_REQ squid-3.1.0.18/errors/it/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/it/ERR_INVALID_REQ 2010-02-25 01:07:47.000000000 +1300
+++ squid-3.1.0.18/errors/it/ERR_INVALID_REQ 2010-03-14 20:13:11.000000000 +1300
@@ -1 +1 @@
- ERRORE: Non è stato possibile accedere alla URL richiesta.
ERROR
The requested URL could not be retrieved
Richiesta non valida. Si è verificato un errore durante l'elaborazione della richiesta:
%R
Alcuni dei possibili problemi sono:
Metodo della richiesta non specificato o sconoscito.
URL non specificata.
L'identificativo del protocollo HTTP è mancante (HTTP/1.0).
La richiesta è di dimensioni troppo grandi.
Una richiesta di tipo POST o PUT non contiene il campo Content-Length.
C'è un carattere irregolare nel nome host: gli underscore "_" non sono consentiti.
L'amministratore del proxy è %w.
\ No newline at end of file
+ ERRORE: Non è stato possibile accedere alla URL richiesta.
ERROR
The requested URL could not be retrieved
Richiesta non valida. Si è verificato un errore durante l'elaborazione della richiesta:
%R
Alcuni dei possibili problemi sono:
Metodo della richiesta non specificato o sconoscito.
URL non specificata.
L'identificativo del protocollo HTTP è mancante (HTTP/1.0).
La richiesta è di dimensioni troppo grandi.
Una richiesta di tipo POST o PUT non contiene il campo Content-Length.
C'è un carattere irregolare nel nome host: gli underscore "_" non sono consentiti.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
L'amministratore del proxy è %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ja/ERR_INVALID_REQ squid-3.1.0.18/errors/ja/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ja/ERR_INVALID_REQ 2010-02-25 01:08:02.000000000 +1300
+++ squid-3.1.0.18/errors/ja/ERR_INVALID_REQ 2010-03-14 20:13:26.000000000 +1300
@@ -1 +1 @@
- エラー: リクエストされた URL は取得できませんでした
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
ありそうな問題:
要求の方法が抜けているか不明です。
URLがありません。
HTTPの識別子(HTTP/1.0)がありません。
リクエストが長すぎます。
POSTまたはPUTのリクエストにContent-Lengthヘッダがありません。
ホスト名に不正な文字が使われています: アンダースコアは使えません。
Your cache administrator is %w.
\ No newline at end of file
+ エラー: リクエストされた URL は取得できませんでした
ERROR
The requested URL could not be retrieved
不正なリクエストのエラーが以下のリクエストを処理しようとしている間に発生しました:
%R
ありそうな問題:
要求の方法が抜けているか不明です。
URLがありません。
HTTPの識別子(HTTP/1.0)がありません。
リクエストが長すぎます。
POSTまたはPUTのリクエストにContent-Lengthヘッダがありません。
ホスト名に不正な文字が使われています: アンダースコアは使えません。
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ko/ERR_INVALID_REQ squid-3.1.0.18/errors/ko/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ko/ERR_INVALID_REQ 2010-02-25 01:08:17.000000000 +1300
+++ squid-3.1.0.18/errors/ko/ERR_INVALID_REQ 2010-03-14 20:13:40.000000000 +1300
@@ -1 +1 @@
- 에러: 요청된 URL을 가져올 수 없습니다.
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Request method가 잘못되었거나 빠져 있다.
URL이 빠져 있다.
HTTP Identifier (HTTP/1.0)이 빠져 있다.
Request가 너무 크다.
POST나 PUT 요청일 경우 Content-Length가 빠져 있다.
호스트네임에 잘못 된 문자가 있다; 밑줄은 허용되지 않습니다.
Your cache administrator is %w.
\ No newline at end of file
+ 에러: 요청된 URL을 가져올 수 없습니다.
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Request method가 잘못되었거나 빠져 있다.
URL이 빠져 있다.
HTTP Identifier (HTTP/1.0)이 빠져 있다.
Request가 너무 크다.
POST나 PUT 요청일 경우 Content-Length가 빠져 있다.
호스트네임에 잘못 된 문자가 있다; 밑줄은 허용되지 않습니다.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/lt/ERR_INVALID_REQ squid-3.1.0.18/errors/lt/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/lt/ERR_INVALID_REQ 2010-02-25 01:08:32.000000000 +1300
+++ squid-3.1.0.18/errors/lt/ERR_INVALID_REQ 2010-03-14 20:13:55.000000000 +1300
@@ -1 +1 @@
- KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Trūksta arba nežinomas užklausos metodas
Trūksta adreso
Trūksta HTTP identifikatoriaus (HTTP/1.0)
Užklausa per didelė
Trūksta Content-Length parametro POST arba PUT užklausoje
Neleistinas simbolis serverio varde; pabraukimo simboliai yra neleistini
Your cache administrator is %w.
\ No newline at end of file
+ KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Trūksta arba nežinomas užklausos metodas
Trūksta adreso
Trūksta HTTP identifikatoriaus (HTTP/1.0)
Užklausa per didelė
Trūksta Content-Length parametro POST arba PUT užklausoje
Neleistinas simbolis serverio varde; pabraukimo simboliai yra neleistini
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/lv/ERR_INVALID_REQ squid-3.1.0.18/errors/lv/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/lv/ERR_INVALID_REQ 2010-02-25 01:08:47.000000000 +1300
+++ squid-3.1.0.18/errors/lv/ERR_INVALID_REQ 2010-03-14 20:14:10.000000000 +1300
@@ -1 +1 @@
- Kļūda: Nevar atvērt pieprasīto adresi.
ERROR
The requested URL could not be retrieved
Nekorekts pieprasījums notikusi kļūda mēģinot apstrādāt pieprasījumu:
%R
Dažas iespējamās problēmas ir:
Nav vai ir nezināma pieprasījuma metode.
Pazudis URL.
pietrūkst HTTP identifikators (HTTP/1.0).
Pieprasījums ir par lielu.
Content-Length missing for POST or PUT requests.
Neatļauts simbols adresē. Pasvītrojuma rakstzīme nav atļauta.
Jūsu kešatmiņas administrators ir %w.
\ No newline at end of file
+ Kļūda: Nevar atvērt pieprasīto adresi.
ERROR
The requested URL could not be retrieved
Nekorekts pieprasījums notikusi kļūda mēģinot apstrādāt pieprasījumu:
%R
Dažas iespējamās problēmas ir:
Nav vai ir nezināma pieprasījuma metode.
Pazudis URL.
pietrūkst HTTP identifikators (HTTP/1.0).
Pieprasījums ir par lielu.
Content-Length missing for POST or PUT requests.
Neatļauts simbols adresē. Pasvītrojuma rakstzīme nav atļauta.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Jūsu kešatmiņas administrators ir %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ms/ERR_INVALID_REQ squid-3.1.0.18/errors/ms/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ms/ERR_INVALID_REQ 2010-02-25 01:09:01.000000000 +1300
+++ squid-3.1.0.18/errors/ms/ERR_INVALID_REQ 2010-03-14 20:14:25.000000000 +1300
@@ -1 +1 @@
- RALAT: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Permintaan Salah error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
URL Hilang
Kehilangan HTTP Identifier (HTTP/1.0)
Permintaan terlalu besar
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Pengurus Proxy anda ialah %w.
\ No newline at end of file
+ RALAT: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
Permintaan Salah error was encountered while trying to process the request:
%R
Some possible problems are:
Missing or unknown request method.
URL Hilang
Kehilangan HTTP Identifier (HTTP/1.0)
Permintaan terlalu besar
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Pengurus Proxy anda ialah %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/nl/ERR_INVALID_REQ squid-3.1.0.18/errors/nl/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/nl/ERR_INVALID_REQ 2010-02-25 01:09:16.000000000 +1300
+++ squid-3.1.0.18/errors/nl/ERR_INVALID_REQ 2010-03-14 20:14:40.000000000 +1300
@@ -1 +1 @@
- FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
Ongeldige Aanvraag Er is een fout opgetreden tijdens het verwerken van:
%R
Mogelijke problemen zijn:
Ontbrekende of onbekende verzoekmethode.
Ontbrekende URL.
Ontbrekende HTTP identificatie (HTTP/1.0).
Het verzoek is te lang.
De Content-Length ontbreekt voor het POST of PUT verzoek.
Er staat een ongeldig teken in de hostnaam; het teken _
is niet toegestaan.
De beheerder van deze cache is %w.
\ No newline at end of file
+ FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
Ongeldige Aanvraag Er is een fout opgetreden tijdens het verwerken van:
%R
Mogelijke problemen zijn:
Ontbrekende of onbekende verzoekmethode.
Ontbrekende URL.
Ontbrekende HTTP identificatie (HTTP/1.0).
Het verzoek is te lang.
De Content-Length ontbreekt voor het POST of PUT verzoek.
Er staat een ongeldig teken in de hostnaam; het teken _
is niet toegestaan.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/pl/ERR_INVALID_REQ squid-3.1.0.18/errors/pl/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/pl/ERR_INVALID_REQ 2010-02-25 01:09:31.000000000 +1300
+++ squid-3.1.0.18/errors/pl/ERR_INVALID_REQ 2010-03-14 20:14:55.000000000 +1300
@@ -1 +1 @@
- BŁĄD: Żądany URL nie może zostać pobrany
ERROR
The requested URL could not be retrieved
Nieprawidłowe zapytanie wystąpił błąd podczas próby przetworzenia zapytania
%R
Some possible problems are:
Brak lub nieznana metoda (GET, POST)
Brak URL-a
Brak identyfikatora HTTP (HTTP/1.0)
RZbyt duży rozmiar żądania
Brak pola Content-Length dla metod POST lub PUT
Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone
Your cache administrator is %w.
\ No newline at end of file
+ BŁĄD: Żądany URL nie może zostać pobrany
ERROR
The requested URL could not be retrieved
Nieprawidłowe zapytanie wystąpił błąd podczas próby przetworzenia zapytania
%R
Some possible problems are:
Brak lub nieznana metoda (GET, POST)
Brak URL-a
Brak identyfikatora HTTP (HTTP/1.0)
RZbyt duży rozmiar żądania
Brak pola Content-Length dla metod POST lub PUT
Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/pt/ERR_INVALID_REQ squid-3.1.0.18/errors/pt/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/pt/ERR_INVALID_REQ 2010-02-25 01:10:01.000000000 +1300
+++ squid-3.1.0.18/errors/pt/ERR_INVALID_REQ 2010-03-14 20:15:24.000000000 +1300
@@ -1 +1 @@
- ERRO: A URL solicitada não pode ser recuperada
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Método desconhecido ou faltando (GET, POST)
Faltou a URL
Faltou o identificador HTTP (HTTP/1.0)
A requisição pode ser muito grande
Content-Length missing for POST or PUT requests.
Hostname com caracter inválido; não são permitidos underscores.
Your cache administrator is %w.
\ No newline at end of file
+ ERRO: A URL solicitada não pode ser recuperada
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Método desconhecido ou faltando (GET, POST)
Faltou a URL
Faltou o identificador HTTP (HTTP/1.0)
A requisição pode ser muito grande
Content-Length missing for POST or PUT requests.
Hostname com caracter inválido; não são permitidos underscores.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/pt-br/ERR_INVALID_REQ squid-3.1.0.18/errors/pt-br/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/pt-br/ERR_INVALID_REQ 2010-02-25 01:09:46.000000000 +1300
+++ squid-3.1.0.18/errors/pt-br/ERR_INVALID_REQ 2010-03-14 20:15:10.000000000 +1300
@@ -1 +1 @@
- ERRO: A URL requisitada não pôde ser recuperada
ERROR
The requested URL could not be retrieved
Requisição Inválida erro encontrado ao tentar processar a requisição:
%R
Alguns dos possíveis problemas são:
Método de requisição faltando ou desconhecido.
URL faltando.
Identificador HTTP faltando (HTTP/1.0).
Requisição é muito grande.
Content-Length faltando para requisições POST ou PUT.
Caracter ilegal no nome de host; underscores não são permitidos.
Seu administrador do cache é %w.
\ No newline at end of file
+ ERRO: A URL requisitada não pôde ser recuperada
ERROR
The requested URL could not be retrieved
Requisição Inválida erro encontrado ao tentar processar a requisição:
%R
Alguns dos possíveis problemas são:
Método de requisição faltando ou desconhecido.
URL faltando.
Identificador HTTP faltando (HTTP/1.0).
Requisição é muito grande.
Content-Length faltando para requisições POST ou PUT.
Caracter ilegal no nome de host; underscores não são permitidos.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Seu administrador do cache é %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ro/ERR_INVALID_REQ squid-3.1.0.18/errors/ro/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ro/ERR_INVALID_REQ 2010-02-25 01:10:17.000000000 +1300
+++ squid-3.1.0.18/errors/ro/ERR_INVALID_REQ 2010-03-14 20:15:39.000000000 +1300
@@ -1 +1 @@
- EROARE: URL-ul cerut nu a putut fi accesat
ERROR
The requested URL could not be retrieved
Eroarea Cerere invalidă a fost întâlnită în timp ce se încerca procesarea cererii:
%R
Unele posibile probleme sunt:
Metoda de cerere lipseşte sau nu este cunoscută.
Lipseşte URL-ul.
Lipseşte identificatorul HTTP (HTTP/1.0).
Cererea este prea mare.
Content-Length lipseşte pentru cererile POST sau PUT.
Caracter ilegal în numele staţiei; liniuţele de subliniere nu sunt permise.
Administratorul cache-ului este %w.
\ No newline at end of file
+ EROARE: URL-ul cerut nu a putut fi accesat
ERROR
The requested URL could not be retrieved
Eroarea Cerere invalidă a fost întâlnită în timp ce se încerca procesarea cererii:
%R
Unele posibile probleme sunt:
Metoda de cerere lipseşte sau nu este cunoscută.
Lipseşte URL-ul.
Lipseşte identificatorul HTTP (HTTP/1.0).
Cererea este prea mare.
Content-Length lipseşte pentru cererile POST sau PUT.
Caracter ilegal în numele staţiei; liniuţele de subliniere nu sunt permise.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Administratorul cache-ului este %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/ru/ERR_INVALID_REQ squid-3.1.0.18/errors/ru/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/ru/ERR_INVALID_REQ 2010-02-25 01:10:32.000000000 +1300
+++ squid-3.1.0.18/errors/ru/ERR_INVALID_REQ 2010-03-14 20:15:54.000000000 +1300
@@ -1 +1 @@
- ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Обнаружен недопустимый запрос:
%R
Возможные проблемы:
Отсутствует или неизвестен метод запроса.
Отсутствует URL.
Отсутствует идентификатор HTTP (HTTP/1.0).
Запрос слишком велик.
В запросе POST или PUT отсутствует заголовок Content-Length.
Недопустимый символ в имени узла (hostname), подчёркивания запрещены.
Администратор Вашего кэша: %w.
\ No newline at end of file
+ ОШИБКА: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Обнаружен недопустимый запрос:
%R
Возможные проблемы:
Отсутствует или неизвестен метод запроса.
Отсутствует URL.
Отсутствует идентификатор HTTP (HTTP/1.0).
Запрос слишком велик.
В запросе POST или PUT отсутствует заголовок Content-Length.
Недопустимый символ в имени узла (hostname), подчёркивания запрещены.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Администратор Вашего кэша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sk/ERR_INVALID_REQ squid-3.1.0.18/errors/sk/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/sk/ERR_INVALID_REQ 2010-02-25 01:10:47.000000000 +1300
+++ squid-3.1.0.18/errors/sk/ERR_INVALID_REQ 2010-03-14 20:16:09.000000000 +1300
@@ -1 +1 @@
- CHYBA: Požadovaný URL nebolo možné získať
ERROR
The requested URL could not be retrieved
Vyskytla sa chyba Neplatná požiadavka pri pokuse o spracovanie požiadavky:
%R
Niektoré možné problémy:
Chýbajúca alebo neznáma metóda požiadavky.
Chýbajúci URL.
Chýbajúci identifikátor HTTP (HTTP/1.0).
Požiadavka je príliš dlhá.
Chýbajúca položka Content-Length pre požiadavky POST alebo PUT.
Chybný znak v názve serveru; podčiarovník nie je povolený.
Vaším správcom cache je %w.
\ No newline at end of file
+ CHYBA: Požadovaný URL nebolo možné získať
ERROR
The requested URL could not be retrieved
Vyskytla sa chyba Neplatná požiadavka pri pokuse o spracovanie požiadavky:
%R
Niektoré možné problémy:
Chýbajúca alebo neznáma metóda požiadavky.
Chýbajúci URL.
Chýbajúci identifikátor HTTP (HTTP/1.0).
Požiadavka je príliš dlhá.
Chýbajúca položka Content-Length pre požiadavky POST alebo PUT.
Chybný znak v názve serveru; podčiarovník nie je povolený.
Vlastnosť Expect: verzie HTTP/1.1 sa požaduje od softvéru verzie HTTP/1.0.
Vaším správcom cache je %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_ACCESS_DENIED squid-3.1.0.18/errors/sr/ERR_ACCESS_DENIED
--- squid-3.1.0.17/errors/sr/ERR_ACCESS_DENIED 2010-02-25 01:11:00.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Pristup nije dozvoljen.
Sistem za kontrolu pristupa konfigurisan je tako da vam u ovom trenutku pristup nije dozvoljen. Ako smatrate da to nije u redu, molimo da kontaktirate vašeg servis provajdera.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_CACHE_ACCESS_DENIED squid-3.1.0.18/errors/sr/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.17/errors/sr/ERR_CACHE_ACCESS_DENIED 2010-02-25 01:11:02.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Cache Access Denied
ERROR
Cache Pristup nije dozvoljen.
The following error was encountered while trying to retrieve the URL: %U
Pristup proksi/keš serveru nije dozvoljen.
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
Ukoliko budete imali problema oko autentifikacije molimo kontaktirajte proksi administratora ili želite da promenite svoju poèetnu lozinku.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.18/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.17/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED 2010-02-25 01:11:01.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Cache Manager Access Denied
ERROR
Cache Manager Pristup nije dozvoljen.
The following error was encountered while trying to retrieve the URL: %U
Pristup proksi/keš server menadžeru nije dozvoljen.
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
koliko budete imali problema oko autentifikacije molimo kontaktirajte proxy administratora a ako vi jeste administrator, proèitajte dokumentaciju o keš menadžeru za Squid i proverite keš log za detaljnije opise grešaka.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_CANNOT_FORWARD squid-3.1.0.18/errors/sr/ERR_CANNOT_FORWARD
--- squid-3.1.0.17/errors/sr/ERR_CANNOT_FORWARD 2010-02-25 01:11:01.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Vaš zahtev ne može da se prosledi u ovom trenutku.
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.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_CONNECT_FAIL squid-3.1.0.18/errors/sr/ERR_CONNECT_FAIL
--- squid-3.1.0.17/errors/sr/ERR_CONNECT_FAIL 2010-02-25 01:10:55.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Connection to %I failed.
Sistem je dao povratnu informaciju: %E
Udaljeni raèunar ili mreža nisu operativni. Molimo pokušajte kasnije.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_DIR_LISTING squid-3.1.0.18/errors/sr/ERR_DIR_LISTING
--- squid-3.1.0.17/errors/sr/ERR_DIR_LISTING 2010-02-25 01:10:59.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_DIR_LISTING 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_DNS_FAIL squid-3.1.0.18/errors/sr/ERR_DNS_FAIL
--- squid-3.1.0.17/errors/sr/ERR_DNS_FAIL 2010-02-25 01:11:05.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nije moguæe odrediti IP adresu iz imena raèunara za %H
DNS server je vratio informaciju:
%z
što znaèi proksi server nije u stanju da identifikuje ime raèunara koje se nalazi u adresi (URL). Proverite da li je adresa ispravna.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_ESI squid-3.1.0.18/errors/sr/ERR_ESI
--- squid-3.1.0.17/errors/sr/ERR_ESI 2010-02-25 01:10:53.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESI obrada nije uspela.
ESI procesor je vratio:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Vaš webmaster je %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FORWARDING_DENIED squid-3.1.0.18/errors/sr/ERR_FORWARDING_DENIED
--- squid-3.1.0.17/errors/sr/ERR_FORWARDING_DENIED 2010-02-25 01:11:00.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Prosleðivanje odbijeno.
Ovaj proksi server neæe da prosledi vaš zahtev zato što pokušava da poštuje sibling odnose. Možda je klijent na %i proksi serveru koji je pogrešno konfigurisan.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_DISABLED squid-3.1.0.18/errors/sr/ERR_FTP_DISABLED
--- squid-3.1.0.17/errors/sr/ERR_FTP_DISABLED 2010-02-25 01:11:05.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTP nije omoguæen.
Ovaj proksi server ne omoguèava FTP saobraæaj.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_FAILURE squid-3.1.0.18/errors/sr/ERR_FTP_FAILURE
--- squid-3.1.0.17/errors/sr/ERR_FTP_FAILURE 2010-02-25 01:11:05.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
Desila se greška u FTP protokolu prilikom dovlaèenja URL-a: %U
Squid je poslao sledeæu FTP komandu:
%f
The server responded with:
%F
%g
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_FORBIDDEN squid-3.1.0.18/errors/sr/ERR_FTP_FORBIDDEN
--- squid-3.1.0.17/errors/sr/ERR_FTP_FORBIDDEN 2010-02-25 01:11:00.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
An FTP authentication failure occurred while trying to retrieve the URL: %U
Squid je poslao sledeæu FTP komandu:
%f
The server responded with:
%F
%g
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_NOT_FOUND squid-3.1.0.18/errors/sr/ERR_FTP_NOT_FOUND
--- squid-3.1.0.17/errors/sr/ERR_FTP_NOT_FOUND 2010-02-25 01:10:56.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid je poslao sledeæu FTP komandu:
%f
The server responded with:
%F
%g
To može da bude prouzrokovano time što je FTP adresa (URL) sa apsolutnom putanjom (što se ne slaže sa RFC 1738). Ukoliko je to sluèaj, fajl možete da naðete na %B.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_PUT_CREATED squid-3.1.0.18/errors/sr/ERR_FTP_PUT_CREATED
--- squid-3.1.0.17/errors/sr/ERR_FTP_PUT_CREATED 2010-02-25 01:11:03.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- FTP PUT uspešan: Fajl je prenesen
Operacija je okonèana uspešno
Fajl je prenesen
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_PUT_ERROR squid-3.1.0.18/errors/sr/ERR_FTP_PUT_ERROR
--- squid-3.1.0.17/errors/sr/ERR_FTP_PUT_ERROR 2010-02-25 01:11:03.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: FTP upload failed
ERROR
FTP PUT/upload nije uspeo
Tokom pokušaja da se prenese (PUT) strana sa sledeæom adresom (URL): %U
Squid je poslao sledeæu FTP komandu:
%f
The server responded with:
%F
This means that the FTP server may not have permission or space to store the file. Check the path, permissions, diskspace and try again.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_PUT_MODIFIED squid-3.1.0.18/errors/sr/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.17/errors/sr/ERR_FTP_PUT_MODIFIED 2010-02-25 01:10:52.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- FTP PUT uspešan: Fajl je osvežen
Operacija je okonèana uspešno
Fajl je osvežen
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_FTP_UNAVAILABLE squid-3.1.0.18/errors/sr/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.17/errors/sr/ERR_FTP_UNAVAILABLE 2010-02-25 01:10:56.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid je poslao sledeæu FTP komandu:
%f
The server responded with:
%F
%g
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_ICAP_FAILURE squid-3.1.0.18/errors/sr/ERR_ICAP_FAILURE
--- squid-3.1.0.17/errors/sr/ERR_ICAP_FAILURE 2010-02-25 01:10:59.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Greška u ICAP protokolu.
Sistem je dao povratnu informaciju: %E
This means that some aspect of the ICAP communication failed.
Some possible problems are:
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_INVALID_REQ squid-3.1.0.18/errors/sr/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/sr/ERR_INVALID_REQ 2010-02-25 01:11:02.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Metod zahteva je nepoznat ili nedostaje.
Nedostaje adresa (URL).
Nedostaje HTTP identifikator (HTTP/1.0).
Zahtev je predug.
Nedostaje dužina zahteva (Content-Length) za POST ili PUT zahtev
Nedozvoljeni karakteri u imenu raèunara; donja crta (_) nije dozvoljena.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_INVALID_RESP squid-3.1.0.18/errors/sr/ERR_INVALID_RESP
--- squid-3.1.0.17/errors/sr/ERR_INVALID_RESP 2010-02-25 01:11:07.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
Invalid Response error was encountered while trying to process the request:
%R
HTTP odgovor koji je dobijen od kontaktiranog servera ne može da se razume ili je na neki nacin pogrešno formirana. Molimo kontaktirajte operatora sajta.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_INVALID_URL squid-3.1.0.18/errors/sr/ERR_INVALID_URL
--- squid-3.1.0.17/errors/sr/ERR_INVALID_URL 2010-02-25 01:11:06.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Neispravna adresa (URL)
Jedan od aspekata zahtevane adrese (URL) nije ispravan.
Some possible problems are:
Pristupni protokol nedostaje ili je neispravan (trebao bi da bude http://
ili slièno)
Nedostaje ime raèunara (servera)
Nedozvoljeni dvostruki-escape u URL putanji
Nedozvoljeni karakteri u imenu raèunara; donja crta (_) nije dozvoljena.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_LIFETIME_EXP squid-3.1.0.18/errors/sr/ERR_LIFETIME_EXP
--- squid-3.1.0.17/errors/sr/ERR_LIFETIME_EXP 2010-02-25 01:10:57.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Dozvoljeno trajanje konekcije je prekoraèeno
Squid Proksi server je prekinuo konekciju jer je prekoraèila dozvoljeno trajanje konekcije.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_NO_RELAY squid-3.1.0.18/errors/sr/ERR_NO_RELAY
--- squid-3.1.0.17/errors/sr/ERR_NO_RELAY 2010-02-25 01:11:06.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nema Wais relay-a
Za ovaj proksi server nije definisan WAIS relay raèunar! Pitajte administratora.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.18/errors/sr/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.17/errors/sr/ERR_ONLY_IF_CACHED_MISS 2010-02-25 01:10:57.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
U kešu nije naðen validan dokument a specificirane je direktiva only-if-cached
.
Za vaš zahtev postavljena je only-if-cached
proksi direktiva.Dokument nije naðen u proksi arhivi, ili se zahteva revalidacija kojaje zabranjena direktivom only-if-cached
.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_READ_ERROR squid-3.1.0.18/errors/sr/ERR_READ_ERROR
--- squid-3.1.0.17/errors/sr/ERR_READ_ERROR 2010-02-25 01:10:57.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Greška u èitanju
Sistem je dao povratnu informaciju: %E
Desila se greška prilikom èitanja podataka sa mreže. Molimo pokušajte ponovo.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_READ_TIMEOUT squid-3.1.0.18/errors/sr/ERR_READ_TIMEOUT
--- squid-3.1.0.17/errors/sr/ERR_READ_TIMEOUT 2010-02-25 01:10:58.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Predugo vreme èitanja
Sistem je dao povratnu informaciju: %E
Prilikom isèitavanja greške sa mreže došlo je do prekida. Mreža ili server su možda preoptereæeni ili nedostupni. Molimo pokušajte ponovo.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_SECURE_CONNECT_FAIL squid-3.1.0.18/errors/sr/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.17/errors/sr/ERR_SECURE_CONNECT_FAIL 2010-02-25 01:10:53.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nije uspelo uspostavljanje sigune konekcije sa %I
Sistem je dao povratnu informaciju: %E
Ovaj proksi i udaljeni server nisu uspeli da se dogovore oko sigunosnih podešavanja za izvršavanje vašeg zahteva. Moguce je da je udaljeni server ne podržava sigune konekcije, ili da proksi nije zadovoljan sa pravilima sigunosti udaljenog servera.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_SHUTTING_DOWN squid-3.1.0.18/errors/sr/ERR_SHUTTING_DOWN
--- squid-3.1.0.17/errors/sr/ERR_SHUTTING_DOWN 2010-02-25 01:10:54.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ovaj proksi server je u procesu iskljuèivanja i ne može da izvrši zahtev u ovom trenutku. Molimo pokušajte ponovo uskoro.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_SOCKET_FAILURE squid-3.1.0.18/errors/sr/ERR_SOCKET_FAILURE
--- squid-3.1.0.17/errors/sr/ERR_SOCKET_FAILURE 2010-02-25 01:10:55.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Greška prilikom uspostavljanja konekcije (Socket)
Sistem je dao povratnu informaciju: %E
Squid nije u stanju da kreira TCP socket, verovatno zbog preoptereæenosti. Molimo pokušajte ponovo.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_TOO_BIG squid-3.1.0.18/errors/sr/ERR_TOO_BIG
--- squid-3.1.0.17/errors/sr/ERR_TOO_BIG 2010-02-25 01:11:04.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Zahtev ili odgovor je prevelik.
If you are making a POST or PUT request, then the item you are trying to upload is too large.
If you are making a GET request, then the item you are trying to download is too large.
Ove limite postavio je intenet servis provajder koji koristi ovaj proksi server. Ako smatrate da je to greška, molimo stupite u kontakt sa administratorom.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_UNSUP_HTTPVERSION squid-3.1.0.18/errors/sr/ERR_UNSUP_HTTPVERSION
--- squid-3.1.0.17/errors/sr/ERR_UNSUP_HTTPVERSION 2010-02-25 01:10:58.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_UNSUP_HTTPVERSION 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
Unsupported HTTP version
The following error was encountered while trying to retrieve the URL: %U
Unsupported HTTP version
This Squid does not accept the HTTP version you are attempting to use.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_UNSUP_REQ squid-3.1.0.18/errors/sr/ERR_UNSUP_REQ
--- squid-3.1.0.17/errors/sr/ERR_UNSUP_REQ 2010-02-25 01:11:04.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nepodržan metod ili protokol zahteva (Request)
Squid Proksi server ne podržava sve metode zahteva za sve moguæe pristupne protokole. Na primer ne možete da uradite POST na Gopher zahtev.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_URN_RESOLVE squid-3.1.0.18/errors/sr/ERR_URN_RESOLVE
--- squid-3.1.0.17/errors/sr/ERR_URN_RESOLVE 2010-02-25 01:10:54.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: The requested URN not be retrieved
ERROR
Tražena adresa (URL) za URN ne može da se dovuèe
The following error was encountered while trying to retrieve the URN: %U
Ne mogu da odgonetnem URN
Hej, nemoj mnogo da oèekujes od URNova na %T! :)
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_WRITE_ERROR squid-3.1.0.18/errors/sr/ERR_WRITE_ERROR
--- squid-3.1.0.17/errors/sr/ERR_WRITE_ERROR 2010-02-25 01:11:07.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Greška u upisu
Sistem je dao povratnu informaciju: %E
Desila se greška prilikom upisa u mreži. Molimo pokušajte ponovo.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sr/ERR_ZERO_SIZE_OBJECT squid-3.1.0.18/errors/sr/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.17/errors/sr/ERR_ZERO_SIZE_OBJECT 2010-02-25 01:10:54.000000000 +1300
+++ squid-3.1.0.18/errors/sr/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1 +0,0 @@
- GREŠKA: Tražena adresa (URL) ne može da se dovuèe
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Odgovor nulte dužine
Squid did not receive any data for this request.
Vaš keš/proksi administrator je: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sv/ERR_DIR_LISTING squid-3.1.0.18/errors/sv/ERR_DIR_LISTING
--- squid-3.1.0.17/errors/sv/ERR_DIR_LISTING 2010-02-25 01:11:15.000000000 +1300
+++ squid-3.1.0.18/errors/sv/ERR_DIR_LISTING 2010-03-14 20:16:22.000000000 +1300
@@ -1 +1 @@
- Katalog: %U
\ No newline at end of file
+ Katalog: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sv/ERR_INVALID_REQ squid-3.1.0.18/errors/sv/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/sv/ERR_INVALID_REQ 2010-02-25 01:11:17.000000000 +1300
+++ squid-3.1.0.18/errors/sv/ERR_INVALID_REQ 2010-03-14 20:16:25.000000000 +1300
@@ -1 +1 @@
- FEL: Den begärda URL:en kunde inte hämtas
ERROR
The requested URL could not be retrieved
Felaktig Förfråan fel påträffades när förfrågan skulle behandlas:
%R
Några möjliga problem är:
Avsaknad eller okänd method för förfrågan.
URL saknas.
Avsaknad HTTP identifierare (HTTP/1.0).
Förfrågan är för stor.
Content-Length saknas i POST eller PUT begäran.
Ej tillåtet tecken i värdnamnet; understryckningstecken är ej tillåtna.
Din cacheserver administratör är %w.
\ No newline at end of file
+ FEL: Den begärda URL:en kunde inte hämtas
ERROR
The requested URL could not be retrieved
Felaktig Förfråan fel påträffades när förfrågan skulle behandlas:
%R
Några möjliga problem är:
Avsaknad eller okänd method för förfrågan.
URL saknas.
Avsaknad HTTP identifierare (HTTP/1.0).
Förfrågan är för stor.
Content-Length saknas i POST eller PUT begäran.
Ej tillåtet tecken i värdnamnet; understryckningstecken är ej tillåtna.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Din cacheserver administratör är %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/sv/ERR_UNSUP_HTTPVERSION squid-3.1.0.18/errors/sv/ERR_UNSUP_HTTPVERSION
--- squid-3.1.0.17/errors/sv/ERR_UNSUP_HTTPVERSION 2010-02-25 01:11:13.000000000 +1300
+++ squid-3.1.0.18/errors/sv/ERR_UNSUP_HTTPVERSION 2010-03-14 20:16:21.000000000 +1300
@@ -1 +1 @@
- FEL: Den begärda URL:en kunde inte hämtas
ERROR
Unsupported HTTP version
Följande fel påträffades vid hämtning av URL: %U
Unsupported HTTP version
This Squid does not accept the HTTP version you are attempting to use.
Din cacheserver administratör är %w.
\ No newline at end of file
+ FEL: Den begärda URL:en kunde inte hämtas
ERROR
Icke stödd HTTP version
Följande fel påträffades vid hämtning av URL: %U
Unsupported HTTP version
Squid fungerar inte med den versionen av HTTP som du försöker använda
Din cacheserver administratör är %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/templates/ERR_INVALID_REQ squid-3.1.0.18/errors/templates/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/templates/ERR_INVALID_REQ 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/errors/templates/ERR_INVALID_REQ 2010-03-14 20:06:08.000000000 +1300
@@ -31,6 +31,7 @@
Request is too large.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
+HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.17/errors/th/ERR_INVALID_REQ squid-3.1.0.18/errors/th/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/th/ERR_INVALID_REQ 2010-02-25 01:11:33.000000000 +1300
+++ squid-3.1.0.18/errors/th/ERR_INVALID_REQ 2010-03-14 20:16:40.000000000 +1300
@@ -1 +1 @@
- ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ
ERROR
ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ
Invalid Request error was encountered while trying to process the request:
%R
ปัญหาที่เป็นไปได้อาจจะเป็น:
ไม่ได้ระบุวิธีการหรือคำสั่ง หรือ ไม่รู้จักวิธีการหรือคำสั่งที่เรียกมา (request method)
ไม่ได้ระบุ URL
ไม่ได้ระบุชื่อตัวแแปร (identifier) ใน HTTP (HTTP/1.0)
คำสั่งหรือคำร้อง (request) ที่ส่ง มีขนาดใหญ่เกินไป
ไม่ได้ระบุ Content-Length ในการสั่ง POST หรือ PUT
Illegal character in hostname; underscores are not allowed.
ผู้ดูแลระบบแคชของคุณคือ %w
\ No newline at end of file
+ ERROR: ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ
ERROR
ไม่สามารถเรียกดู URL ที่ได้รับการร้องขอ
Invalid Request error was encountered while trying to process the request:
%R
ปัญหาที่เป็นไปได้อาจจะเป็น:
ไม่ได้ระบุวิธีการหรือคำสั่ง หรือ ไม่รู้จักวิธีการหรือคำสั่งที่เรียกมา (request method)
ไม่ได้ระบุ URL
ไม่ได้ระบุชื่อตัวแแปร (identifier) ใน HTTP (HTTP/1.0)
คำสั่งหรือคำร้อง (request) ที่ส่ง มีขนาดใหญ่เกินไป
ไม่ได้ระบุ Content-Length ในการสั่ง POST หรือ PUT
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
ผู้ดูแลระบบแคชของคุณคือ %w
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/tr/ERR_INVALID_REQ squid-3.1.0.18/errors/tr/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/tr/ERR_INVALID_REQ 2010-02-25 01:11:49.000000000 +1300
+++ squid-3.1.0.18/errors/tr/ERR_INVALID_REQ 2010-03-14 20:16:54.000000000 +1300
@@ -1 +1 @@
- HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
Geçersiz İstek İşlem sırasında bir hata ile karşılaşıldı:
%R
Buna sebep aşağidakilerden herhangi biri olabilir:
Eksik veya bilinmeyen metod (GET, POST).
Eksik URL.
Eksik HTTP Belirleyici (HTTP/1.0).
İstenilen dosya çok büyük.
Content-Length, POST veya PUT istekleri için eksik.
Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz).
Önbellk yöneticiniz %w.
\ No newline at end of file
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
Geçersiz İstek İşlem sırasında bir hata ile karşılaşıldı:
%R
Buna sebep aşağidakilerden herhangi biri olabilir:
Eksik veya bilinmeyen metod (GET, POST).
Eksik URL.
Eksik HTTP Belirleyici (HTTP/1.0).
İstenilen dosya çok büyük.
Content-Length, POST veya PUT istekleri için eksik.
Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz).
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Önbellk yöneticiniz %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/TRANSLATORS squid-3.1.0.18/errors/TRANSLATORS
--- squid-3.1.0.17/errors/TRANSLATORS 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/errors/TRANSLATORS 2010-03-14 20:06:08.000000000 +1300
@@ -4,9 +4,9 @@
Adi Sudana
Aecio F. Neto
Alexandre Correa
- Amos Jeffries
+ Amos Jeffries
Arthur Titeica
- Bratislav Ilic
+ Bratislav Ilic
Christian Schmidt
Constantin Rack
Evgeni Gechev
diff -u -r -N squid-3.1.0.17/errors/uk/ERR_INVALID_REQ squid-3.1.0.18/errors/uk/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/uk/ERR_INVALID_REQ 2010-02-25 01:12:04.000000000 +1300
+++ squid-3.1.0.18/errors/uk/ERR_INVALID_REQ 2010-03-14 20:17:09.000000000 +1300
@@ -1 +1 @@
- ПОМИЛКА: Запитаний URL не може бути отриманий.
ERROR
The requested URL could not be retrieved
Невірний запит виник при обробці запиту:
%R
Ймовірні причини:
Відсутній або невідомий метод запиту
Відсутній URL
Відсутній HTTP ідентифікатор (HTTP/1.0)
Запит завеликий
Заголовок Content-Length відсутній для запитів POST чи PUT
Неприпустимий символ в імені сервера; символ підкреслення заборонено.
Адміністратор даного кешу %w.
\ No newline at end of file
+ ПОМИЛКА: Запитаний URL не може бути отриманий.
ERROR
The requested URL could not be retrieved
Невірний запит виник при обробці запиту:
%R
Ймовірні причини:
Відсутній або невідомий метод запиту
Відсутній URL
Відсутній HTTP ідентифікатор (HTTP/1.0)
Запит завеликий
Заголовок Content-Length відсутній для запитів POST чи PUT
Неприпустимий символ в імені сервера; символ підкреслення заборонено.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Адміністратор даного кешу %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/uz/ERR_INVALID_REQ squid-3.1.0.18/errors/uz/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/uz/ERR_INVALID_REQ 2010-02-25 01:12:19.000000000 +1300
+++ squid-3.1.0.18/errors/uz/ERR_INVALID_REQ 2010-03-14 20:17:24.000000000 +1300
@@ -1 +1 @@
- ХАТО: Сўралган URL топилмади
ERROR
The requested URL could not be retrieved
Яроқсиз Сўров сўров бажарилаётган вақтда хатолик яратилди:
%R
Баъзи бўлиши мумкин бўлган муаммолар:
Йўқолган ёки номаълум сўраш методи
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Сўров жуда катта.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
Your cache administrator is %w.
\ No newline at end of file
+ ХАТО: Сўралган URL топилмади
ERROR
The requested URL could not be retrieved
Яроқсиз Сўров сўров бажарилаётган вақтда хатолик яратилди:
%R
Баъзи бўлиши мумкин бўлган муаммолар:
Йўқолган ёки номаълум сўраш методи
Missing URL.
Missing HTTP Identifier (HTTP/1.0).
Сўров жуда катта.
Content-Length missing for POST or PUT requests.
Illegal character in hostname; underscores are not allowed.
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/zh-cn/ERR_INVALID_REQ squid-3.1.0.18/errors/zh-cn/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/zh-cn/ERR_INVALID_REQ 2010-02-25 01:12:34.000000000 +1300
+++ squid-3.1.0.18/errors/zh-cn/ERR_INVALID_REQ 2010-03-14 20:17:39.000000000 +1300
@@ -1 +1 @@
- 错误: 您所请求的网址（URL）无法获取
ERROR
The requested URL could not be retrieved
非法请求 尝试处理请求是发生错误:
%R
可能的问题包括：
缓存服务器的管理员 %w.
\ No newline at end of file
+ 错误: 您所请求的网址（URL）无法获取
ERROR
The requested URL could not be retrieved
非法请求 尝试处理请求是发生错误:
%R
可能的问题包括：
缓存服务器的管理员 %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/errors/zh-tw/ERR_INVALID_REQ squid-3.1.0.18/errors/zh-tw/ERR_INVALID_REQ
--- squid-3.1.0.17/errors/zh-tw/ERR_INVALID_REQ 2010-02-25 01:12:49.000000000 +1300
+++ squid-3.1.0.18/errors/zh-tw/ERR_INVALID_REQ 2010-03-14 20:17:54.000000000 +1300
@@ -1 +1 @@
- 錯誤: 欲連結之網址（URL）無法正確的傳回
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
Your cache administrator is %w.
\ No newline at end of file
+ 錯誤: 欲連結之網址（URL）無法正確的傳回
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Some possible problems are:
要求方式遺失或是未知
網站位置遺失
HTTP 標準的宣告遺失（HTTP/1.0）
要求命令過長
Content-Length missing for POST or PUT requests.
欲連結的主機名稱包含不合法的字元；底線這個字元是不被允許存在的。
HTTP/1.1 Expect: feature is being asked from an HTTP/1.0 software.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.17/helpers/external_acl/ldap_group/squid_ldap_group.c squid-3.1.0.18/helpers/external_acl/ldap_group/squid_ldap_group.c
--- squid-3.1.0.17/helpers/external_acl/ldap_group/squid_ldap_group.c 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/helpers/external_acl/ldap_group/squid_ldap_group.c 2010-03-14 20:06:08.000000000 +1300
@@ -476,6 +476,8 @@
char *u = strrchr(user, '\\');
if (!u)
u = strrchr(user, '/');
+ if (!u)
+ u = strrchr(user, '+');
if (u && u[1])
user = u + 1;
}
diff -u -r -N squid-3.1.0.17/helpers/external_acl/unix_group/check_group.c squid-3.1.0.18/helpers/external_acl/unix_group/check_group.c
--- squid-3.1.0.17/helpers/external_acl/unix_group/check_group.c 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/helpers/external_acl/unix_group/check_group.c 2010-03-14 20:06:08.000000000 +1300
@@ -29,6 +29,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
* Change Log:
+ * 2010-02-24 hno
+ * Removed group number limitation and fixed related uninitialized
+ * pointer reference (Bug #2813)
+ *
* Revision 1.7 2004/08/15 00:29:33 hno
* helper protocol changed to URL-escaped strings in Squid-3.0
*
@@ -65,8 +69,6 @@
#include
#define BUFSIZE 8192 /* the stdin buffer size */
-#define MAX_GROUP 10 /* maximum number of groups specified
-* on the command line */
/*
* Verify if users primary group matches groupname
@@ -139,8 +141,8 @@
{
char *user, *suser, *p;
char buf[BUFSIZE];
- char *grents[MAX_GROUP];
- int check_pw = 0, ch, i = 0, j = 0, strip_dm = 0;
+ char **grents = NULL;
+ int check_pw = 0, ch, ngroups = 0, i, j = 0, strip_dm = 0;
/* make standard output line buffered */
setvbuf(stdout, NULL, _IOLBF, 0);
@@ -155,19 +157,11 @@
check_pw = 1;
break;
case 'g':
- grents[i] = calloc(strlen(optarg) + 1, sizeof(char));
- strcpy(grents[i], optarg);
- if (i < MAX_GROUP) {
- i++;
- } else {
- fprintf(stderr,
- "Exceeded maximum number of allowed groups (%i)\n", i);
- exit(1);
- }
+ grents = realloc(grents, sizeof(*grents) * (ngroups+1));
+ grents[ngroups++] = optarg;
break;
case '?':
if (xisprint(optopt)) {
-
fprintf(stderr, "Unknown option '-%c'.\n", optopt);
} else {
fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
@@ -211,13 +205,12 @@
rfc1738_unescape(p);
if (check_pw == 1)
j += validate_user_pw(user, p);
-
j += validate_user_gr(user, p);
}
}
/* check groups supplied on the command line */
- for (i = 0; grents[i] != NULL; i++) {
+ for (i = 0; i < ngroups; i++) {
if (check_pw == 1) {
j += validate_user_pw(user, grents[i]);
}
diff -u -r -N squid-3.1.0.17/include/version.h squid-3.1.0.18/include/version.h
--- squid-3.1.0.17/include/version.h 2010-02-25 01:01:41.000000000 +1300
+++ squid-3.1.0.18/include/version.h 2010-03-14 20:06:46.000000000 +1300
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1267012855
+#define SQUID_RELEASE_TIME 1268550359
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.1.0.17/lib/uudecode.c squid-3.1.0.18/lib/uudecode.c
--- squid-3.1.0.17/lib/uudecode.c 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/lib/uudecode.c 2010-03-14 20:06:08.000000000 +1300
@@ -5,8 +5,6 @@
#include "config.h"
#include "util.h"
-extern char **environ;
-
/* aaaack but it's fast and const should make it shared text page. */
const int pr2six[256] = {
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
diff -u -r -N squid-3.1.0.17/RELEASENOTES.html squid-3.1.0.18/RELEASENOTES.html
--- squid-3.1.0.17/RELEASENOTES.html 2010-02-25 01:12:58.000000000 +1300
+++ squid-3.1.0.18/RELEASENOTES.html 2010-03-14 20:18:02.000000000 +1300
@@ -2,10 +2,10 @@
- Squid 3.1.0.17 release notes
+ Squid 3.1.0.18 release notes
-Squid 3.1.0.17 release notes
+Squid 3.1.0.18 release notes
Squid Developers
@@ -70,7 +70,7 @@
-The Squid Team are pleased to announce the release of Squid-3.1.0.17 for testing.
+The Squid Team are pleased to announce the release of Squid-3.1.0.18 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.1/ or the
mirrors.
@@ -901,6 +901,10 @@
+ignore_expect_100
+Ported from 2.7. Requires --enable-http-violations
+Prevents 417 errors being sent to broken HTTP/1.1 non-compliant clients.
+
include
New option to import entire secondary configuration files into squid.conf.
@@ -1810,9 +1814,6 @@
http11 not yet ported from 2.7
urlgroup= not yet ported from 2.6
-
ignore_expect_100
-Not yet ported from 2.7
-
ignore_ims_on_miss
Not yet ported from 2.7
diff -u -r -N squid-3.1.0.17/src/access_log.cc squid-3.1.0.18/src/access_log.cc
--- squid-3.1.0.17/src/access_log.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/access_log.cc 2010-03-14 20:06:08.000000000 +1300
@@ -1538,10 +1538,10 @@
logformat *format;
struct logformat_token_table_entry *te;
- debugs(46, 0, "accessLogDumpLogFormat called");
+ debugs(46, 4, "accessLogDumpLogFormat called");
for (format = definitions; format; format = format->next) {
- debugs(46, 0, "Dumping logformat definition for " << format->name);
+ debugs(46, 3, "Dumping logformat definition for " << format->name);
storeAppendPrintf(entry, "logformat %s ", format->name);
for (t = format->format; t; t = t->next) {
diff -u -r -N squid-3.1.0.17/src/auth/digest/auth_digest.cc squid-3.1.0.18/src/auth/digest/auth_digest.cc
--- squid-3.1.0.17/src/auth/digest/auth_digest.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/auth/digest/auth_digest.cc 2010-03-14 20:06:08.000000000 +1300
@@ -67,6 +67,33 @@
CBDATA_TYPE(DigestAuthenticateStateData);
+enum http_digest_attr_type {
+ DIGEST_USERNAME,
+ DIGEST_REALM,
+ DIGEST_QOP,
+ DIGEST_ALGORITHM,
+ DIGEST_URI,
+ DIGEST_NONCE,
+ DIGEST_NC,
+ DIGEST_CNONCE,
+ DIGEST_RESPONSE,
+ DIGEST_ENUM_END
+};
+
+static const HttpHeaderFieldAttrs DigestAttrs[DIGEST_ENUM_END] = {
+ {"username", (http_hdr_type)DIGEST_USERNAME},
+ {"realm", (http_hdr_type)DIGEST_REALM},
+ {"qop", (http_hdr_type)DIGEST_QOP},
+ {"algorithm", (http_hdr_type)DIGEST_ALGORITHM},
+ {"uri", (http_hdr_type)DIGEST_URI},
+ {"nonce", (http_hdr_type)DIGEST_NONCE},
+ {"nc", (http_hdr_type)DIGEST_NC},
+ {"cnonce", (http_hdr_type)DIGEST_CNONCE},
+ {"response", (http_hdr_type)DIGEST_RESPONSE},
+};
+
+static HttpHeaderFieldInfo *DigestFieldsInfo = NULL;
+
/*
*
* Nonce Functions
@@ -505,6 +532,11 @@
if (digestauthenticators)
helperShutdown(digestauthenticators);
+ if (DigestFieldsInfo) {
+ httpHeaderDestroyFieldsInfo(DigestFieldsInfo, DIGEST_ENUM_END);
+ DigestFieldsInfo = NULL;
+ }
+
authdigest_initialised = 0;
if (!shutting_down) {
@@ -640,6 +672,7 @@
if (strcasecmp(digest_request->response, Response)) {
credentials(Failed);
+ digest_request->flags.invalid_password = 1;
digest_request->setDenyMessage("Incorrect password");
return;
} else {
@@ -869,6 +902,7 @@
AuthDigestConfig::init(AuthConfig * scheme)
{
if (authenticate) {
+ DigestFieldsInfo = httpHeaderBuildFieldsInfo(DigestAttrs, DIGEST_ENUM_END);
authenticateDigestNonceSetup();
authdigest_initialised = 1;
@@ -1094,124 +1128,96 @@
String temp(proxy_auth);
while (strListGetItem(&temp, ',', &item, &ilen, &pos)) {
- if ((p = strchr(item, '=')) && (p - item < ilen))
- ilen = p++ - item;
-
- if (!strncmp(item, "username", ilen)) {
- /* white space */
+ /* isolate directive name & value */
+ size_t nlen;
+ size_t vlen;
+ if ((p = (const char *)memchr(item, '=', ilen)) && (p - item < ilen)) {
+ nlen = p++ - item;
+ vlen = ilen - (p - item);
+ } else {
+ nlen = ilen;
+ vlen = 0;
+ }
- while (xisspace(*p))
- p++;
+ /* parse value. auth-param = token "=" ( token | quoted-string ) */
+ String value;
+ if (vlen > 0) {
+ if (*p == '"') {
+ if (!httpHeaderParseQuotedString(p, &value)) {
+ debugs(29, 9, "authDigestDecodeAuth: Failed to parse attribute '" << item << "' in '" << temp << "'");
+ continue;
+ }
+ } else {
+ value.limitInit(p, vlen);
+ }
+ } else {
+ debugs(29, 9, "authDigestDecodeAuth: Failed to parse attribute '" << item << "' in '" << temp << "'");
+ continue;
+ }
- /* quote mark */
- p++;
+ /* find type */
+ http_digest_attr_type type = (http_digest_attr_type)httpHeaderIdByName(item, nlen, DigestFieldsInfo, DIGEST_ENUM_END);
+ switch (type) {
+ case DIGEST_USERNAME:
safe_free(username);
- username = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ username = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found Username '" << username << "'");
- } else if (!strncmp(item, "realm", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_REALM:
safe_free(digest_request->realm);
- digest_request->realm = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->realm = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found realm '" << digest_request->realm << "'");
- } else if (!strncmp(item, "qop", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- if (*p == '\"')
- /* quote mark */
- p++;
+ break;
+ case DIGEST_QOP:
safe_free(digest_request->qop);
- digest_request->qop = xstrndup(p, strcspn(p, "\" \t\r\n()<>@,;:\\/[]?={}") + 1);
-
+ digest_request->qop = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found qop '" << digest_request->qop << "'");
- } else if (!strncmp(item, "algorithm", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- if (*p == '\"')
- /* quote mark */
- p++;
+ break;
+ case DIGEST_ALGORITHM:
safe_free(digest_request->algorithm);
- digest_request->algorithm = xstrndup(p, strcspn(p, "\" \t\r\n()<>@,;:\\/[]?={}") + 1);
-
+ digest_request->algorithm = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found algorithm '" << digest_request->algorithm << "'");
- } else if (!strncmp(item, "uri", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_URI:
safe_free(digest_request->uri);
- digest_request->uri = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->uri = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found uri '" << digest_request->uri << "'");
- } else if (!strncmp(item, "nonce", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_NONCE:
safe_free(digest_request->nonceb64);
- digest_request->nonceb64 = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->nonceb64 = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found nonce '" << digest_request->nonceb64 << "'");
- } else if (!strncmp(item, "nc", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- xstrncpy(digest_request->nc, p, 9);
+ break;
+ case DIGEST_NC:
+ if (value.size() != 8) {
+ debugs(29, 9, "authDigestDecodeAuth: Invalid nc '" << value << "' in '" << temp << "'");
+ }
+ xstrncpy(digest_request->nc, value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found noncecount '" << digest_request->nc << "'");
- } else if (!strncmp(item, "cnonce", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_CNONCE:
safe_free(digest_request->cnonce);
- digest_request->cnonce = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->cnonce = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found cnonce '" << digest_request->cnonce << "'");
- } else if (!strncmp(item, "response", ilen)) {
- /* white space */
-
- while (xisspace(*p))
- p++;
-
- /* quote mark */
- p++;
+ break;
+ case DIGEST_RESPONSE:
safe_free(digest_request->response);
- digest_request->response = xstrndup(p, strchr(p, '"') + 1 - p);
-
+ digest_request->response = xstrndup(value.rawBuf(), value.size() + 1);
debugs(29, 9, "authDigestDecodeAuth: Found response '" << digest_request->response << "'");
+ break;
+
+ default:
+ debugs(29, 3, "authDigestDecodeAuth: Unknown attribute '" << item << "' in '" << temp << "'");
+ break;
}
}
@@ -1229,69 +1235,103 @@
* correct values - 400/401/407
*/
- /* first the NONCE count */
+ /* 2069 requirements */
- if (digest_request->cnonce && strlen(digest_request->nc) != 8) {
- debugs(29, 4, "authenticateDigestDecode: nonce count length invalid");
+ /* do we have a username ? */
+ if (!username || username[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present username");
return authDigestLogUsername(username, digest_request);
}
- /* now the nonce */
- nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
-
- if (!nonce) {
- /* we couldn't find a matching nonce! */
- debugs(29, 4, "authenticateDigestDecode: Unexpected or invalid nonce received");
+ /* Sanity check of the username.
+ * " can not be allowed in usernames until * the digest helper protocol
+ * have been redone
+ */
+ if (strchr(username, '"')) {
+ debugs(29, 2, "authenticateDigestDecode: Unacceptable username '" << username << "'");
return authDigestLogUsername(username, digest_request);
}
- digest_request->nonce = nonce;
- authDigestNonceLink(nonce);
-
- /* check the qop is what we expected. Note that for compatability with
- * RFC 2069 we should support a missing qop. Tough. */
+ /* do we have a realm ? */
+ if (!digest_request->realm || digest_request->realm[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present realm");
+ return authDigestLogUsername(username, digest_request);
+ }
- if (digest_request->qop && strcmp(digest_request->qop, QOP_AUTH) != 0) {
- /* we received a qop option we didn't send */
- debugs(29, 4, "authenticateDigestDecode: Invalid qop option received");
+ /* and a nonce? */
+ if (!digest_request->nonceb64 || digest_request->nonceb64[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Empty or not present nonce");
return authDigestLogUsername(username, digest_request);
}
/* we can't check the URI just yet. We'll check it in the
- * authenticate phase */
+ * authenticate phase, but needs to be given */
+ if (!digest_request->uri || digest_request->uri[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Missing URI field");
+ return authDigestLogUsername(username, digest_request);
+ }
/* is the response the correct length? */
-
if (!digest_request->response || strlen(digest_request->response) != 32) {
- debugs(29, 4, "authenticateDigestDecode: Response length invalid");
+ debugs(29, 2, "authenticateDigestDecode: Response length invalid");
return authDigestLogUsername(username, digest_request);
}
- /* do we have a username ? */
- if (!username || username[0] == '\0') {
- debugs(29, 4, "authenticateDigestDecode: Empty or not present username");
+ /* check the algorithm is present and supported */
+ if (!digest_request->algorithm)
+ digest_request->algorithm = xstrndup("MD5", 4);
+ else if (strcmp(digest_request->algorithm, "MD5")
+ && strcmp(digest_request->algorithm, "MD5-sess")) {
+ debugs(29, 2, "authenticateDigestDecode: invalid algorithm specified!");
return authDigestLogUsername(username, digest_request);
}
- /* check that we're not being hacked / the username hasn't changed */
- if (nonce->user && strcmp(username, nonce->user->username())) {
- debugs(29, 4, "authenticateDigestDecode: Username for the nonce does not equal the username for the request");
- return authDigestLogUsername(username, digest_request);
+ /* 2617 requirements, indicated by qop */
+ if (digest_request->qop) {
+
+ /* check the qop is what we expected. */
+ if (strcmp(digest_request->qop, QOP_AUTH) != 0) {
+ /* we received a qop option we didn't send */
+ debugs(29, 2, "authenticateDigestDecode: Invalid qop option received");
+ return authDigestLogUsername(username, digest_request);
+ }
+
+ /* check cnonce */
+ if (!digest_request->cnonce || digest_request->cnonce[0] == '\0') {
+ debugs(29, 2, "authenticateDigestDecode: Missing cnonce field");
+ return authDigestLogUsername(username, digest_request);
+ }
+
+ /* check nc */
+ if (strlen(digest_request->nc) != 8 || strspn(digest_request->nc, "0123456789abcdefABCDEF") != 8) {
+ debugs(29, 2, "authenticateDigestDecode: invalid nonce count");
+ return authDigestLogUsername(username, digest_request);
+ }
+ } else {
+ /* cnonce and nc both require qop */
+ if (digest_request->cnonce || digest_request->nc) {
+ debugs(29, 2, "authenticateDigestDecode: missing qop!");
+ return authDigestLogUsername(username, digest_request);
+ }
}
- /* if we got a qop, did we get a cnonce or did we get a cnonce wihtout a qop? */
- if ((digest_request->qop && !digest_request->cnonce)
- || (!digest_request->qop && digest_request->cnonce)) {
- debugs(29, 4, "authenticateDigestDecode: qop without cnonce, or vice versa!");
+ /** below nonce state dependent **/
+
+ /* now the nonce */
+ nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
+ if (!nonce) {
+ /* we couldn't find a matching nonce! */
+ debugs(29, 2, "authenticateDigestDecode: Unexpected or invalid nonce received");
+ digest_request->credentials(AuthDigestUserRequest::Failed);
return authDigestLogUsername(username, digest_request);
}
- /* check the algorithm is present and supported */
- if (!digest_request->algorithm)
- digest_request->algorithm = xstrndup("MD5", 4);
- else if (strcmp(digest_request->algorithm, "MD5")
- && strcmp(digest_request->algorithm, "MD5-sess")) {
- debugs(29, 4, "authenticateDigestDecode: invalid algorithm specified!");
+ digest_request->nonce = nonce;
+ authDigestNonceLink(nonce);
+
+ /* check that we're not being hacked / the username hasn't changed */
+ if (nonce->user && strcmp(username, nonce->user->username())) {
+ debugs(29, 2, "authenticateDigestDecode: Username for the nonce does not equal the username for the request");
return authDigestLogUsername(username, digest_request);
}
diff -u -r -N squid-3.1.0.17/src/cache_manager.cc squid-3.1.0.18/src/cache_manager.cc
--- squid-3.1.0.17/src/cache_manager.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/cache_manager.cc 2010-03-14 20:06:09.000000000 +1300
@@ -326,7 +326,7 @@
return;
}
- debugs(16, DBG_IMPORTANT, "CacheManager: " <<
+ debugs(16, 2, "CacheManager: " <<
(mgr->user_name ? mgr->user_name : "") << "@" <<
fd_table[fd].ipaddr << " requesting '" <<
mgr->action << "'" );
diff -u -r -N squid-3.1.0.17/src/cf.data.pre squid-3.1.0.18/src/cf.data.pre
--- squid-3.1.0.17/src/cf.data.pre 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/cf.data.pre 2010-03-14 20:06:08.000000000 +1300
@@ -3855,6 +3855,21 @@
or response to be rejected.
DOC_END
+NAME: ignore_expect_100
+COMMENT: on|off
+IFDEF: HTTP_VIOLATIONS
+TYPE: onoff
+LOC: Config.onoff.ignore_expect_100
+DEFAULT: off
+DOC_START
+ This option makes Squid ignore any Expect: 100-continue header present
+ in the request. RFC 2616 requires that Squid being unable to satisfy
+ the response expectation MUST return a 417 error.
+
+ Note: Enabling this is a HTTP protocol violation, but some clients may
+ not handle it well..
+DOC_END
+
COMMENT_START
TIMEOUTS
-----------------------------------------------------------------------------
diff -u -r -N squid-3.1.0.17/src/client_side.cc squid-3.1.0.18/src/client_side.cc
--- squid-3.1.0.17/src/client_side.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/client_side.cc 2010-03-14 20:06:08.000000000 +1300
@@ -706,8 +706,8 @@
debugs(33, 3, "clientSetKeepaliveFlag: method = " <<
RequestMethodStr(request->method));
+ /* We are HTTP/1.0 facing clients still */
HttpVersion http_ver(1,0);
- /* we are HTTP/1.0, no matter what the client requests... */
if (httpMsgIsPersistent(http_ver, req_hdr))
request->flags.proxy_keepalive = 1;
@@ -2457,6 +2457,27 @@
goto finish;
}
+ if (request->header.has(HDR_EXPECT)) {
+ int ignore = 0;
+#if HTTP_VIOLATIONS
+ if (Config.onoff.ignore_expect_100) {
+ String expect = request->header.getList(HDR_EXPECT);
+ if (expect.caseCmp("100-continue") == 0)
+ ignore = 1;
+ expect.clean();
+ }
+#endif
+ if (!ignore) {
+ clientStreamNode *node = context->getClientReplyContext();
+ clientReplyContext *repContext = dynamic_cast(node->data.getRaw());
+ assert (repContext);
+ repContext->setReplyToError(ERR_INVALID_REQ, HTTP_EXPECTATION_FAILED, request->method, http->uri, conn->peer, request, NULL, NULL);
+ assert(context->http->out.offset == 0);
+ context->pullData();
+ goto finish;
+ }
+ }
+
http->request = HTTPMSGLOCK(request);
clientSetKeepaliveFlag(http);
diff -u -r -N squid-3.1.0.17/src/client_side_request.cc squid-3.1.0.18/src/client_side_request.cc
--- squid-3.1.0.17/src/client_side_request.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/client_side_request.cc 2010-03-14 20:06:08.000000000 +1300
@@ -367,8 +367,8 @@
request->my_addr.SetPort(0);
- /* RFC 2616 says 'upgrade' to our 1.0 regardless of what the client is */
- HttpVersion http_ver(1,0);
+ /* Our version is HTTP/1.1 */
+ HttpVersion http_ver(1,1);
request->http_ver = http_ver;
http->request = HTTPMSGLOCK(request);
diff -u -r -N squid-3.1.0.17/src/errorpage.cc squid-3.1.0.18/src/errorpage.cc
--- squid-3.1.0.17/src/errorpage.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/errorpage.cc 2010-03-14 20:06:09.000000000 +1300
@@ -718,8 +718,9 @@
break;
case 'o':
- p = external_acl_message ? external_acl_message : "[not available]";
-
+ p = request ? request->extacl_message.termedBuf() : external_acl_message;
+ if (!p)
+ p = "[not available]";
break;
case 'p':
diff -u -r -N squid-3.1.0.17/src/external_acl.cc squid-3.1.0.18/src/external_acl.cc
--- squid-3.1.0.17/src/external_acl.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/external_acl.cc 2010-03-14 20:06:08.000000000 +1300
@@ -770,6 +770,9 @@
if (entry->log.size())
ch->request->extacl_log = entry->log;
+
+ if (entry->message.size())
+ ch->request->extacl_message = entry->message;
}
return result;
diff -u -r -N squid-3.1.0.17/src/http.cc squid-3.1.0.18/src/http.cc
--- squid-3.1.0.17/src/http.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/http.cc 2010-03-14 20:06:08.000000000 +1300
@@ -539,8 +539,9 @@
return 0;
- default: /* Unknown status code */
- debugs (11, DBG_IMPORTANT, "WARNING: Unexpected http status code " << rep->sline.status);
+ default:
+ /* RFC 2616 section 6.1.1: an unrecognized response MUST NOT be cached. */
+ debugs (11, 3, HERE << "Unknown HTTP status code " << rep->sline.status << ". Not cacheable.");
return 0;
@@ -713,6 +714,26 @@
readBuf->consume(header_bytes_read);
}
+ /* Skip 1xx messages for now. Advertised in Via as an internal 1.0 hop */
+ if (newrep->sline.protocol == PROTO_HTTP && newrep->sline.status >= 100 && newrep->sline.status < 200) {
+
+#if WHEN_HTTP11
+ /* When HTTP/1.1 check if the client is expecting a 1xx reply and maybe pass it on */
+ if (orig_request->header.has(HDR_EXPECT)) {
+ // TODO: pass to the client anyway?
+ }
+#endif
+ delete newrep;
+ debugs(11, 2, HERE << "1xx headers consume " << header_bytes_read << " bytes header.");
+ header_bytes_read = 0;
+ if (reply_bytes_read > 0)
+ debugs(11, 2, HERE << "1xx headers consume " << reply_bytes_read << " bytes reply.");
+ reply_bytes_read = 0;
+ ctx_exit(ctx);
+ processReplyHeader();
+ return;
+ }
+
flags.chunked = 0;
if (newrep->sline.protocol == PROTO_HTTP && newrep->header.hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',')) {
flags.chunked = 1;
@@ -1908,7 +1929,7 @@
http_state_flags stateFlags)
{
const int offset = mb->size;
- HttpVersion httpver(1,0);
+ HttpVersion httpver(1,1);
mb->Printf("%s %s HTTP/%d.%d\r\n",
RequestMethodStr(aRequest->method),
aRequest->urlpath.size() ? aRequest->urlpath.termedBuf() : "/",
@@ -2130,15 +2151,6 @@
deleteThis("HttpStateData::abortTransaction");
}
-#if DEAD_CODE
-void
-httpBuildVersion(HttpVersion * version, unsigned int major, unsigned int minor)
-{
- version->major = major;
- version->minor = minor;
-}
-#endif
-
HttpRequest *
HttpStateData::originalRequest()
{
diff -u -r -N squid-3.1.0.17/src/HttpHeader.cc squid-3.1.0.18/src/HttpHeader.cc
--- squid-3.1.0.17/src/HttpHeader.cc 2010-02-25 01:01:03.000000000 +1300
+++ squid-3.1.0.18/src/HttpHeader.cc 2010-03-14 20:06:09.000000000 +1300
@@ -95,6 +95,7 @@
{"Date", HDR_DATE, ftDate_1123},
{"ETag", HDR_ETAG, ftETag},
{"Expires", HDR_EXPIRES, ftDate_1123},
+ {"Expect", HDR_EXPECT, ftStr},
{"From", HDR_FROM, ftStr},
{"Host", HDR_HOST, ftStr},
{"If-Match", HDR_IF_MATCH, ftStr}, /* for now */
@@ -174,6 +175,7 @@
HDR_CONTENT_ENCODING,
HDR_CONTENT_LANGUAGE,
HDR_CONNECTION,
+ HDR_EXPECT,
HDR_IF_MATCH, HDR_IF_NONE_MATCH,
HDR_LINK, HDR_PRAGMA,
HDR_PROXY_CONNECTION,
@@ -186,7 +188,7 @@
HDR_WWW_AUTHENTICATE,
HDR_AUTHENTICATION_INFO,
HDR_PROXY_AUTHENTICATION_INFO,
- /* HDR_EXPECT, HDR_TE, HDR_TRAILER */
+ /* HDR_TE, HDR_TRAILER */
#if X_ACCELERATOR_VARY
HDR_X_ACCELERATOR_VARY,
#endif
diff -u -r -N squid-3.1.0.17/src/HttpHeader.h squid-3.1.0.18/src/HttpHeader.h
--- squid-3.1.0.17/src/HttpHeader.h 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/HttpHeader.h 2010-03-14 20:06:08.000000000 +1300
@@ -76,6 +76,7 @@
HDR_DATE,
HDR_ETAG,
HDR_EXPIRES,
+ HDR_EXPECT,
HDR_FROM,
HDR_HOST,
HDR_IF_MATCH,
diff -u -r -N squid-3.1.0.17/src/HttpHeaderTools.cc squid-3.1.0.18/src/HttpHeaderTools.cc
--- squid-3.1.0.17/src/HttpHeaderTools.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/HttpHeaderTools.cc 2010-03-14 20:06:09.000000000 +1300
@@ -335,25 +335,29 @@
{
const char *end, *pos;
val->clean();
- assert (*start == '"');
+ if (*start != '"') {
+ debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ return 0;
+ }
pos = start + 1;
- while (1) {
- if (!(end = index (pos,'"'))) {
+ while (*pos != '"') {
+ bool quoted = (*pos == '\\');
+ if (quoted)
+ pos++;
+ if (!*pos) {
debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ val->clean();
return 0;
}
-
- /* check for quoted-chars */
- if (*(end - 1) != '\\') {
- /* done */
- val->append(start + 1, end-start-1);
- return 1;
- }
-
- /* try for the end again */
- pos = end + 1;
+ end = pos + strcspn(pos + quoted, "\"\\") + quoted;
+ val->append(pos, end-pos);
+ pos = end;
}
+ /* Make sure it's defined even if empty "" */
+ if (!val->defined())
+ val->limitInit("", 0);
+ return 1;
}
/**
diff -u -r -N squid-3.1.0.17/src/HttpMsg.cc squid-3.1.0.18/src/HttpMsg.cc
--- squid-3.1.0.17/src/HttpMsg.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/HttpMsg.cc 2010-03-14 20:06:09.000000000 +1300
@@ -321,18 +321,13 @@
int
httpMsgIsPersistent(HttpVersion const &http_ver, const HttpHeader * hdr)
{
-#if WHEN_SQUID_IS_HTTP1_1
-
if ((http_ver.major >= 1) && (http_ver.minor >= 1)) {
/*
* for modern versions of HTTP: persistent unless there is
* a "Connection: close" header.
*/
return !httpHeaderHasConnDir(hdr, "close");
- } else
-#else
- {
-#endif
+ } else {
/*
* Persistent connections in Netscape 3.x are allegedly broken,
* return false if it is a browser connection. If there is a
@@ -340,17 +335,17 @@
*/
const char *agent = hdr->getStr(HDR_USER_AGENT);
- if (agent && !hdr->has(HDR_VIA)) {
- if (!strncasecmp(agent, "Mozilla/3.", 10))
- return 0;
+ if (agent && !hdr->has(HDR_VIA)) {
+ if (!strncasecmp(agent, "Mozilla/3.", 10))
+ return 0;
- if (!strncasecmp(agent, "Netscape/3.", 11))
- return 0;
- }
+ if (!strncasecmp(agent, "Netscape/3.", 11))
+ return 0;
+ }
- /* for old versions of HTTP: persistent if has "keep-alive" */
- return httpHeaderHasConnDir(hdr, "keep-alive");
-}
+ /* for old versions of HTTP: persistent if has "keep-alive" */
+ return httpHeaderHasConnDir(hdr, "keep-alive");
+ }
}
void HttpMsg::packInto(Packer *p, bool full_uri) const
diff -u -r -N squid-3.1.0.17/src/HttpRequest.cc squid-3.1.0.18/src/HttpRequest.cc
--- squid-3.1.0.17/src/HttpRequest.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/HttpRequest.cc 2010-03-14 20:06:08.000000000 +1300
@@ -100,6 +100,7 @@
extacl_user = null_string;
extacl_passwd = null_string;
extacl_log = null_string;
+ extacl_message = null_string;
pstate = psReadyToParseStartLine;
#if FOLLOW_X_FORWARDED_FOR
indirect_client_addr.SetEmpty();
@@ -150,6 +151,8 @@
extacl_log.clean();
+ extacl_message.clean();
+
#if USE_ADAPTATION
adaptHistory_ = NULL;
#endif
@@ -203,6 +206,7 @@
copy->extacl_user = extacl_user;
copy->extacl_passwd = extacl_passwd;
copy->extacl_log = extacl_log;
+ copy->extacl_message = extacl_message;
assert(copy->inheritProperties(this));
@@ -319,8 +323,9 @@
{
assert(p);
/* pack request-line */
- packerPrintf(p, "%s " SQUIDSTRINGPH " HTTP/1.0\r\n",
- RequestMethodStr(method), SQUIDSTRINGPRINT(urlpath));
+ packerPrintf(p, "%s " SQUIDSTRINGPH " HTTP/%d.%d\r\n",
+ RequestMethodStr(method), SQUIDSTRINGPRINT(urlpath),
+ http_ver.major, http_ver.minor);
/* headers */
header.packInto(p);
/* trailer */
diff -u -r -N squid-3.1.0.17/src/HttpRequest.h squid-3.1.0.18/src/HttpRequest.h
--- squid-3.1.0.17/src/HttpRequest.h 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/HttpRequest.h 2010-03-14 20:06:08.000000000 +1300
@@ -193,6 +193,8 @@
String extacl_log; /* String to be used for access.log purposes */
+ String extacl_message; /* String to be used for error page purposes */
+
#if FOLLOW_X_FORWARDED_FOR
String x_forwarded_for_iterator; /* XXX a list of IP addresses */
#endif /* FOLLOW_X_FORWARDED_FOR */
diff -u -r -N squid-3.1.0.17/src/icmp/net_db.cc squid-3.1.0.18/src/icmp/net_db.cc
--- squid-3.1.0.17/src/icmp/net_db.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/icmp/net_db.cc 2010-03-14 20:06:08.000000000 +1300
@@ -1320,7 +1320,7 @@
HTTPMSGLOCK(ex->r);
assert(NULL != ex->r);
- ex->r->http_ver = HttpVersion(1,0);
+ ex->r->http_ver = HttpVersion(1,1);
ex->connstate = STATE_HEADER;
ex->e = storeCreateEntry(uri, uri, request_flags(), METHOD_GET);
ex->buf_sz = NETDB_REQBUF_SZ;
diff -u -r -N squid-3.1.0.17/src/ip/IpAddress.cc squid-3.1.0.18/src/ip/IpAddress.cc
--- squid-3.1.0.17/src/ip/IpAddress.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/ip/IpAddress.cc 2010-03-14 20:06:09.000000000 +1300
@@ -75,16 +75,6 @@
# define s6_addr s_addr
#endif
-static const unsigned int STRLEN_IP4A = 16; // aaa.bbb.ccc.ddd\0
-static const unsigned int STRLEN_IP4R = 28; // ddd.ccc.bbb.aaa.in-addr.arpa.\0
-static const unsigned int STRLEN_IP4S = 21; // ddd.ccc.bbb.aaa:ppppp\0
-static const unsigned int MAX_IP4_STRLEN = STRLEN_IP4R;
-static const unsigned int STRLEN_IP6A = 42; // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]/0
-static const unsigned int STRLEN_IP6R = 75; // f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f ipv6.arpa./0
-static const unsigned int STRLEN_IP6S = 48; // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:00000/0
-static const unsigned int MAX_IP6_STRLEN = STRLEN_IP6R;
-
-
/* Debugging only. Dump the address content when a fatal assert is encountered. */
#if USE_IPV6
#define IASSERT(a,b) \
@@ -291,23 +281,29 @@
memset(&m_SocketAddr, 0, sizeof(m_SocketAddr) );
}
+#if USE_IPV6
+const struct in6_addr IpAddress::v4_localhost = {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x01 }}
+};
+const struct in6_addr IpAddress::v4_anyaddr = {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}
+};
+const struct in6_addr IpAddress::v6_noaddr = {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}
+};
+#endif
+
+
bool IpAddress::SetIPv4()
{
#if USE_IPV6
- static const struct in6_addr v4_localhost = {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x01 }}
- };
- static const struct in6_addr v4_any = {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}
- };
-
if ( IsLocalhost() ) {
m_SocketAddr.sin6_addr = v4_localhost;
return true;
}
if ( IsAnyAddr() ) {
- m_SocketAddr.sin6_addr = v4_any;
+ m_SocketAddr.sin6_addr = v4_anyaddr;
return true;
}
@@ -324,10 +320,6 @@
bool IpAddress::IsLocalhost() const
{
#if USE_IPV6
- static const struct in6_addr v4_localhost = {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x01 }}
- };
-
return IN6_IS_ADDR_LOOPBACK( &m_SocketAddr.sin6_addr ) || IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v4_localhost );
#else
return (htonl(0x7F000001) == m_SocketAddr.sin_addr.s_addr);
@@ -337,10 +329,8 @@
void IpAddress::SetLocalhost()
{
#if USE_IPV6
- SetAnyAddr();
- m_SocketAddr.sin6_addr.s6_addr[15] = 0x1;
+ m_SocketAddr.sin6_addr = in6addr_loopback;
m_SocketAddr.sin6_family = AF_INET6;
-
#else
m_SocketAddr.sin_addr.s_addr = htonl(0x7F000001);
m_SocketAddr.sin_family = AF_INET;
@@ -351,10 +341,6 @@
{
// IFF the address == 0xff..ff (all ones)
#if USE_IPV6
- static const struct in6_addr v6_noaddr = {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}
- };
-
return IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v6_noaddr );
#else
return 0xFFFFFFFF == m_SocketAddr.sin_addr.s_addr;
@@ -364,10 +350,10 @@
void IpAddress::SetNoAddr()
{
#if USE_IPV6
- memset(&m_SocketAddr.sin6_addr, 0xFFFFFFFF, sizeof(struct in6_addr) );
+ memset(&m_SocketAddr.sin6_addr, 0xFF, sizeof(struct in6_addr) );
m_SocketAddr.sin6_family = AF_INET6;
#else
- memset(&m_SocketAddr.sin_addr, 0xFFFFFFFF, sizeof(struct in_addr) );
+ memset(&m_SocketAddr.sin_addr, 0xFF, sizeof(struct in_addr) );
m_SocketAddr.sin_family = AF_INET;
#endif
}
diff -u -r -N squid-3.1.0.17/src/ip/IpAddress.h squid-3.1.0.18/src/ip/IpAddress.h
--- squid-3.1.0.17/src/ip/IpAddress.h 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/ip/IpAddress.h 2010-03-14 20:06:08.000000000 +1300
@@ -412,6 +412,22 @@
struct sockaddr_in m_SocketAddr;
#endif
+
+private:
+ /* Internally used constants */
+ static const unsigned int STRLEN_IP4A = 16; // aaa.bbb.ccc.ddd\0
+ static const unsigned int STRLEN_IP4R = 28; // ddd.ccc.bbb.aaa.in-addr.arpa.\0
+ static const unsigned int STRLEN_IP4S = 21; // ddd.ccc.bbb.aaa:ppppp\0
+ static const unsigned int MAX_IP4_STRLEN = STRLEN_IP4R;
+#if USE_IPV6
+ static const unsigned int STRLEN_IP6A = 42; // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]/0
+ static const unsigned int STRLEN_IP6R = 75; // f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f ipv6.arpa./0
+ static const unsigned int STRLEN_IP6S = 48; // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:00000/0
+ static const unsigned int MAX_IP6_STRLEN = STRLEN_IP6R;
+ static const struct in6_addr v4_localhost;
+ static const struct in6_addr v4_anyaddr;
+ static const struct in6_addr v6_noaddr;
+#endif
};
diff -u -r -N squid-3.1.0.17/src/ssl_support.cc squid-3.1.0.18/src/ssl_support.cc
--- squid-3.1.0.17/src/ssl_support.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/ssl_support.cc 2010-03-14 20:06:08.000000000 +1300
@@ -159,7 +159,7 @@
char cn[1024];
STACK_OF(GENERAL_NAME) * altnames;
- altnames = (STACK*)X509_get_ext_d2i(peer_cert, NID_subject_alt_name, NULL, NULL);
+ altnames = (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(peer_cert, NID_subject_alt_name, NULL, NULL);
if (altnames) {
int numalts = sk_GENERAL_NAME_num(altnames);
debugs(83, 3, "Verifying server domain " << server << " to certificate subjectAltName");
diff -u -r -N squid-3.1.0.17/src/structs.h squid-3.1.0.18/src/structs.h
--- squid-3.1.0.17/src/structs.h 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/structs.h 2010-03-14 20:06:09.000000000 +1300
@@ -401,6 +401,7 @@
#if HTTP_VIOLATIONS
int reload_into_ims;
+ int ignore_expect_100;
#endif
int offline;
diff -u -r -N squid-3.1.0.17/src/tunnel.cc squid-3.1.0.18/src/tunnel.cc
--- squid-3.1.0.17/src/tunnel.cc 2010-02-25 01:01:04.000000000 +1300
+++ squid-3.1.0.18/src/tunnel.cc 2010-03-14 20:06:08.000000000 +1300
@@ -710,7 +710,7 @@
flags.proxying = tunnelState->request->flags.proxying;
MemBuf mb;
mb.init();
- mb.Printf("CONNECT %s HTTP/1.0\r\n", tunnelState->url);
+ mb.Printf("CONNECT %s HTTP/1.1\r\n", tunnelState->url);
HttpStateData::httpBuildRequestHeader(tunnelState->request,
tunnelState->request,
NULL, /* StoreEntry */
