-àøòä ùâéàú úðàé áæîï ëúéáú îéãò ìøùú. àðà ðñä ùåá.
-
-
ùâéàä
-
ìà ðéúï ìâùú àì äëúåáú äîáå÷ùú
+
שגי××”
+
×œ× × ×™×ª×Ÿ לגשת ×ל הכתובת המבוקשת
-ëàùø ðéñéúé ìâùú àì äëúåáú: %U
+×›×שר × ×™×¡×™×ª×™ לגשת ×ל הכתובת: %U
-ðú÷ìúé áùâéàä äáàä:
+× ×ª×§×œ×ª×™ בשגי××” הב××”:
-
-úùåáä áâåãì àôñ
+תשובה בגודל ×פס
Zero Sized Reply
-äùøú ìà ÷éáì ëì úùåáä ìá÷ùä æå.
-
îðäì äùøú äåà %w.
+השרת ×œ× ×§×™×‘×œ כל תשובה לבקשה זו.
+
×ž× ×”×œ השרת ×”×•× %w.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Hungarian/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Hungarian/ERR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,27 +1,27 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Hozzáférés megtagadva.
+Hozzáférés megtagadva.
-A hozzáférési konfigurációban beállítottak alapján kérését jelenleg nem
-tudjuk teljesíteni. Kérjük, forduljon szolgáltatójához amennyiben a szerver
-helytelen beállításában látja a hiba okát.
+A hozzáférési konfigurációban beállÃtottak alapján kérését jelenleg nem
+tudjuk teljesÃteni. Kérjük, forduljon szolgáltatójához amennyiben a szerver
+helytelen beállÃtásában látja a hiba okát.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Hungarian/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,35 +1,35 @@
-
HIBA: Cache hozzáférés megtagadva
-
+
HIBA: Cache hozzáférés megtagadva
+
HIBA
-
Cache hozzáférés megtagadva
+
Cache hozzáférés megtagadva
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Cache hozzáférés megtagadva.
+Cache hozzáférés megtagadva.
-
Sajnos az alábbi URL-t nem töltheti le cache szerverünktõl:
+
Sajnos az alábbi URL-t nem töltheti le cache szerverünktől:
%U
-amíg nem jelentkezik be rendszerünkbe.
+amÃg nem jelentkezik be rendszerünkbe.
-Netscape 2.0 (vagy magasabb verziószámú) vagy Microsoft Internet Explorer 3.0 vagy
-egyéb HTTP/1.1 kompatibilis böngészõ segítségével jelentkezhet be rendszerünkbe.
-Kérjük, forduljon a cache adminisztrátorhoz amennyiben nem
-sikerül bejelentkeznie vagy megváltoztatnia
-eredetileg beállított jelszavát.
+Netscape 2.0 (vagy magasabb verziószámú) vagy Microsoft Internet Explorer 3.0 vagy
+egyéb HTTP/1.1 kompatibilis böngészÅ‘ segÃtségével jelentkezhet be rendszerünkbe.
+Kérjük, forduljon a cache adminisztrátorhoz amennyiben nem
+sikerül bejelentkeznie vagy megváltoztatnia
+eredetileg beállÃtott jelszavát.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,38 +1,38 @@
-
HIBA: Cache vezérlõpult hozzáférés megtagadva
-
+
HIBA: Cache vezérlőpult hozzáférés megtagadva
+
HIBA
-
Cache vezérlõpult hozzáférés megtagadva
+
Cache vezérlőpult hozzáférés megtagadva
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Cache vezérlõpult hozzáférés megtagadva.
+Cache vezérlőpult hozzáférés megtagadva.
-Sajnos az alábbi URL-t nem töltheti le cache szerverünktõl
+Sajnos az alábbi URL-t nem töltheti le cache szerverünktől
%U
-amíg nem jelentkezik be rendszerünkbe.
+amÃg nem jelentkezik be rendszerünkbe.
-Netscape 2.0 (vagy magasabb verziószámú) vagy Microsoft Internet Explorer 3.0 vagy
-egyéb HTTP/1.1 kompatibilis böngészõ segítségével jelentkezhet be rendszerünkbe.
-Kérjük, forduljon a cache adminisztrátorhoz amennyiben nem
-sikerül bejelentkeznie vagy ha Ön a cache adminisztrátor, olvassa el alaposan
-a Squid dokumentáció cache vezérlõpulttal kapcsolatos fejezetét és ellenõrizze a cache
-naplóállományát, ha részletesebb hibaüzenetekre van szüksége a probléma felderítéséhez.
+Netscape 2.0 (vagy magasabb verziószámú) vagy Microsoft Internet Explorer 3.0 vagy
+egyéb HTTP/1.1 kompatibilis böngészÅ‘ segÃtségével jelentkezhet be rendszerünkbe.
+Kérjük, forduljon a cache adminisztrátorhoz amennyiben nem
+sikerül bejelentkeznie vagy ha Ön a cache adminisztrátor, olvassa el alaposan
+a Squid dokumentáció cache vezérlőpulttal kapcsolatos fejezetét és ellenőrizze a cache
+naplóállományát, ha részletesebb hibaüzenetekre van szüksége a probléma felderÃtéséhez.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Hungarian/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Hungarian/ERR_CANNOT_FORWARD 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_CANNOT_FORWARD 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
HIBA: A kért URL nem tölthetõ le
+
HIBA: A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-A kérést jelenleg nem lehet továbbítani.
+A kérést jelenleg nem lehet továbbÃtani.
-A kérés nem továbbítható a forrás, illetve egyik szülõ cache szerverhez sem.
-A hiba oka valószínûleg alábbiakban rejlik:
+A kérés nem továbbÃtható a forrás, illetve egyik szülÅ‘ cache szerverhez sem.
+A hiba oka valószÃnűleg alábbiakban rejlik:
-- A cache adminisztrátor nem engedélyezi a forrás szerverekhez való közvetlen
- kapcsolat felépítését és
-
- egyik általunk használt szülõ cache szerver sem érhetõ el jelenleg.
+
- A cache adminisztrátor nem engedélyezi a forrás szerverekhez való közvetlen
+ kapcsolat felépÃtését és
+
- egyik általunk használt szülő cache szerver sem érhető el jelenleg.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Hungarian/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Hungarian/ERR_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_CONNECT_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Sikertelen kapcsolatfelvétel
+Sikertelen kapcsolatfelvétel
-A rendszer válasza:
+A rendszer válasza:
%E
-A kiszolgáló szerver vagy az adott hálózat valószínûleg nem mûködik. Kérjük, ismételje
-meg kérését!
+A kiszolgáló szerver vagy az adott hálózat valószÃnűleg nem működik. Kérjük, ismételje
+meg kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_DNS_FAIL squid-3.1.0.4/errors/Hungarian/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Hungarian/ERR_DNS_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_DNS_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,23 +1,23 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
-
HIBA: A kért URL nem tölthetõ le
+
HIBA: A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-A(z) %H szervernévhez nem lehet meghatározni az IP címet.
+A(z) %H szervernévhez nem lehet meghatározni az IP cÃmet.
-A dnsserver válasza:
+A dnsserver válasza:
%z
@@ -25,8 +25,8 @@
Ez azt jelenti, hogy:
- A cache képtelen volt feloldani az URL-ben szereplõ szerver nevét.
- Ellenõrizze a cím helyességét!
+ A cache képtelen volt feloldani az URL-ben szereplő szerver nevét.
+ EllenÅ‘rizze a cÃm helyességét!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Hungarian/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Hungarian/ERR_FORWARDING_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FORWARDING_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,26 +1,26 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Kéréstovábbítás megtagadva.
+KéréstovábbÃtás megtagadva.
-Ez a cache szerver nem továbbítja kérését mivel szomszédsági kapcsolatot szeretne
-kierõszakolni a klienstõl. Feltehetõleg a kliens (%i) egy olyan cache szerver, amelyik
-félre lett konfigurálva.
+Ez a cache szerver nem továbbÃtja kérését mivel szomszédsági kapcsolatot szeretne
+kierőszakolni a klienstől. Feltehetőleg a kliens (%i) egy olyan cache szerver, amelyik
+félre lett konfigurálva.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_DISABLED squid-3.1.0.4/errors/Hungarian/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_DISABLED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_DISABLED 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-Ez a cache szerver nem szolgál ki FTP kéréseket.
+Ez a cache szerver nem szolgál ki FTP kéréseket.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_FAILURE squid-3.1.0.4/errors/Hungarian/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-FTP protokoll hiba történt az alábbi URL letöltésekor:
+FTP protokoll hiba történt az alábbi URL letöltésekor:
%U
-A Squid az alábbi FTP parancsot küldte:
+A Squid az alábbi FTP parancsot küldte:
%f
-és ezt a választ kapta
+és ezt a választ kapta
%F
%g
-A hibát lehet hogy az okozta, hogy az FTP URL abszolút elérési utat tartalmaz
-(ami nem felel meg az RFC 1738 elõírásnak). Amennyiben ez a hiba oka, akkor
-az állományt a %B címen lehet megtalálni.
+A hibát lehet hogy az okozta, hogy az FTP URL abszolút elérési utat tartalmaz
+(ami nem felel meg az RFC 1738 elÅ‘Ãrásnak). Amennyiben ez a hiba oka, akkor
+az állományt a %B cÃmen lehet megtalálni.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Hungarian/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_FORBIDDEN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_FORBIDDEN 2009-01-23 18:37:27.000000000 +1300
@@ -1,20 +1,20 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-FTP autentikációs hiba történt
-az alábbi URL letöltésekor:
+FTP autentikációs hiba történt
+az alábbi URL letöltésekor:
%U
-A Squid az alábbi FTP parancsot küldte:
+A Squid az alábbi FTP parancsot küldte:
%f
-és ezt a választ kapta
+és ezt a választ kapta
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Hungarian/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_NOT_FOUND 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_NOT_FOUND 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL nem tölthetõ le:
+Az alábbi URL nem tölthető le:
%U
-A Squid az alábbi FTP parancsot küldte:
+A Squid az alábbi FTP parancsot küldte:
%f
-és ezt a választ kapta
+és ezt a választ kapta
%F
%g
-A hibát lehet hogy az okozta, hogy az FTP URL abszolút elérési utat tartalmaz
-(ami nem felel meg az RFC 1738 elõírásnak). Amennyiben ez a hiba oka, akkor
-az állományt a %B címen lehet megtalálni.
+A hibát lehet hogy az okozta, hogy az FTP URL abszolút elérési utat tartalmaz
+(ami nem felel meg az RFC 1738 elÅ‘Ãrásnak). Amennyiben ez a hiba oka, akkor
+az állományt a %B cÃmen lehet megtalálni.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_CREATED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_CREATED 2009-01-23 18:37:27.000000000 +1300
@@ -1,11 +1,11 @@
-
FTP PUT sikeresen megtörtént: az állományt létrehoztuk
-
+
FTP PUT sikeresen megtörtént: az állományt létrehoztuk
+
-
Mûvelet sikeresen végrehajtva
-
Az állományt létrehoztuk
+
Művelet sikeresen végrehajtva
+
Az állományt létrehoztuk
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
HIBA: FTP feltöltési hiba
-
+
HIBA: FTP feltöltési hiba
+
HIBA
-
FTP PUT/feltöltés hiba
+
FTP PUT/feltöltés hiba
-Az alábbi URL-re történõ PUT mûveletnél:
+Az alábbi URL-re történő PUT műveletnél:
%U
-A Squid az alábbi FTP parancsot küldte:
+A Squid az alábbi FTP parancsot küldte:
%f
-és ezt a választ kapta
+és ezt a választ kapta
%F
Ez azt jelenti, hogy:
-az elérési út, hozzáférési jogok, rendelkezésre álló diszkterület ellenõrzése után
-próbálja meg újra végrehajtani ezt a mûveletet.
+az elérési út, hozzáférési jogok, rendelkezésre álló diszkterület ellenőrzése után
+próbálja meg újra végrehajtani ezt a műveletet.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,11 +1,11 @@
-
FTP PUT sikeresen megtörtént: az állományt frissítettük
-
+
FTP PUT sikeresen megtörtént: az állományt frissÃtettük
+
-
Mûvelet sikeresen végrehajtva
-
Az állomány frissítése megtörtént
+
Művelet sikeresen végrehajtva
+
Az állomány frissÃtése megtörtént
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Hungarian/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Hungarian/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:27.000000000 +1300
@@ -1,19 +1,19 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az FTP kiszolgáló túlterheltsége miatt az alábbi URL nem tölthetõ le:
+Az FTP kiszolgáló túlterheltsége miatt az alábbi URL nem tölthető le:
%U
-A Squid az alábbi parancsot küldte:
+A Squid az alábbi parancsot küldte:
%f
-és ezt a választ kapta
+és ezt a választ kapta
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_INVALID_REQ squid-3.1.0.4/errors/Hungarian/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Hungarian/ERR_INVALID_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_INVALID_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,34 +1,34 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi kérés feldolgozásakor:
+Az alábbi kérés feldolgozásakor:
%R
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Érvénytelen kérés
+Érvénytelen kérés
-A HTTP kérés bizonyos szempontból érvénytelen. Lehetséges problémák:
+A HTTP kérés bizonyos szempontból érvénytelen. Lehetséges problémák:
-- Hiányzó vagy nem létezõ kérési metódus (GET, POST)
-
- Hiányzó URL
-
- Hiányzó HTTP azonosító (HTTP/1.0)
-
- A kérés mérete túl nagy
-
- 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
+
- Hiányzó vagy nem létező kérési metódus (GET, POST)
+
- Hiányzó URL
+
- Hiányzó HTTP azonosÃtó (HTTP/1.0)
+
- A kérés mérete túl nagy
+
- 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
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_INVALID_URL squid-3.1.0.4/errors/Hungarian/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Hungarian/ERR_INVALID_URL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_INVALID_URL 2009-01-23 18:37:27.000000000 +1300
@@ -1,31 +1,31 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Érvénytelen URL
+Érvénytelen URL
-A megadott URL formátuma bizonyos szempontból nem megfelelõ. Lehetséges problémák:
+A megadott URL formátuma bizonyos szempontból nem megfelelő. Lehetséges problémák:
-- Hiányzó vagy hibás elérési protokoll (`http://''-nek vagy valami hasonlónak kell
+
- Hiányzó vagy hibás elérési protokoll (`http://''-nek vagy valami hasonlónak kell
lennie)
-
- Hiányzó szervernév
-
- Az URL elérési út részében dupla escape szekvencia található
-
- A szervernévben nem megengedett karakter található; az aláhúzás karakter például ilyen
+
- Hiányzó szervernév
+
- Az URL elérési út részében dupla escape szekvencia található
+
- A szervernévben nem megengedett karakter található; az aláhúzás karakter például ilyen
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Hungarian/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Hungarian/ERR_LIFETIME_EXP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_LIFETIME_EXP 2009-01-23 18:37:27.000000000 +1300
@@ -1,25 +1,25 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Kapcsolat maximális idõtartama lejárt
+Kapcsolat maximális időtartama lejárt
-A Squid megszakította a kérés kiszolgálását mivel a kérés feldolgozásának ideje a
-maximális kapcsolatfenntartás idõtartamának értékét meghaladta.
+A Squid megszakÃtotta a kérés kiszolgálását mivel a kérés feldolgozásának ideje a
+maximális kapcsolatfenntartás időtartamának értékét meghaladta.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_NO_RELAY squid-3.1.0.4/errors/Hungarian/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Hungarian/ERR_NO_RELAY 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_NO_RELAY 2009-01-23 18:37:27.000000000 +1300
@@ -1,17 +1,17 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-Nincs a cache számára WAIS szerver megadva! Szóljon az adminisztrátornak.
+Nincs a cache számára WAIS szerver megadva! Szóljon az adminisztrátornak.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-A cache-ben érvényes dokumentum nem található és a kérésben
only-if-cached
-direktíva volt beállítva.
+A cache-ben érvényes dokumentum nem található és a kérésben only-if-cached
+direktÃva volt beállÃtva.
-Olyan kérést küldött el, amelyben only-if-cached cache vezérlõ direktíva
-található. A dokumentum nincs a cache-ben vagy a dokumentum
-érvényesség-ellenõrzést igényelt volna, ezt azonban az only-if-cached
-direktíva megtiltotta.
+Olyan kérést küldött el, amelyben only-if-cached cache vezérlÅ‘ direktÃva
+található. A dokumentum nincs a cache-ben vagy a dokumentum
+érvényesség-ellenőrzést igényelt volna, ezt azonban az only-if-cached
+direktÃva megtiltotta.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_READ_ERROR squid-3.1.0.4/errors/Hungarian/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Hungarian/ERR_READ_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_READ_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,28 +1,28 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Olvasási hiba
+Olvasási hiba
-A rendszer válasza:
+A rendszer válasza:
%E
-Hiba történt az adatok hálózatról való olvasásakor. Ismételje meg kérését!
+Hiba történt az adatok hálózatról való olvasásakor. Ismételje meg kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Hungarian/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Hungarian/ERR_READ_TIMEOUT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_READ_TIMEOUT 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Olvasási idõtúllépés
+Olvasási időtúllépés
-A rendszer válasza:
+A rendszer válasza:
%E
-Idõtúllépés történt mialatt az adatok hálózatról való olvasására várakozott a cache.
-A hálózat vagy a szerver nem elérhetõ vagy túlterhelt állapotban van. Ismételje meg
-kérését!
+Időtúllépés történt mialatt az adatok hálózatról való olvasására várakozott a cache.
+A hálózat vagy a szerver nem elérhető vagy túlterhelt állapotban van. Ismételje meg
+kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Hungarian/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Hungarian/ERR_SHUTTING_DOWN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_SHUTTING_DOWN 2009-01-23 18:37:27.000000000 +1300
@@ -1,20 +1,20 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-A cache leállásra készül és ezért nem tudja kiszolgálni a kérését.
-Kérjük, rövid idõ múlva ismételje meg kérését!
+A cache leállásra készül és ezért nem tudja kiszolgálni a kérését.
+Kérjük, rövid idő múlva ismételje meg kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Hungarian/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Hungarian/ERR_SOCKET_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_SOCKET_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,17 +1,17 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-A rendszer válasza:
+A rendszer válasza:
%E
-A Squid nem tud TCP socket-et létrehozni, valószínûleg a nagy terheltség következtében.
-Ismételje meg kérését!
+A Squid nem tud TCP socket-et létrehozni, valószÃnűleg a nagy terheltség következtében.
+Ismételje meg kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_TOO_BIG squid-3.1.0.4/errors/Hungarian/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Hungarian/ERR_TOO_BIG 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_TOO_BIG 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-A kérés vagy a válasz túl nagy méretû.
+A kérés vagy a válasz túl nagy méretű.
-POST vagy PUT kérés esetén a kérés törzse (az az anyag
-amit feltöltene) túl nagy méretû. Ha GET típusú
-kérésrõl van szó, akkor a válasz törzse (az az anyag amit éppen
-letöltene) túl nagy méretû. A cache-t mûködtetõ Internet
-szolgáltató vezette be ezeket a korlátozásokat. Kérjük, forduljon
-közvetlenül szolgáltatójához amennyiben a szerver helytelen
-beállításában látja a hiba okát.
+POST vagy PUT kérés esetén a kérés törzse (az az anyag
+amit feltöltene) túl nagy méretű. Ha GET tÃpusú
+kérésről van szó, akkor a válasz törzse (az az anyag amit éppen
+letöltene) túl nagy méretű. A cache-t működtető Internet
+szolgáltató vezette be ezeket a korlátozásokat. Kérjük, forduljon
+közvetlenül szolgáltatójához amennyiben a szerver helytelen
+beállÃtásában látja a hiba okát.
-A cache adminisztrátora: %w.
+A cache adminisztrátora: %w.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_UNSUP_REQ squid-3.1.0.4/errors/Hungarian/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Hungarian/ERR_UNSUP_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_UNSUP_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,26 +1,26 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Nem támogatott kérési metódus és protokoll
+Nem támogatott kérési metódus és protokoll
-A Squid nem támogat minden kérési metódust minden protokolltípushoz.
-Például nem lehet Gopher protokollhoz POST metódust alkalmazni.
+A Squid nem támogat minden kérési metódust minden protokolltÃpushoz.
+Például nem lehet Gopher protokollhoz POST metódust alkalmazni.
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_URN_RESOLVE squid-3.1.0.4/errors/Hungarian/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Hungarian/ERR_URN_RESOLVE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_URN_RESOLVE 2009-01-23 18:37:27.000000000 +1300
@@ -1,17 +1,17 @@
-
HIBA: A kért URN nem tölthetõ le
-
+
HIBA: A kért URN nem tölthető le
+
HIBA
-
Az URN egy URL-je nem tölthetõ le
+
Az URN egy URL-je nem tölthető le
-Az alábbi URN letöltésekor:
+Az alábbi URN letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-Nem érdemes túl sokat várni a %T-n lévõ URN-ektõl :)
+Nem érdemes túl sokat várni a %T-n lévő URN-ektől :)
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_WRITE_ERROR squid-3.1.0.4/errors/Hungarian/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Hungarian/ERR_WRITE_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_WRITE_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,28 +1,28 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-A rendszer válasza:
+A rendszer válasza:
%E
-Hiba történt az adatok hálózatra való írásakor. Ismételje meg kérését!
+Hiba történt az adatok hálózatra való Ãrásakor. Ismételje meg kérését!
diff -u -r -N squid-3.1.0.3/errors/Hungarian/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Hungarian/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Hungarian/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
HIBA: A kért URL nem tölthetõ le
-
+
HIBA: A kért URL nem tölthető le
+
HIBA
-
A kért URL nem tölthetõ le
+
A kért URL nem tölthető le
-Az alábbi URL letöltésekor:
+Az alábbi URL letöltésekor:
%U
-a következõ hiba lépett fel:
+a következő hiba lépett fel:
-
-Üres válasz
+Üres válasz
-A Squid nem kapott semmilyen választ a fenti kérésre.
+A Squid nem kapott semmilyen választ a fenti kérésre.
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_ACCESS_DENIED squid-3.1.0.4/errors/hy/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/hy/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_ACCESS_DENIED 2009-01-23 18:40:27.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Õ„Õ¸Ö‚Õ¿Ö„Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
Õ„Õ¸Ö‚Õ¿Ö„Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ´Õ¡Õ¶ ÕºÕ¡Ö€Õ¡Õ´Õ¥Õ¿Ö€Õ¥Ö€Õ¨ Õ©Õ¸Ö‚ÕµÕ¬ Õ¹Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬ ÕºÕ¡Õ°Õ«Õ¶.ÔµÕ©Õ¥ Ô´Õ¸Ö‚Ö„ Õ½Õ¡ Õ½ÕÕ¡Õ¬ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Ö€Õ¸Ö‚Õ´,ÕÕ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¤Õ«Õ´Õ¥Õ¬ ÕÕ¥Ö€ Õ«Õ¶Õ¿Õ¥Ö€Õ¶Õ¥Õ¿ ապահովողին․
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/hy/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/hy/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:40:27.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: Cache Access Denied
ERROR
Cache Õ„Õ¸Ö‚Õ¿Ö„Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
The following error was encountered while trying to retrieve the URL: %U
Õ„Õ¸Ö‚Õ¿Ö„Õ¨ Ö„Õ¥Õ·Õ«Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
Ô½Õ¶Õ¤Õ«Ö€Õ¶Õ¥Ö€ Õ¡Õ¼Õ¡Õ»Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´ ÕÕ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¤Õ«Õ´Õ¥Õ¬Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ«Õ¶ Õ¯Õ¡Õ´ ÖƒÕ¸ÕÕ¥Õ¬ ÕÕ¥Ö€ Õ¨Õ¶Õ©Õ¡ÖÕ«Õ¯ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:40:27.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: Cache Manager Access Denied
ERROR
Cache Manager Õ„Õ¸Ö‚Õ¿Ö„Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
The following error was encountered while trying to retrieve the URL: %U
Õ”Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¸Ö‚Õ¿Ö„Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/hy/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/hy/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_CANNOT_FORWARD 2009-01-23 18:40:27.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ¾Õ¥Ö€Õ¡Õ°Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬ ÕºÕ¡Õ°Õ«Õ¶.
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.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_CONNECT_FAIL squid-3.1.0.4/errors/hy/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/hy/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_CONNECT_FAIL 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Connection to %I failed.
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
Õ€Õ¥Õ¼Õ¡Õ¯Õ¡ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ¨ Õ¯Õ¡Õ´ ÖÕ¡Õ¶ÖÕ¨ Õ¹Õ¥Õ¶ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¸Ö‚Õ´. Ô½Õ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¯Ö€Õ¯Õ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_DNS_FAIL squid-3.1.0.4/errors/hy/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/hy/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_DNS_FAIL 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô±Õ¶Õ°Õ¶Õ¡Ö€ Õ§ Õ¸Ö€Õ¸Õ·Õ¥Õ¬ %H
Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ« IP Õ°Õ¡Õ½ÖÕ¥Õ¶.
DNS Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_ESI squid-3.1.0.4/errors/hy/ERR_ESI
--- squid-3.1.0.3/errors/hy/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_ESI 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESI Processing failed.
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/hy/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/hy/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FORWARDING_DENIED 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ÕŽÕ¥Ö€Õ¡Õ°Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¸Ö‚Õ´Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§.
Ô±ÕµÕ½ Ö„Õ¥Õ·Õ¨ Õ¡Õ¶Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¾Õ¥Ö€Õ¡Õ°Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ sibling Õ¿Õ«ÕºÕ« ÖƒÕ¸ÕÕ°Õ¡Ö€Õ¡Õ¢Õ¥Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚ ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¸Õ¾. Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§,Õ¸Ö€ %i -Õ¶ Õ½ÕÕ¡Õ¬ Õ½Õ¡Ö€Ö„Õ¡Õ¢Õ¥Ö€Õ¾Õ¡Õ® Ö„Õ¥Õ· Õ§.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_DISABLED squid-3.1.0.4/errors/hy/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/hy/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_DISABLED 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTP Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¾Õ¡Õ® Õ§
This cache does not support FTP.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_FAILURE squid-3.1.0.4/errors/hy/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/hy/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_FAILURE 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
URL Õ« Õ¡Õ¼Õ¡Ö„Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¿Õ¥Õ²Õ« Õ¸Ö‚Õ¶Õ¥ÖÕ¡Õ¾ FTP Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ½ÕÕ¡Õ¬: %U
Squid-Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Ö Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ FTP Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨:
%f
The server responded with:
%F
%g
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/hy/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/hy/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_FORBIDDEN 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
URL Õ« Õ¡Õ¼Õ¡Ö„Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¿Õ¥Õ²Õ« Õ¸Ö‚Õ¶Õ¥ÖÕ¡Õ¾ FTP Õ¡Õ¸Ö‚Õ©Õ¥Õ¶Õ¿Õ«Ö†Õ«Õ¯Õ¡ÖÕ«Õ¡ÕµÕ« Õ½ÕÕ¡Õ¬: %U
Squid-Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Ö Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ FTP Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨:
%f
The server responded with:
%F
%g
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_LISTING squid-3.1.0.4/errors/hy/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/hy/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_LISTING 2009-01-23 18:40:28.000000000 +1300
@@ -0,0 +1 @@
+
FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/hy/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/hy/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_NOT_FOUND 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
Õ€Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬: %U
Squid-Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Ö Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ FTP Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨:
%f
The server responded with:
%F
%g
ÕÕ¡ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¬Õ«Õ¶Õ¥Õ¬ FTP URL -Õ« Õ¢Õ¡ÖÕ¡Ö€Õ±Õ¡Õ¯ Õ¸Ö‚Õ²Õ²Õ¸Õ¾ Õ°Õ¡Ö€ÖÕ´Õ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„ (Õ«Õ¶Õ¹Õ¨ Õ¹Õ« Õ°Õ¡Õ´Õ¡ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¸Ö‚Õ´ RFC 1738-Õ«Õ¶). ÔµÕ©Õ¥ Õ½Õ¡ Õ§ Õ½ÕÕ¡Õ¬Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼Õ¨,Õ¡ÕºÕ¡ Ö†Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ£Õ¶Õ¿Õ¾Õ¥Õ¬ Õ¡ÕµÕ½Õ¿Õ¥Õ² %B.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/hy/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/hy/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_PUT_CREATED 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
FTP PUT Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö: Õ–Õ¡ÕµÕ¬Õ¨ Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¡Õ® Õ§
Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö
Õ–Õ¡ÕµÕ¬Õ¨ Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¡Õ® Õ§
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/hy/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/hy/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_PUT_ERROR 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: FTP upload failed
ERROR
FTP upload Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ ÕÕ¡ÖƒÕ¡Õ¶Õ¾Õ¥Ö
While trying to PUT the following URL: %U
Squid-Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Ö Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ FTP Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨:
%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.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/hy/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/hy/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_PUT_MODIFIED 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
FTP PUT Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö: Õ–Õ¡ÕµÕ¬Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¾Õ¡Õ®
Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Ö
Õ–Õ¡ÕµÕ¬Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¾Õ¡Õ® Õ§
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/hy/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/hy/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_FTP_UNAVAILABLE 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid-Õ¨ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Ö Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ FTP Õ°Ö€Õ¡Õ´Õ¡Õ¶Õ¨:
%f
The server responded with:
%F
%g
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_ICAP_FAILURE squid-3.1.0.4/errors/hy/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/hy/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_ICAP_FAILURE 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAP protocol error.
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %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.3/errors/hy/ERR_INVALID_REQ squid-3.1.0.4/errors/hy/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/hy/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_INVALID_REQ 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +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
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_INVALID_RESP squid-3.1.0.4/errors/hy/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/hy/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_INVALID_RESP 2009-01-23 18:40:29.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
Invalid Response error was encountered while trying to process the request:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_INVALID_URL squid-3.1.0.4/errors/hy/ERR_INVALID_URL
--- squid-3.1.0.3/errors/hy/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_INVALID_URL 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Invalid URL
Some aspect of the requested URL is incorrect.
Some possible problems are:
Õ„Õ¸Ö‚Õ¿Ö„Õ¡ÕµÕ«Õ¶ Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ½ÕÕ¡Õ¬ Õ§ Õ¯Õ¡Õ´ Õ¢Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§ (ÕºÕ¥Õ¿Ö„ Õ§ Õ¬Õ«Õ¶Õ« http://
Õ¯Õ¡Õ´ Õ¶Õ´Õ¡Õ¶)
Õ€Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ Õ¢Õ¡ÖÕ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´ Õ§
Ô±Õ¶Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« Õ¯Ö€Õ¯Õ¶Õ¡Õ¯Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¸Õ² Õ¶Õ«Õ· URL Õ¸Ö‚Õ²Õ²Õ¸Ö‚Õ´
Ô±Õ¶Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« Õ¶Õ«Õ· Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¡Õ¶ Õ´Õ¥Õ»;Õ¨Õ¶Õ¤Õ£Õ®Õ´Õ¡Õ¶ Õ¶Õ«Õ·Õ¶ Õ¡Õ¶Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« Õ§
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_LIFETIME_EXP squid-3.1.0.4/errors/hy/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/hy/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_LIFETIME_EXP 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô¿Õ¡Õº Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¨ Õ½ÕºÕ¡Õ¼Õ¾Õ¥Ö
Squid-Õ¨ Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¥Ö Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õº Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ´Õ¡Õ¶ Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¥Õ¬Õ¸Ö‚ պատճառով․.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_NO_RELAY squid-3.1.0.4/errors/hy/ERR_NO_RELAY
--- squid-3.1.0.3/errors/hy/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_NO_RELAY 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Wais Relay Õ¸Ö€Õ¸Õ·Õ¾Õ¡Õ® Õ¹Õ§
Ô±ÕµÕ½ Ö„Õ¥Õ·Õ« Õ°Õ¡Õ´Õ¡Ö€ WAIS Relay Õ¸Ö€Õ¸Õ·Õ¾Õ¡Õ® Õ¹Õ§! Õ€Õ¡ÕµÕ¿Õ¶Õ¥Ö„ Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ«Õ¶.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/hy/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/hy/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Õ•Õ¢ÕµÕ¥Õ¯Õ¿Õ¨ Ö„Õ¥Õ·Õ¸Ö‚Õ´ Õ£Õ¿Õ¶Õ¾Õ¡Õ® Õ¹Õ§; Õ±Ö‡Õ¡Õ¾Õ¸Ö€Õ¾Õ¥Ö only-if-cached
Õ¤Õ«Ö€Õ¥Õ¯Õ¿Õ«Õ¾Õ¨.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_READ_ERROR squid-3.1.0.4/errors/hy/ERR_READ_ERROR
--- squid-3.1.0.3/errors/hy/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_READ_ERROR 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô¸Õ¶Õ©Õ¥Ö€ÖÕ´Õ¡Õ¶ Õ½ÕÕ¡Õ¬
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
Õ‘Õ¡Õ¶ÖÕ«Ö Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¨Õ¶Õ©Õ¥Ö€ÖÕ´Õ¡Õ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¡Õ¼Õ¡Õ»Õ¡ÖÕ¡Õ¾ Õ½ÕÕ¡Õ¬.Ô½Õ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¯Ö€Õ¯Õ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_READ_TIMEOUT squid-3.1.0.4/errors/hy/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/hy/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_READ_TIMEOUT 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¥Õ¬Õ¸Ö‚ Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¾Õ¡Õ® Õ§
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
Õ‘Õ¡Õ¶ÖÕ«Ö Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ¨Õ¶Õ©Õ¥Ö€ÖÕ´Õ¡Õ¶ Õ¨Õ¶Õ©Õ¡ÖÖ„Õ¸Ö‚Õ´ Õ½ÕºÕ¡Õ½Õ´Õ¡Õ¶ Õ¡Õ¼Õ¡Õ¾Õ¥Õ¬Õ¡Õ£Õ¸Ö‚ÕµÕ¶ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¨ Õ£Õ¥Ö€Õ¡Õ¦Õ¡Õ¶ÖÕ¾Õ¥Ö․ՑանÖÕ¨ Õ¯Õ¡Õ´ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ¨ Õ¹Õ¥Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö‚Õ´ Õ¯Õ¡Õ´ Õ£Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ® Õ¥Õ¶Ö‰ Ô½Õ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¯Ö€Õ¯Õ¶Õ¥Õ¬ Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/hy/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/hy/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Failed to establish a secure connection to %I
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/hy/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/hy/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_SHUTTING_DOWN 2009-01-23 18:40:30.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô±ÕµÕ½ Ö„Õ¥Õ·Õ¨ Õ¿Õ¾ÕµÕ¡Õ¬ ÕºÕ¡Õ°Õ«Õ¶ Õ£Õ¿Õ¶Õ¾Õ¸Ö‚Õ´ Õ§ Õ¡Õ¶Õ»Õ¡Õ¿Õ´Õ¡Õ¶ ÕºÖ€Õ¸ÖÕ¥Õ½Õ¸Ö‚Õ´ Ö‡ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¥Õ¬ ÕÕ¥Ö€ Õ°Õ¡Ö€Öումը․Կրկնեք Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¸Ö€Õ¸Õ· ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¡Õ¶Ö․
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/hy/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/hy/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_SOCKET_FAILURE 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Socket Õ±Õ¡ÕÕ¸Õ²Õ¸Ö‚Õ´
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
Squid-Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ TCP Socket, Õ°Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ£Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¾Õ¡Õ®Õ¸Ö‚Õ©ÕµÕ¡Õ¶ պատճառով․Խնդրվում Õ§ Õ¯Ö€Õ¯Õ¶Õ¥Õ¬ Õ°Õ¡Ö€Öումը․ ÔµÕ©Õ¥ Õ«Ö€Õ¡Õ¾Õ«Õ³Õ¡Õ¯Õ¨ Õ¯Ö€Õ¯Õ¶Õ¾Õ«, Õ¤Õ«Õ´Õ¥Ö„ Ö„Õ¥Õ·Õ« կառավարիչին․
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_TOO_BIG squid-3.1.0.4/errors/hy/ERR_TOO_BIG
--- squid-3.1.0.3/errors/hy/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_TOO_BIG 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Õ€Õ¡Ö€ÖÕ¸Ö‚Õ´Õ¨ Õ¯Õ¡Õ´ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨ Õ·Õ¡Õ¿ Õ´Õ¥Õ® Õ®Õ¡Õ¾Õ¡Õ¬ Õ¸Ö‚Õ¶Õ¥Õ¶.
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.
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_UNSUP_REQ squid-3.1.0.4/errors/hy/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/hy/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_UNSUP_REQ 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Õ‰Õ¸Ö‚Õ²Õ¥Õ¯ÖÕ¾Õ¸Õ² Õ´Õ¥Õ©Õ¸Õ¤ Ö‡ Õ°Õ¡Ö€ÖÕ´Õ¡Õ¶ Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
Squid-Õ¨ Õ¢Õ¸Õ¬Õ¸Ö€ Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ¢Õ¸Õ¬Õ¸Ö€ Õ°Õ¡Ö€ÖÕ´Õ¡Õ¶ Õ´Õ¥Õ©Õ¸Õ¤Õ¶Õ¥Ö€Õ¨ Õ¹Õ« Õ¸Ö‚Õ²Õ¥Õ¯ÖÕ¸Ö‚Õ´ . Õ•Ö€Õ«Õ¶Õ¡Õ¯,Gopher Õ¡Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€ Õ¹Õ¥Ö„ Õ¯Õ¡Ö€Õ¸Õ² POST Õ°Õ¡Ö€ÖÕ¸Ö‚Õ´ Õ¯Õ¡Õ¿Õ¡Ö€Õ¥Õ¬.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_URN_RESOLVE squid-3.1.0.4/errors/hy/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/hy/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_URN_RESOLVE 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: The requested URN not be retrieved
ERROR
ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URN Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
The following error was encountered while trying to retrieve the URN: %U
Cannot Resolve URN
Õ‰Õ¡Ö€ÕªÕ¥ Õ·Õ¡Õ¿ Õ¢Õ¡Õ¶ Õ½ÕºÕ¡Õ½Õ¥Õ¬ URN-Õ«Ö %T -Õ« Õ¾Ö€Õ¡ :)
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_WRITE_ERROR squid-3.1.0.4/errors/hy/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/hy/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_WRITE_ERROR 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô³Ö€Õ¡Õ¶ÖÕ´Õ¡Õ¶ Õ½ÕÕ¡Õ¬
ÕÕ¿Õ¡ÖÕ¾Õ¡Õ® ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¨: %E
ÕÕ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ ÖÕ¡Õ¶Ö Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ¡Õ¼Õ¡Õ»Õ¡ÖÕ¡Õ¾ Õ½Õալ․ Ô½Õ¶Õ¤Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¯Ö€Õ¯Õ¶Õ¥Õ¬ Õ°Õ¡Ö€Öումը․
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/hy/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/hy/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/hy/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/hy/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:40:31.000000000 +1300
@@ -0,0 +1 @@
+
ÕÔ½Ô±Ô¼: ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Õ² URL Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡Õ¼Õ¡Ö„Õ¾Õ¥Õ¬
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ô¶Ö€Õ¸ÕµÕ¡Õ¯Õ¡Õ¶ Õ¥Ö€Õ¯Õ¡Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶
Squid did not receive any data for this request.
ÕÕ¥Ö€ Ö„Õ¥Õ·Õ« Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ«Õ¹Õ¨ %w Õ§.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_ACCESS_DENIED squid-3.1.0.4/errors/ja/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ja/ERR_ACCESS_DENIED 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_ACCESS_DENIED 2009-01-23 18:40:40.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
è¨å®šã•ã‚Œã¦ã„るアクセス制御ã®è¨å®šã®ãŸã‚ã€ä»Šå›žã¯ã‚ãªãŸã‹ã‚‰ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯å—ã‘ã¤ã‘られã¾ã›ã‚“。ã“ã®è¨å®šãŒæ£ã—ããªã„ã¨æ€ã‚ã‚Œã‚‹å ´åˆã«ã¯ã€ã“ã®ã‚µãƒ¼ãƒ“スã®æ供者ã¸é€£çµ¡ã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
è¨å®šã•ã‚Œã¦ã„るアクセス制御ã®è¨å®šã®ãŸã‚ã€ä»Šå›žã¯ã‚ãªãŸã‹ã‚‰ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯å—ã‘ã¤ã‘られã¾ã›ã‚“。ã“ã®è¨å®šãŒæ£ã—ããªã„ã¨æ€ã‚ã‚Œã‚‹å ´åˆã«ã¯ã€ã“ã®ã‚µãƒ¼ãƒ“スã®æ供者ã¸é€£çµ¡ã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/ja/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/ja/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:40:40.000000000 +1300
@@ -1 +1 @@
-
エラー: Cache Access Denied
ERROR
Cache アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
The following error was encountered while trying to retrieve the URL: %U
ã‚ャッシュã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼Ž
Sorry, you are not currently allowed to request %U from this cache until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or change your default password.
\ No newline at end of file
+
エラー: Cache Access Denied
ERROR
Cache アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
The following error was encountered while trying to retrieve the URL: %U
ã‚ャッシュã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼Ž
申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã‚ãªãŸè‡ªèº«ã®èªè¨¼ã‚’済ã¾ã›ã‚‹ã¾ã§ã€ã“ã®ã‚ャッシュ㫠%U をリクエストã™ã‚‹ã“ã¨ã¯ç¾åœ¨è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。
ã‚ãªãŸè‡ªèº«ã®èªè¨¼ã‚„デフォルトã®ãƒ‘スワードã®å¤‰æ›´å›°é›£ãªå ´åˆã¯ã€ã‚ャッシュã®ç®¡ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: Cache Manager Access Denied
ERROR
Cache Manager アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
The following error was encountered while trying to retrieve the URL: %U
ã‚ャッシュマãƒã‚¸ãƒ£ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼Ž
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
Please contact the cache administrator if you have difficulties authenticating yourself or, if you are the administrator, read Squid documentation on cache manager interface and check cache log for more detailed error messages.
\ No newline at end of file
+
エラー: Cache Manager Access Denied
ERROR
Cache Manager アクセスを拒å¦ã•ã‚Œã¾ã—ãŸã€‚
The following error was encountered while trying to retrieve the URL: %U
ã‚ャッシュマãƒã‚¸ãƒ£ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼Ž
申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã‚ãªãŸè‡ªèº«ã®èªè¨¼ã‚’済ã¾ã›ã‚‹ã¾ã§ã€ã“ã®ã‚ャッシュマãƒãƒ¼ã‚¸ãƒ£ã« %U をリクエストã™ã‚‹ã“ã¨ã¯ç¾åœ¨è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。
ã‚ãªãŸè‡ªèº«ã®èªè¨¼ãŒå›°é›£ãªå ´åˆã¯ã€ã‚ャッシュã®ç®¡ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。ã¾ãŸã¯ã€ã‚ãªãŸè‡ªèº«ãŒç®¡ç†è€…ãªã‚‰ã€ã‚ャッシュマãƒãƒ¼ã‚¸ãƒ£ãƒ»ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã®Squidã®æ–‡æ›¸ã‚’èªã‚“ã§ã€ã‚ャッシュã®ãƒã‚°ã«ã‚る詳細ãªã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/ja/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/ja/ERR_CANNOT_FORWARD 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_CANNOT_FORWARD 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to forward this request at this time.
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.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ç¾åœ¨ï¼Œãƒªã‚¯ã‚¨ã‚¹ãƒˆã®è»¢é€ã¯ã§ãã¾ã›ã‚“．
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.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_CONNECT_FAIL squid-3.1.0.4/errors/ja/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/ja/ERR_CONNECT_FAIL 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_CONNECT_FAIL 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%I ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚
The system returned: %E
The remote host or network may be down. Please try the request again.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%I ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
接続先ã®ãƒ›ã‚¹ãƒˆã‚‚ã—ãã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãŒç¨¼åƒã—ã¦ã„ã¾ã›ã‚“．ã—ã°ã‚‰ãå¾…ã£ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦è©¦ã—ã¦ä¸‹ã•ã„．
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_DNS_FAIL squid-3.1.0.4/errors/ja/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/ja/ERR_DNS_FAIL 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_DNS_FAIL 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unable to determine IP address from host name %H
The DNS server returned:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
以下ã®ãƒ›ã‚¹ãƒˆåã® IP address を調ã¹ã‚‰ã‚Œã¾ã›ã‚“．%H
DNSサーãƒã®å¿œç”:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_ESI squid-3.1.0.4/errors/ja/ERR_ESI
--- squid-3.1.0.3/errors/ja/ERR_ESI 2008-12-05 16:12:36.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_ESI 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESIã®å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESIã®å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/ja/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/ja/ERR_FORWARDING_DENIED 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FORWARDING_DENIED 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
転é€ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚
This cache will not forward your request because it is trying to enforce a sibling relationship. Perhaps the client at %i is a cache which has been misconfigured.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
転é€ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚
ã‚ャッシュ間ã«ãŠã‘る関係を強制的ã«å…„弟関係ã¨ãªã‚‹ã‚ˆã†ã«ã—ã¦ã„ã‚‹ãŸã‚，ã‚ャッシュã¯ã‚ãªãŸã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’転é€ã§ãã¾ã›ã‚“ã§ã—ãŸï¼Ž%i ã®ã‚ャッシュãŒèª¤ã£ãŸè¨å®šã¨ãªã£ã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“．
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_DISABLED squid-3.1.0.4/errors/ja/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/ja/ERR_FTP_DISABLED 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_DISABLED 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTPã¯ç„¡åŠ¹ã§ã™ã€‚
This cache does not support FTP.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTPã¯ç„¡åŠ¹ã§ã™ã€‚
ã‚ャッシュ㯠FTP をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“．
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_FAILURE squid-3.1.0.4/errors/ja/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/ja/ERR_FTP_FAILURE 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_FAILURE 2009-01-23 18:40:41.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTPã®ãƒ—ãƒãƒˆã‚³ãƒ«ãƒ»ã‚¨ãƒ©ãƒ¼ãŒã€ä»¥ä¸‹ã®URLã‹ã‚‰æƒ…å ±ã‚’å¾—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
FTPã®ãƒ—ãƒãƒˆã‚³ãƒ«ãƒ»ã‚¨ãƒ©ãƒ¼ãŒã€ä»¥ä¸‹ã®URLã‹ã‚‰æƒ…å ±ã‚’å¾—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ: %U
Squidã¯ä»¥ä¸‹ã®FTPコマンドをé€ã‚Šã¾ã—ãŸ:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/ja/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/ja/ERR_FTP_FORBIDDEN 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_FORBIDDEN 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
FTPèªè¨¼ã®å¤±æ•—ãŒã€ä»¥ä¸‹ã®URLã‹ã‚‰æƒ…å ±ã‚’å¾—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
FTPèªè¨¼ã®å¤±æ•—ãŒã€ä»¥ä¸‹ã®URLã‹ã‚‰æƒ…å ±ã‚’å¾—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ: %U
Squidã¯ä»¥ä¸‹ã®FTPコマンドをé€ã‚Šã¾ã—ãŸ:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_LISTING squid-3.1.0.4/errors/ja/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/ja/ERR_FTP_LISTING 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_LISTING 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
FTP Directory: %U
\ No newline at end of file
+
FTP ディレクトリ: %U FTP ディレクトリ: %U/
ディレクトリã®å†…容:
%z
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/ja/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/ja/ERR_FTP_NOT_FOUND 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_NOT_FOUND 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
以下ã®URLã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ: %U
Squidã¯ä»¥ä¸‹ã®FTPコマンドをé€ã‚Šã¾ã—ãŸ:
%f
The server responded with:
%F
%g
ã“ã‚Œã¯(RFC 1738ã«å¾“ã£ã¦ã„ãªã„)絶対パスをå«ã‚“ã FTPã®URLã«ã‚ˆã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ãã®å ´åˆã«è©²å½“ã™ã‚‹ãªã‚‰ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯%Bã«è¦‹ã¤ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/ja/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/ja/ERR_FTP_PUT_ERROR 2008-12-05 16:12:37.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_PUT_ERROR 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
エラー: FTP upload failed
ERROR
ファイルã®PUTやアップãƒãƒ¼ãƒ‰ã«å¤±æ•—
While trying to PUT the following URL: %U
Squid sent the following FTP command:
%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.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: FTP upload failed
ERROR
ファイルã®PUTやアップãƒãƒ¼ãƒ‰ã«å¤±æ•—
以下㮠URL ã‚’ PUT ã—よã†ã¨ã—ãŸéš›ã«: %U
Squidã¯ä»¥ä¸‹ã®FTPコマンドをé€ã‚Šã¾ã—ãŸ:
%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.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/ja/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/ja/ERR_FTP_UNAVAILABLE 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_FTP_UNAVAILABLE 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid sent the following FTP command:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
以下ã®URLã‚’å–å¾—ã—よã†ã¨ã—ã¦ã„ã‚‹ã¨ãã€FTPサーãƒã®è² è·ãŒé«˜ã™ãŽã¾ã—ãŸ: %U
Squidã¯ä»¥ä¸‹ã®FTPコマンドをé€ã‚Šã¾ã—ãŸ:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_ICAP_FAILURE squid-3.1.0.4/errors/ja/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/ja/ERR_ICAP_FAILURE 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_ICAP_FAILURE 2009-01-23 18:40:42.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAPã®ãƒ—ãƒãƒˆã‚³ãƒ«ãƒ»ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚
The system returned: %E
This means that some aspect of the ICAP communication failed.
Some possible problems are:
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAPã®ãƒ—ãƒãƒˆã‚³ãƒ«ãƒ»ã‚¨ãƒ©ãƒ¼ã§ã™ã€‚
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
This means that some aspect of the ICAP communication failed.
ã‚ã‚Šãã†ãªå•é¡Œ:
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_INVALID_REQ squid-3.1.0.4/errors/ja/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/ja/ERR_INVALID_REQ 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_INVALID_REQ 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ã‚¨ãƒ©ãƒ¼ãŒä»¥ä¸‹ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’処ç†ã—よã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ:
%R
Some possible problems are:
è¦æ±‚ã®æ–¹æ³•ãŒæŠœã‘ã¦ã„ã‚‹ã‹ä¸æ˜Žã§ã™ã€‚
URLãŒã‚ã‚Šã¾ã›ã‚“。
HTTPã®è˜åˆ¥å(HTTP/1.0)ãŒã‚ã‚Šã¾ã›ã‚“。
Request is too large.
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ヘッダãŒã‚ã‚Šã¾ã›ã‚“。
ホストåã«ä¸æ£ãªæ–‡å—ãŒä½¿ã‚ã‚Œã¦ã„ã¾ã™: アンダースコアã¯ä½¿ãˆã¾ã›ã‚“。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_INVALID_RESP squid-3.1.0.4/errors/ja/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/ja/ERR_INVALID_RESP 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_INVALID_RESP 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ã‚¨ãƒ©ãƒ¼ãŒä»¥ä¸‹ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’処ç†ã—よã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ã‚¨ãƒ©ãƒ¼ãŒä»¥ä¸‹ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’処ç†ã—よã†ã¨ã—ã¦ã„ã‚‹é–“ã«ç™ºç”Ÿã—ã¾ã—ãŸ:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_INVALID_URL squid-3.1.0.4/errors/ja/ERR_INVALID_URL
--- squid-3.1.0.3/errors/ja/ERR_INVALID_URL 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_INVALID_URL 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ä¸æ£ãªURL
Some aspect of the requested URL is incorrect.
Some possible problems are:
(http://
ã¾ãŸã¯åŒé¡žã®)アクセス・プãƒãƒˆã‚³ãƒ«ãŒæŠœã‘ã¦ã„ã‚‹ã‹ä¸æ£ã§ã™ã€‚
ホストåãŒã‚ã‚Šã¾ã›ã‚“。
ä¸æ£ãªäºŒé‡ã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ãŒURLパスã«ã‚ã‚Šã¾ã™ã€‚
ホストåã«ä¸æ£ãªæ–‡å—ãŒä½¿ã‚ã‚Œã¦ã„ã¾ã™: アンダースコアã¯ä½¿ãˆã¾ã›ã‚“。
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ä¸æ£ãªURL
リクエストã•ã‚ŒãŸURLã«ä¸æ£ãªéƒ¨åˆ†ãŒã‚ã‚Šã¾ã™ã€‚
ã‚ã‚Šãã†ãªå•é¡Œ:
(http://
ã¾ãŸã¯åŒé¡žã®)アクセス・プãƒãƒˆã‚³ãƒ«ãŒæŠœã‘ã¦ã„ã‚‹ã‹ä¸æ£ã§ã™ã€‚
ホストåãŒã‚ã‚Šã¾ã›ã‚“。
ä¸æ£ãªäºŒé‡ã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ãŒURLパスã«ã‚ã‚Šã¾ã™ã€‚
ホストåã«ä¸æ£ãªæ–‡å—ãŒä½¿ã‚ã‚Œã¦ã„ã¾ã™: アンダースコアã¯ä½¿ãˆã¾ã›ã‚“。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_LIFETIME_EXP squid-3.1.0.4/errors/ja/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/ja/ERR_LIFETIME_EXP 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_LIFETIME_EXP 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
接続ã®å˜ç¶šæ™‚é–“ãŒçµ‚了ã—ã¾ã—ãŸã€‚
Squid has terminated the request because it has exceeded the maximum connection lifetime.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
接続ã®å˜ç¶šæ™‚é–“ãŒçµ‚了ã—ã¾ã—ãŸã€‚
最大ã®æŽ¥ç¶šæœ‰åŠ¹æ™‚é–“ãŒéŽãŽãŸãŸã‚ã€Squidã¯ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’終了ã—ã¾ã—ãŸã€‚
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_NO_RELAY squid-3.1.0.4/errors/ja/ERR_NO_RELAY
--- squid-3.1.0.3/errors/ja/ERR_NO_RELAY 2008-12-05 16:12:38.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_NO_RELAY 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Waisã®ä¸ç¶™å…ˆãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Waisã®ä¸ç¶™å…ˆãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。
WAIS リレー用ホストãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“! 管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„．
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/ja/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/ja/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Valid document was not found in the cache and only-if-cached
directive was specified.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
only-if-cached
ã®æŒ‡å®šãŒã‚ã‚Šã¾ã—ãŸãŒï¼Œãã®æ–‡æ›¸ãŒã‚ャッシュã«å˜åœ¨ã—ã¦ã„ã¾ã›ã‚“．
ã‚ャッシュã¸ã® only-if-cached
ã¤ãリクエストãŒã‚ã‚Šã¾ã—ãŸãŒï¼Œã“ã®æ–‡æ›¸ã¯ã‚ャッシュã«å˜åœ¨ã—ã¦ã„ãªã„ã‹ï¼Œã‚ã‚‹ã„ã¯ã™ã§ã«ã‚ャッシュã«ã¯ã‚ã‚‹ãŒ(only-if-cached
ã«ã‚ˆã£ã¦ç¦æ¢ã•ã‚Œã¦ã„ã‚‹)ã“ã®æ–‡æ›¸ãŒæ›´æ–°ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã®å†ç¢ºèªãŒå¿…è¦ã§ã™ï¼Ž
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_READ_ERROR squid-3.1.0.4/errors/ja/ERR_READ_ERROR
--- squid-3.1.0.3/errors/ja/ERR_READ_ERROR 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_READ_ERROR 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Error
The system returned: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’å—ä¿¡ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚å†åº¦ã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’å—ä¿¡ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚å†åº¦ã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_READ_TIMEOUT squid-3.1.0.4/errors/ja/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/ja/ERR_READ_TIMEOUT 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_READ_TIMEOUT 2009-01-23 18:40:43.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Timeout
The system returned: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’èªã‚‚ã†ã¨å¾…ã£ã¦ã„ã‚‹é–“ã«ã‚¿ã‚¤ãƒ アウトãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚‚ã—ãã¯ã‚µãƒ¼ãƒãŒç¨¼åƒã—ã¦ã„ãªã„ã‹ã€ã‚ã‚‹ã„ã¯æ··é›‘ã—ã¦ã„ã¾ã™ã€‚å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
èªã¿è¾¼ã¿ã‚¿ã‚¤ãƒ アウト
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’èªã‚‚ã†ã¨å¾…ã£ã¦ã„ã‚‹é–“ã«ã‚¿ã‚¤ãƒ アウトãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚‚ã—ãã¯ã‚µãƒ¼ãƒãŒç¨¼åƒã—ã¦ã„ãªã„ã‹ã€ã‚ã‚‹ã„ã¯æ··é›‘ã—ã¦ã„ã¾ã™ã€‚å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/ja/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/ja/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%Iã¸ã®å®‰å…¨ãªæŽ¥ç¶šã‚’確立ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
The system returned: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%Iã¸ã®å®‰å…¨ãªæŽ¥ç¶šã‚’確立ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/ja/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/ja/ERR_SHUTTING_DOWN 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_SHUTTING_DOWN 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ã“ã®ã‚ャッシュã¯ç¨¼åƒåœæ¢ã®å‡¦ç†ã«å…¥ã£ã¦ã„ã¦ã€ç¾åœ¨ã‚ãªãŸã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¸ã®ã‚µãƒ¼ãƒ“スをæä¾›ã§ãã¾ã›ã‚“。後ã§å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„．
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/ja/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/ja/ERR_SOCKET_FAILURE 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_SOCKET_FAILURE 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Socket Failure
The system returned: %E
Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ソケット作æˆã«å¤±æ•—
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
ãŠãらãéŽå¤§ãªè² è·ã®ãŸã‚ã€Squidã¯TCPソケットを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_TOO_BIG squid-3.1.0.4/errors/ja/ERR_TOO_BIG
--- squid-3.1.0.3/errors/ja/ERR_TOO_BIG 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_TOO_BIG 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
The request or reply is too large.
POSTã¾ãŸã¯PUTã®è¦æ±‚ã‚’ã—ã¦ã„ãŸãªã‚‰ã€ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ã„ãŸå¯¾è±¡ãŒå¤§ãã™ãŽã¾ã™ã€‚
GETã®è¦æ±‚ã‚’ã—ã¦ã„ãŸãªã‚‰ã€ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„ãŸå¯¾è±¡ãŒå¤§ãã™ãŽã¾ã™ã€‚
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
リクエストã¾ãŸã¯ãƒªãƒ—ライãŒå¤§ãã™ãŽã¾ã™ã€‚
POSTã¾ãŸã¯PUTã®è¦æ±‚ã‚’ã—ã¦ã„ãŸãªã‚‰ã€ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ã„ãŸå¯¾è±¡ãŒå¤§ãã™ãŽã¾ã™ã€‚
GETã®è¦æ±‚ã‚’ã—ã¦ã„ãŸãªã‚‰ã€ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„ãŸå¯¾è±¡ãŒå¤§ãã™ãŽã¾ã™ã€‚
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_UNSUP_REQ squid-3.1.0.4/errors/ja/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/ja/ERR_UNSUP_REQ 2008-12-05 16:12:39.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_UNSUP_REQ 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unsupported Request Method and Protocol
Squid does not support all request methods for all access protocols. For example, you can not POST a Gopher request.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„リクエスト/プãƒãƒˆã‚³ãƒ«ã§ã™ï¼Ž
Squidã¯ã™ã¹ã¦ã®ãƒ—ãƒãƒˆã‚³ãƒ«ã«å¯¾ã—ã¦ã€ã™ã¹ã¦ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆæ–¹å¼ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。例ãˆã°ã€POSTã‚’Gopherã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã§è¡Œã†ã“ã¨ã¯ã§ãã¾ã›ã‚“。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_WRITE_ERROR squid-3.1.0.4/errors/ja/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/ja/ERR_WRITE_ERROR 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_WRITE_ERROR 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Write Error
The system returned: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ãƒ‡ãƒ¼ã‚¿ã‚’é€ä¿¡ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
é€ä¿¡å‡¦ç†ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼Ž
システムãŒä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ: %E
ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ãƒ‡ãƒ¼ã‚¿ã‚’é€ä¿¡ã—ã¦ã„ã‚‹é–“ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚å†åº¦ãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¦ãã ã•ã„。
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ja/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/ja/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/ja/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/ja/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:40:44.000000000 +1300
@@ -1 +1 @@
-
エラー: The requested URL could not be retrieved
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Zero Sized Reply
Squid did not receive any data for this request.
Your cache administrator is %w.
\ No newline at end of file
+
エラー: リクエストã•ã‚ŒãŸ URL ã¯å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸ
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
サイズãŒã‚¼ãƒã®å¿œç”
ã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«ã«å¯¾ã—ã¦Squidã¯ä½•ã‚‚データをå—ã‘å–ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Japanese/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Japanese/ERR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Japanese/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Japanese/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,36 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥¥ã¥Ã¥·¥å¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿
-
-
-
-
¥¨¥é¡¼
-
¥¥ã¥Ã¥·¥å¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¥¥ã¥Ã¥·¥å¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡¥
-
-
-
-
-
¤¢¤Ê¤¿¤Ï¸½ºß°Ê²¼¤Î URL ¤Ç¼¨¤µ¤ì¤ëÆâÍƤò¼èÆÀ¤¹¤ë¤³¤È¤¬µö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó:
-
%U
-¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï¡¤¤¢¤Ê¤¿¤¬¤¢¤Ê¤¿¼«¿È¤Ç¤¢¤ë¤³¤È¤òǧ¾Ú¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-
-
-
-Netscape Navigator ¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 °Ê¹ß¡¤Microsoft Internet Exploror ¤Î
-¥Ð¡¼¥¸¥ç¥ó 3.0 °Ê¹ß¡¤¤â¤·¤¯¤Ï HTTP/1.1 ½àµò¤Î Web ¥Ö¥é¥¦¥¶¤ò»È¤¦¤³¤È¤Ë¤è
-¤Ã¤Æ¡¤Ç§¾Ú¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡¥¤â¤·¡¤¤¢¤Ê¤¿¤¬¤¢¤Ê¤¿¼«¿È¤Îǧ¾Ú¤ò¹Ô¤¦¤³¤È
-¤¬Æñ¤·¤¤¾ì¹ç¤Ë¤Ï¡¤¥¥ã¥Ã¥·¥å´ÉÍý¼Ô¤ËÏ¢Íí¤¹¤ë¤«¡¤
-¤¢¤Ê¤¿¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¥¹¥ï¡¼¥É¤ò
-Êѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,35 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥¥ã¥Ã¥·¥å¥Þ¥Í¥¸¥ã¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿
-
-
-
-
¥¨¥é¡¼
-
¥¥ã¥Ã¥·¥å¥Þ¥Í¥¸¥ã¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¥¥ã¥Ã¥·¥å¥Þ¥Í¥¸¥ã¤Î»²¾È¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡¥
-
-
-
-
-
¤¢¤Ê¤¿¤Ï¸½ºß°Ê²¼¤Î URL ¤Ç¼¨¤µ¤ì¤ëÆâÍƤò¼èÆÀ¤¹¤ë¤³¤È¤¬µö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó:
-
%U
-¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï¡¤¤¢¤Ê¤¿¤¬¤¢¤Ê¤¿¼«¿È¤Ç¤¢¤ë¤³¤È¤òǧ¾Ú¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-
-
-
Netscape Navigator ¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 °Ê¹ß¡¤Microsoft Internet Exploror ¤Î
-¥Ð¡¼¥¸¥ç¥ó 3.0 °Ê¹ß¡¤¤â¤·¤¯¤Ï HTTP/1.1 ½àµò¤Î Web ¥Ö¥é¥¦¥¶¤ò»È¤¦¤³¤È¤Ë¤è
-¤Ã¤Æ¡¤Ç§¾Ú¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡¥¤â¤·¡¤¤¢¤Ê¤¿¤¬¤¢¤Ê¤¿¼«¿È¤Îǧ¾Ú¤ò¹Ô¤¦¤³¤È
-¤¬Æñ¤·¤¤¾ì¹ç¤Ë¤Ï¡¤¥¥ã¥Ã¥·¥å´ÉÍý¼Ô¤ËÏ¢Íí¤¹¤ë¤«¡¤
-¤â¤·¤¢¤Ê¤¿¼«¿È¤¬´ÉÍý¼Ô¤Ê¤é¤Ð¡¤Squid ¤Î¥¥ã¥Ã¥·¥å¥Þ¥Í¥¸¥ã¥¤¥ó¥¿¡¼
-¥Õ¥§¥¤¥¹¤Ë´Ø¤¹¤ëʸ½ñ¤òÆɤߤޤ·¤ç¤¦¡¥¤Þ¤¿¡¤¥¨¥é¡¼¤Î¾Ü¤·¤¤ÆâÍƤòÃΤ뤿¤á¤Ë
-¥í¥°¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡¥
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Japanese/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Japanese/ERR_CANNOT_FORWARD 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¸½ºß¡¤¥ê¥¯¥¨¥¹¥È¤ÎžÁ÷¤Ï¤Ç¤¤Þ¤»¤ó¡¥
-
-
-
-
-¤¢¤Ê¤¿¤Î¥ê¥¯¥¨¥¹¥È¤Ï¡¤¸µ¤Î¥µ¡¼¥Ð¤â¤·¤¯¤Ï¾¤Î¿Æ¥¥ã¥Ã¥·¥å¥µ¡¼¥Ð¤ØžÁ÷¤Ç¤
-¤Þ¤»¤ó¡¥¤³¤ì¤Ï¼¡¤ÎÍýͳ¤Ë¤è¤êȯÀ¸¤·¤¿¤È¹Í¤¨¤é¤ì¤Þ¤¹:
-
-- ¥¥ã¥Ã¥·¥å´ÉÍý¼Ô¤¬¸µ¤Î¥µ¡¼¥Ð¤ËľÀÜÀܳ¤·¤Ê¤¤¤è¤¦¤ËÀßÄꤷ¤¿¡¥
-
- ÀßÄꤵ¤ì¤Æ¤¤¤ëÁ´¤Æ¤Î¿Æ¥¥ã¥Ã¥·¥å¥µ¡¼¥Ð¤Ø¸½ºßÅþã¤Ç¤¤Ê¤¤¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Japanese/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Japanese/ERR_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-Àܳ¤Ç¤¤Þ¤»¤ó¡¥
-
-
-
-
-¥·¥¹¥Æ¥à¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
%E
-
-
-ÀܳÀè¤Î¥Û¥¹¥È¤â¤·¤¯¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤¬²ÔƯ¤·¤Æ¤¤¤Þ¤»¤ó¡¥¤·¤Ð¤é¤¯ÂԤäƤ«¤é
-¤â¤¦°ìÅٻ¤Æ²¼¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_DNS_FAIL squid-3.1.0.4/errors/Japanese/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Japanese/ERR_DNS_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,34 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
-°Ê²¼¤Î¥Û¥¹¥È̾¤Î IP address ¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó¡¥
-%H
-
-
-
-
-DNS ¥µ¡¼¥Ð¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
-%z
-
-
-
-¤³¤Î°ÕÌ£¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹:
-
- ¥¥ã¥Ã¥·¥å¤Ï URL Ãæ¤Î¥Û¥¹¥È̾¤«¤é IP address ¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡¥
- ¥¢¥É¥ì¥¹¤¬´Ö°ã¤Ã¤Æ¤¤¤Ê¤¤¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_ESI squid-3.1.0.4/errors/Japanese/ERR_ESI
--- squid-3.1.0.3/errors/Japanese/ERR_ESI 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-ESI Processing failed.
-
-
-
-The ESI processor returned:
-
-%Z
-
-
-
-This means that:
-
- The surrogate was not able to process the ESI template. Please report this error to the webmaster.
-
-
Your webmaster is %w.
-
This page is in english because a translation has not been made. If you are able to, please create a translation and contact the squid project to get it included.
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Japanese/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Japanese/ERR_FORWARDING_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-žÁ÷¤ÏµñÈݤµ¤ì¤Þ¤·¤¿¡¥
-
-
-
-
-¥¥ã¥Ã¥·¥å´Ö¤Ë¤ª¤±¤ë´Ø·¸¤ò¶¯À©Åª¤Ë·»Äï´Ø·¸¤È¤Ê¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤ë¤¿¤á¡¤¥¥ã¥Ã
-¥·¥å¤Ï¤¢¤Ê¤¿¤Î¥ê¥¯¥¨¥¹¥È¤òžÁ÷¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡¥%i ¤Î¥¥ã¥Ã¥·¥å¤¬¸í¤Ã¤¿
-ÀßÄê¤È¤Ê¤Ã¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_DISABLED squid-3.1.0.4/errors/Japanese/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_DISABLED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-FTP ¤Ï»È¤¨¤Þ¤»¤ó¡¥
-
-
-
-
-¥¥ã¥Ã¥·¥å¤Ï FTP ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_FAILURE squid-3.1.0.4/errors/Japanese/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë¡¤FTP ¥×¥í¥È¥³¥ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-%U
-
-Squid ¤Ï°Ê²¼¤Î ftp ¥³¥Þ¥ó¥É¤òÁ÷¤ê¤Þ¤·¤¿¤¬:
-
%f
-¤³¤Î¤è¤¦¤Ê·ë²Ì¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡¥
-
%F
-
%g
-
-¤ª¤½¤é¤¯¡¤FTP URL ¤¬ÀäÂХѥ¹¤È¤Ê¤Ã¤Æ¤¤¤¿¤«¤é¤«¤â¤·¤ì¤Þ¤»¤ó(¤³¤ì¤Ï
-RFC 1738 ¤Ë½¾¤Ã¤Æ¤¤¤Þ¤»¤ó)¡¥¤â¤·¤³¤ì¤¬¸¶°ø¤Ê¤é¤Ð¡¤¥Õ¥¡¥¤¥ë¤Ï
-%B ¤Ë¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Japanese/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_FORBIDDEN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤ÎURL¤ò¼èÆÀ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤¡¢FTP¤Îǧ¾Ú¤Î¼ºÇÔ¤¬È¯À¸¤·¤Þ¤·¤¿:
-%U
-
-Squid¤Ï°Ê²¼¤ÎFTP¥³¥Þ¥ó¥É¤òÁ÷¤ê¤Þ¤·¤¿:
-
%f
-¤½¤·¤Æ¡¢¤³¤ÎÍͤʱþÅú¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£
-
%F
-
%g
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Japanese/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_NOT_FOUND 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤ÎURL¤ò¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿:
-%U
-
-Squid¤Ï°Ê²¼¤ÎFTP¥³¥Þ¥ó¥É¤òÁ÷¤ê¤Þ¤·¤¿:
-
%f
-¤½¤·¤Æ¡¢¤³¤ÎÍͤʱþÅú¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£
-
%F
-
%g
-
-¤³¤ì¤Ï(RFC 1738¤Ë½¾¤Ã¤Æ¤¤¤Ê¤¤)ÀäÂХѥ¹¤ò´Þ¤ó¤ÀFTP¤ÎURL¤Ë¤è¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
-¤½¤Î¾ì¹ç¤Ë³ºÅö¤¹¤ë¤Ê¤é¡¢¥Õ¥¡¥¤¥ë¤Ï%B¤Ë¸«¤Ä¤«¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_CREATED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-
-
-
-
FTP PUT À®¸ù: ¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤·¤¿
-
-
-
Áàºî¤ÏÀ®¸ù¤·¤Þ¤·¤¿
-
¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤·¤¿
-
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
-
¥¨¥é¡¼: FTP ¥¢¥Ã¥×¥í¡¼¥É¤Ï¼ºÇÔ¤·¤Þ¤·¤¿
-
-
-
¥¨¥é¡¼
-
FTP ¥¢¥Ã¥×¥í¡¼¥É¤Ï¼ºÇÔ¤·¤Þ¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò PUT ¤·¤è¤¦¤È¤·¤¿ºÝ¤Ë:
-%U
-
-Squid ¤Ï°Ê²¼¤Î ftp ¥³¥Þ¥ó¥É¤òÁ÷¤ê¤Þ¤·¤¿¤¬:
-
- %f
-
-¤³¤Î¤è¤¦¤Ê·ë²Ì¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡¥
-
- %F
-
-
-¤³¤Î°ÕÌ£¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹:
-
- ¥Ñ¥¹¡¤¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¡¤¥Ç¥£¥¹¥¯¤Î¶õ¤ÍÆÎ̤ò³Îǧ¤·¡¤ºÆÅٻ¤Æ¤¯¤À¤µ¤¤¡¥
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-
-
-
-
FTP PUT À®¸ù: ¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤·¤¿
-
-
-
Áàºî¤ÏÀ®¸ù¤·¤Þ¤·¤¿
-
¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤·¤¿
-
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Japanese/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Japanese/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤ÎURL¤ò¼èÆÀ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤¡¢FTP¥µ¡¼¥Ð¤ÎÉé²Ù¤¬¹â¤¹¤®¤Þ¤·¤¿:
-%U
-
-Squid¤Ï°Ê²¼¤ÎFTP¥³¥Þ¥ó¥É¤òÁ÷¤ê¤Þ¤·¤¿:
-
%f
-¤½¤·¤Æ¡¢¤³¤ÎÍͤʱþÅú¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£
-
%F
-
%g
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_ICAP_FAILURE squid-3.1.0.4/errors/Japanese/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/Japanese/ERR_ICAP_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-ICAP protocol error.
-
-
-
-
-The system returned:
-
%E
-
-
-This means that:
-Some aspect of the ICAP communication failed. Possible problems:
-
-- ICAP server is not reachable.
-
- Illegal response from ICAP server.
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_INVALID_REQ squid-3.1.0.4/errors/Japanese/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Japanese/ERR_INVALID_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-ÉÔÀµ¤Ê¥ê¥¯¥¨¥¹¥È¤Ç¤¹¡¥
-
-
-
-
-HTTP ¤Ë¤è¤ë¥ê¥¯¥¨¥¹¥È¤¬ÉÔÀµ¤Ç¤¹¡¥²ÄǽÀ¤Î¤¢¤ëÌäÂê¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹:
-
-- ¥ê¥¯¥¨¥¹¥ÈÊýË¡¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¤¤¢¤ë¤¤¤ÏÉÔÌÀ¤Ç¤¹¡¥
-
- URL ¤¬¤¢¤ê¤Þ¤»¤ó¡¥
-
- HTTP ¼±ÊÌʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó (HTTP/1.0)¡¥
-
- ¥ê¥¯¥¨¥¹¥È¤¬Ä¹¤¹¤®¤Þ¤¹¡¥
-
- POST/PUT ¥ê¥¯¥¨¥¹¥È¤Ë¤ª¤¤¤Æ Content-Length ¤¬¤¢¤ê¤Þ¤»¤ó¡¥
-
- ¥Û¥¹¥È̾¤ËÉÔÀµ¤Êʸ»ú¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹: ¥¢¥ó¥À¡¼¥¹¥³¥¢¤Ï»È¤¨¤Þ¤»¤ó¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_INVALID_RESP squid-3.1.0.4/errors/Japanese/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Japanese/ERR_INVALID_RESP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
--
-
-Invalid Response
-
-
-
-
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_INVALID_URL squid-3.1.0.4/errors/Japanese/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Japanese/ERR_INVALID_URL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-ÉÔÀµ¤Ê URL ¤Ç¤¹¡¥
-
-
-
-
-URL ¤¬ÉÔÀµ¤Ç¤¹¡¥²ÄǽÀ¤Î¤¢¤ëÌäÂê¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹:
-
-- ¥×¥í¥È¥³¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¤¤¢¤ë¤¤¤Ï´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹
-('http://' ¤Ê¤É¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó)¡¥
-
- ¥Û¥¹¥È̾¤¬¤¢¤ê¤Þ¤»¤ó¡¥
-
- URL ¥Ñ¥¹¤ËÉÔÀµ¤Ê¿½Å¥¨¥¹¥±¡¼¥×¤¬¤¢¤ê¤Þ¤¹¡¥
-
- ¥Û¥¹¥È̾¤ËÉÔÀµ¤Êʸ»ú¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹: ¥¢¥ó¥À¡¼¥¹¥³¥¢¤Ï»È¤¨¤Þ¤»¤ó¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Japanese/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Japanese/ERR_LIFETIME_EXP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-Àܳ²Äǽ¤Ê»þ´Ö¤ò±Û¤¨¤Þ¤·¤¿¡¥
-
-
-
-
-ºÇÂçÀܳ²Äǽ»þ´Ö¤ò±Û¤¨¤Æ¤·¤Þ¤Ã¤¿¤¿¤á¡¤Squid ¤ÏÍ×µá¤ò½ªÎ»¤·¤Þ¤·¤¿¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_NO_RELAY squid-3.1.0.4/errors/Japanese/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Japanese/ERR_NO_RELAY 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-WAIS ¥ê¥ì¡¼¤¬¤¢¤ê¤Þ¤»¤ó¡¥
-
-
-
-
-WAIS ¥ê¥ì¡¼ÍÑ¥Û¥¹¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó! ´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Japanese/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-
only-if-cached ¤Î»ØÄ꤬¤¢¤ê¤Þ¤·¤¿¤¬¡¤¤½¤Îʸ½ñ¤¬¥¥ã¥Ã¥·¥å¤Ë
-¸ºß¤·¤Æ¤¤¤Þ¤»¤ó¡¥
-
-
-
-
-
-¥¥ã¥Ã¥·¥å¤Ø¤Î only-if-cached ¤Ä¤¥ê¥¯¥¨¥¹¥È¤¬¤¢¤ê¤Þ¤·¤¿¤¬¡¤
-¤³¤Îʸ½ñ¤Ï¥¥ã¥Ã¥·¥å¤Ë¸ºß¤·¤Æ¤¤¤Ê¤¤¤«¡¤¤¢¤ë¤¤¤Ï¤¹¤Ç¤Ë¥¥ã¥Ã¥·¥å
-¤Ë¤Ï¤¢¤ë¤¬(only-if-cached ¤Ë¤è¤Ã¤Æ¶Ø»ß¤µ¤ì¤Æ¤¤¤ë)¤³¤Îʸ½ñ¤¬
-¹¹¿·¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤ÎºÆ³Îǧ¤¬É¬ÍפǤ¹¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_READ_ERROR squid-3.1.0.4/errors/Japanese/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Japanese/ERR_READ_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¼õ¿®½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥
-
-
-
-
-¥·¥¹¥Æ¥à¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
%E
-
-
-¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¥Ç¡¼¥¿¤ò¼õ¿®¤·¤Æ¤¤¤ë´Ö¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥ºÆÅ٥ꥯ¥¨
-¥¹¥È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Japanese/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Japanese/ERR_READ_TIMEOUT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¼õ¿®½èÍý¤Ï»þ´ÖÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤·¤¿¡¥
-
-
-
-
-¥·¥¹¥Æ¥à¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
%E
-
-
-¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¥Ç¡¼¥¿¤òÆɤ߽Ф·¤Æ¤¤¤ë´Ö¤Ë¥¿¥¤¥à¥¢¥¦¥È¤¬È¯À¸¤·¤Þ¤·¤¿¡¥
-¥Í¥Ã¥È¥ï¡¼¥¯¤â¤·¤¯¤Ï¥µ¡¼¥Ð¤¬²ÔƯ¤·¤Æ¤¤¤Ê¤¤¤«¡¤¤¢¤ë¤¤¤Ïº®»¨¤·¤Æ¤¤¤Þ¤¹¡¥
-ºÆÅ٥ꥯ¥¨¥¹¥È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/Japanese/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/Japanese/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Failed to establish a secure connection to %I
-
-
-
-
-The system returned:
-
%E
-
-
-This proxy and the remote host failed to negotiate a mutually acceptable
-security settings for handling your request. It is possible that the remote
-host does not support secure connections, or the proxy is not satisfied with
-the host security credentials.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Japanese/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Japanese/ERR_SHUTTING_DOWN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
-
-¤³¤Î¥¥ã¥Ã¥·¥å¤Ï²ÔƯÄä»ß¤Î½èÍý¤ËÆþ¤Ã¤Æ¤¤¤Æ¡¢
-¸½ºß¤¢¤Ê¤¿¤Î¥ê¥¯¥¨¥¹¥È¤Ø¤Î¥µ¡¼¥Ó¥¹¤òÄ󶡤Ǥ¤Þ¤»¤ó¡£
-¸å¤ÇºÆÅ٥ꥯ¥¨¥¹¥È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Japanese/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Japanese/ERR_SOCKET_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-¥¨¥é¡¼
-¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¥½¥±¥Ã¥ÈºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¥
-
-
-
-
-¥·¥¹¥Æ¥à¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
%E
-
-
-Squid ¤Ï TCP ¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤¤Þ¤»¤ó¡¥¤ª¤½¤é¤¯Éé²Ù¤¬¹â¤¹¤®¤ë¤«¤é¤Ç¤·¤ç¤¦¡¥
-ºÆÅ٥ꥯ¥¨¥¹¥È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_TOO_BIG squid-3.1.0.4/errors/Japanese/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Japanese/ERR_TOO_BIG 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
ERROR
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
-
-¥¥ã¥Ã¥·¥å¤Î´ÉÍý¼Ô¤Ï%w¤Ç¤¹¡£
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_UNSUP_REQ squid-3.1.0.4/errors/Japanese/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Japanese/ERR_UNSUP_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥ê¥¯¥¨¥¹¥È/¥×¥í¥È¥³¥ë¤Ç¤¹¡¥
-
-
-
-
-Squid ¤ÏÁ´¤Æ¤Î¥×¥í¥È¥³¥ë¤ËÂФ¹¤ëÁ´¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤ï¤±¤Ç
-¤Ï¤¢¤ê¤Þ¤»¤ó¡¥Î㤨¤Ð¡¤Gopher ¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë POST ¤Ï¼Â¹Ô¤Ç¤¤Þ¤»¤ó¡¥
-
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_URN_RESOLVE squid-3.1.0.4/errors/Japanese/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Japanese/ERR_URN_RESOLVE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-URN ¤òÄ´¤Ù¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡¥
-
-
-
-
-%T ¤Î URN ¤òͽÁÛ¤·¤¹¤®¤Æ¤Ï¤¤¤±¤Þ¤»¤ó:)
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_WRITE_ERROR squid-3.1.0.4/errors/Japanese/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Japanese/ERR_WRITE_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-Á÷¿®½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥
-
-
-
-
-¥·¥¹¥Æ¥à¤¬°Ê²¼¤Î¥¨¥é¡¼¤òÊÖ¤·¤Þ¤·¤¿:
-
%E
-
-
-¥Í¥Ã¥È¥ï¡¼¥¯¤Ø¥Ç¡¼¥¿¤òÁ÷¿®¤·¤Æ¤¤¤ë´Ö¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥ºÆÅ٥ꥯ¥¨¥¹
-¥È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Japanese/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Japanese/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Japanese/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Japanese/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
-
¥¨¥é¡¼: ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-
¥¨¥é¡¼
-
¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Ï¼èÆÀ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿
-
-
-°Ê²¼¤Î URL ¤ò¼èÆÀ¤·¤¿ºÝ¤Ë:
-%U
-
-¼¡¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿:
-
--
-
-Ãæ¿È¤¬¤¢¤ê¤Þ¤»¤ó¡¥
-
-
-
-
-Squid ¤Ï²¿¤â¼õ¤±¤È¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡¥
-
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Korean/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Korean/ERR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Korean/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Korean/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,34 +1,34 @@
-
-
¿¡·¯: ij½¬ ÀÌ¿ë ºÒ°¡
+
+
ì—러: ìºì‰¬ ì´ìš© 불가
-
¿¡·¯
-
ij½¬ ÀÌ¿ë ºÒ°¡
+
ì—러
+
ìºì‰¬ ì´ìš© 불가
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-ij½¬ ÀÌ¿ë ¿äûÀÌ °ÅÀýµÇ¾ú½À´Ï´Ù.
+ìºì‰¬ ì´ìš© ìš”ì²ì´ ê±°ì ˆë˜ì—ˆìŠµë‹ˆë‹¤.
-
Á˼ÛÇÕ´Ï´Ù. ÀÌ Ä³½¬¸¦ ÅëÇØ ´ÙÀ½ ¼ºñ½º¸¦ ¹Þ±â À§Çؼ´Â
+
죄송합니다. ì´ ìºì‰¬ë¥¼ 통해 ë‹¤ìŒ ì„œë¹„ìŠ¤ë¥¼ 받기 위해서는
%U
-ÀÎÁõÀýÂ÷¸¦ °ÅÃÄ¾ß ÇÕ´Ï´Ù.
+ì¸ì¦ì ˆì°¨ë¥¼ ê±°ì³ì•¼ 합니다.
-ÀÎÁõ ÀýÂ÷¸¦ À§Çؼ´Â Netscape 2.0 ÀÌ»óÀÇ ¹öÁ¯À̳ª, Microsoft
-Internet Explorer 3.0 ¶Ç´Â HTTP/1.1ÀÌ Áö¿øµÇ´Â ºê¶ó¿ìÁ®¸¦
-»ç¿ëÇØ¾ß ÇÕ´Ï´Ù. ¹®Á¦°¡ ÀÖÀ» ¶§´Â ij½¬ °ü¸®ÀÚ
-¿¡°Ô ¿äûÇϽðųª óÀ½¿¡ ºÎ¿©µÇ´Â Æнº¿öµå¸¦
-¹Ù²Ù½Ê½Ã¿À.
+ì¸ì¦ ì ˆì°¨ë¥¼ 위해서는 Netscape 2.0 ì´ìƒì˜ ë²„ì ¼ì´ë‚˜, Microsoft
+Internet Explorer 3.0 ë˜ëŠ” HTTP/1.1ì´ ì§€ì›ë˜ëŠ” 브ë¼ìš°ì ¸ë¥¼
+사용해야 합니다. ë¬¸ì œê°€ ìžˆì„ ë•ŒëŠ” ìºì‰¬ 관리ìž
+ì—게 ìš”ì²í•˜ì‹œê±°ë‚˜ 처ìŒì— 부여ë˜ëŠ” 패스워드를
+바꾸ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,35 +1,35 @@
-
-
¿¡·¯: ij½¬ ¸Å´ÏÀú ÀÌ¿ë ºÒ°¡
+
+
ì—러: ìºì‰¬ ë§¤ë‹ˆì € ì´ìš© 불가
-
¿¡·¯
-
ij½¬ ¸Þ´ÏÀú ÀÌ¿ë ºÒ°¡
+
ì—러
+
ìºì‰¬ ë©”ë‹ˆì € ì´ìš© 불가
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-ij½¬ ¸Å´ÏÀú ÀÌ¿ë ¿äûÀÌ °ÅÀýµÇ¾ú½À´Ï´Ù.
+ìºì‰¬ ë§¤ë‹ˆì € ì´ìš© ìš”ì²ì´ ê±°ì ˆë˜ì—ˆìŠµë‹ˆë‹¤.
-
Á˼ÛÇÕ´Ï´Ù. ÀÌ Ä³½¬ ¸Å´ÏÀú¸¦ ÅëÇØ ´ÙÀ½ ¼ºñ½º¸¦ ¹Þ±â À§Çؼ´Â
+
죄송합니다. ì´ ìºì‰¬ ë§¤ë‹ˆì €ë¥¼ 통해 ë‹¤ìŒ ì„œë¹„ìŠ¤ë¥¼ 받기 위해서는
%U
-ÀÎÁõÀýÂ÷¸¦ °ÅÃÄ¾ß ÇÕ´Ï´Ù.
+ì¸ì¦ì ˆì°¨ë¥¼ ê±°ì³ì•¼ 합니다.
-ÀÎÁõ ÀýÂ÷¸¦ À§Çؼ´Â Netscape 2.0 ÀÌ»óÀÇ ¹öÁ¯À̳ª, Microsoft
-Internet Explorer 3.0 ¶Ç´Â HTTP/1.1ÀÌ Áö¿øµÇ´Â ºê¶ó¿ìÁ®¸¦
-»ç¿ëÇØ¾ß ÇÕ´Ï´Ù. ¹®Á¦°¡ ÀÖÀ» ¶§´Â ij½¬ °ü¸®ÀÚ
-¿¡°Ô µµ¿òÀ» ¿äûÇϽʽÿÀ. °ü¸®ÀÚÀÇ °æ¿ì¿¡´Â ij½¬ ¸Å´ÏÀú
-ÀÎÅÍÆäÀ̽º¿¡ °üÇÑ Squid ¹®¼¸¦ ÂüÁ¶ÇϽðí, ÀÚ¼¼ÇÑ ¿¡·¯ ¸Þ½ÃÁö¸¦
-À§Çؼ´Â ij½¬ ·Î±×¸¦ ÂüÁ¶ÇϽʽÿÀ.
+ì¸ì¦ ì ˆì°¨ë¥¼ 위해서는 Netscape 2.0 ì´ìƒì˜ ë²„ì ¼ì´ë‚˜, Microsoft
+Internet Explorer 3.0 ë˜ëŠ” HTTP/1.1ì´ ì§€ì›ë˜ëŠ” 브ë¼ìš°ì ¸ë¥¼
+사용해야 합니다. ë¬¸ì œê°€ ìžˆì„ ë•ŒëŠ” ìºì‰¬ 관리ìž
+ì—게 ë„ì›€ì„ ìš”ì²í•˜ì‹ì‹œì˜¤. 관리ìžì˜ 경우ì—는 ìºì‰¬ ë§¤ë‹ˆì €
+ì¸í„°íŽ˜ì´ìŠ¤ì— 관한 Squid 문서를 ì°¸ì¡°í•˜ì‹œê³ , ìžì„¸í•œ ì—러 메시지를
+위해서는 ìºì‰¬ 로그를 참조하ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Korean/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Korean/ERR_CANNOT_FORWARD 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_CANNOT_FORWARD 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-ÇöÀç·Î¼´Â ÀÌ ¿äûÀ» ÁøÇà ½Ãų ¼ö ¾ø½À´Ï´Ù.
+현재로서는 ì´ ìš”ì²ì„ 진행 시킬 수 없습니다.
-ÀÌ ¿äûÀ» origin server³ª ´Ù¸¥ parent cache·Î ÁøÇà ½Ãų ¼ö ¾ø½À´Ï´Ù.
-´ÙÀ½°ú °°Àº ¿øÀÎÀÌ ÀÖÀ» ¼ö ÀÖ½À´Ï´Ù.
+ì´ ìš”ì²ì„ origin server나 다른 parent cacheë¡œ 진행 시킬 수 없습니다.
+다ìŒê³¼ ê°™ì€ ì›ì¸ì´ ìžˆì„ ìˆ˜ 있습니다.
-- ÀÌ Ä³½¬´Â origin server·Î Á÷Á¢ ¿¬°áÀÌ ºÒ°¡´É Çϵµ·Ï ij½¬ °ü¸®ÀÚ¿¡
-ÀÇÇØ ¼³Á¤µÇ¾ú´Ù.
-
- ¸ðµç parent cache·ÎÀÇ Á¢¼ÓÀÌ ºÒ°¡´É ÇÏ´Ù.
+
- ì´ ìºì‰¬ëŠ” origin serverë¡œ ì§ì ‘ ì—°ê²°ì´ ë¶ˆê°€ëŠ¥ 하ë„ë¡ ìºì‰¬ 관리ìžì—
+ì˜í•´ ì„¤ì •ë˜ì—ˆë‹¤.
+
- ëª¨ë“ parent cacheë¡œì˜ ì ‘ì†ì´ 불가능 하다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Korean/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Korean/ERR_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_CONNECT_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,28 +1,28 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-½Ã½ºÅÛÀº ¾Æ·¡¿Í °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô½À´Ï´Ù:
+ì‹œìŠ¤í…œì€ ì•„ëž˜ì™€ ê°™ì€ ë©”ì‹œì§€ë¥¼ 보내왔습니다:
%E
-»ó´ë È£½ºÆ®³ª ³×Æ®¿÷ÀÌ µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù. ´Ù½Ã ½ÃµµÇϽʽÿÀ.
+ìƒëŒ€ 호스트나 네트ì›ì´ ë™ìž‘하지 않습니다. 다시 ì‹œë„하ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_DNS_FAIL squid-3.1.0.4/errors/Korean/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Korean/ERR_DNS_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_DNS_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,32 +1,32 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-%H¿¡ ´ëÇؼ IP ÁÖ¼Ò¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù.
+%Hì— ëŒ€í•´ì„œ IP 주소를 ì°¾ì„ ìˆ˜ 없습니다.
-µµ¸ÞÀÎ ³×ÀÓ ¼¹ö°¡ ´ÙÀ½°ú °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô½À´Ï´Ù:
+ë„ë©”ì¸ ë„¤ìž„ 서버가 다ìŒê³¼ ê°™ì€ ë©”ì‹œì§€ë¥¼ 보내왔습니다:
%z
-ÀÌ°ÍÀÇ Àǹ̴ ´ÙÀ½°ú °°½À´Ï´Ù:
+ì´ê²ƒì˜ ì˜ë¯¸ëŠ” 다ìŒê³¼ 같습니다:
-ÀÌ Ä³½¬´Â URL¿¡ ¸í½ÃµÈ È£½ºÆ® À̸§À» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù.
-ÁÖ¼Ò°¡ ¿Ã¹Ù¸¥Áö È®ÀÎÇϽʽÿÀ.
+ì´ ìºì‰¬ëŠ” URLì— ëª…ì‹œëœ í˜¸ìŠ¤íŠ¸ ì´ë¦„ì„ ì²˜ë¦¬í• ìˆ˜ 없습니다.
+주소가 올바른지 확ì¸í•˜ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Korean/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Korean/ERR_FORWARDING_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FORWARDING_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,26 +1,26 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-Æ÷¿öµù ºÒ°¡
+í¬ì›Œë”© 불가
-ÀÌ Ä³½¬´Â sibling °ü°è·Î ¼³Á¤µÇ¾î Àֱ⠶§¹®¿¡ ÀÌ ¿äûÀ» ó¸®ÇÒ ¼ö
-¾ø½À´Ï´Ù. %i ÀÇ client°¡ À߸ø ¼³Á¤µÈ ij½¬ÀÏ ¼ö ÀÖ½À´Ï´Ù.
+ì´ ìºì‰¬ëŠ” sibling 관계로 ì„¤ì •ë˜ì–´ 있기 ë•Œë¬¸ì— ì´ ìš”ì²ì„ ì²˜ë¦¬í• ìˆ˜
+없습니다. %i ì˜ clientê°€ 잘못 ì„¤ì •ëœ ìºì‰¬ì¼ 수 있습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_DISABLED squid-3.1.0.4/errors/Korean/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Korean/ERR_FTP_DISABLED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_DISABLED 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-FTP ¼ºñ½º°¡ ºÒ°¡´É ÇÕ´Ï´Ù.
+FTP 서비스가 불가능 합니다.
-ÀÌ Ä³½¬´Â FTP ¼ºñ½º¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù.
+ì´ ìºì‰¬ëŠ” FTP 서비스를 지ì›í•˜ì§€ 않습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_FAILURE squid-3.1.0.4/errors/Korean/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Korean/ERR_FTP_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,19 +1,19 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß FTP ÇÁ·ÎÅäÄÝ ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘ FTP í”„ë¡œí† ì½œ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
%U
-Squid´Â ´ÙÀ½°ú °°Àº FTP ¸í·É¾î¸¦ Àü¼ÛÇß°í:
+Squid는 다ìŒê³¼ ê°™ì€ FTP ëª…ë ¹ì–´ë¥¼ ì „ì†¡í–ˆê³ :
%f
-¾Æ·¡ÀÇ ÀÀ´äÀ» ¹Þ¾Ò½À´Ï´Ù.
+ì•„ëž˜ì˜ ì‘ë‹µì„ ë°›ì•˜ìŠµë‹ˆë‹¤.
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Korean/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Korean/ERR_FTP_FORBIDDEN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_FORBIDDEN 2009-01-23 18:37:27.000000000 +1300
@@ -1,19 +1,19 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß FTP ÀÎÁõ ¹®Á¦°¡ ¹ß»ýÇß½À´Ï´Ù:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘ FTP ì¸ì¦ ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤:
%U
-Squid´Â ´ÙÀ½°ú °°Àº FTP ¸í·É¾î¸¦ Àü¼ÛÇß°í:
+Squid는 다ìŒê³¼ ê°™ì€ FTP ëª…ë ¹ì–´ë¥¼ ì „ì†¡í–ˆê³ :
%f
-¾Æ·¡ÀÇ ÀÀ´äÀ» ¹Þ¾Ò½À´Ï´Ù.
+ì•„ëž˜ì˜ ì‘ë‹µì„ ë°›ì•˜ìŠµë‹ˆë‹¤.
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Korean/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Korean/ERR_FTP_NOT_FOUND 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_NOT_FOUND 2009-01-23 18:37:27.000000000 +1300
@@ -1,23 +1,23 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀÌ Ã³¸®µÇÁö ¸øÇß½À´Ï´Ù:
+ë‹¤ìŒ URLì´ ì²˜ë¦¬ë˜ì§€ 못했습니다:
%U
-Squid´Â ´ÙÀ½°ú °°Àº FTP ¸í·É¾î¸¦ Àü¼ÛÇß°í:
+Squid는 다ìŒê³¼ ê°™ì€ FTP ëª…ë ¹ì–´ë¥¼ ì „ì†¡í–ˆê³ :
%f
-¾Æ·¡ÀÇ ÀÀ´äÀ» ¹Þ¾Ò½À´Ï´Ù.
+ì•„ëž˜ì˜ ì‘ë‹µì„ ë°›ì•˜ìŠµë‹ˆë‹¤.
%F
%g
-FTP URLÀ» Àý´ë °æ·Î·Î ÁöÁ¤ÇÏ¿´À» ¶§ (RFC 1738¿¡ ¾î±ß³³´Ï´Ù)
-ÀÌ·¯ÇÑ ¹®Á¦°¡ ¹ß»ýµÉ ¼ö ÀÖ½À´Ï´Ù. ÀÌ °æ¿ì¿¡´Â, ÆÄÀÏÀÌ
-%B¿¡ ÀÖÀ» ¼ö ÀÖ½À´Ï´Ù.
+FTP URLì„ ì ˆëŒ€ 경로로 ì§€ì •í•˜ì˜€ì„ ë•Œ (RFC 1738ì— ì–´ê¸‹ë‚©ë‹ˆë‹¤)
+ì´ëŸ¬í•œ ë¬¸ì œê°€ ë°œìƒë 수 있습니다. ì´ ê²½ìš°ì—는, 파ì¼ì´
+%Bì— ìžˆì„ ìˆ˜ 있습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_CREATED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_CREATED 2009-01-23 18:37:27.000000000 +1300
@@ -1,11 +1,11 @@
-
-
FTP PUT ¼öÇà ¿Ï·á: ÆÄÀÏÀÌ »ý¼ºµÇ¾ú½À´Ï´Ù
+
+
FTP PUT 수행 완료: 파ì¼ì´ ìƒì„±ë˜ì—ˆìŠµë‹ˆë‹¤
-
¼öÇà ¿Ï·á
-
ÆÄÀÏÀÌ »ý¼ºµÇ¾ú½À´Ï´Ù
+
수행 완료
+
파ì¼ì´ ìƒì„±ë˜ì—ˆìŠµë‹ˆë‹¤
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
-
¿¡·¯: FTP upload ½ÇÆÐ
+
+
ì—러: FTP upload 실패
-
¿¡·¯
-
FTP PUT/upload ½ÇÆÐ
+
ì—러
+
FTP PUT/upload 실패
-´ÙÀ½ URLÀ» Àü¼ÛÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì „ì†¡í•˜ë˜ ì¤‘:
%U
-Squid´Â ´ÙÀ½°ú °°Àº FTP ¸í·É¾î¸¦ Àü¼ÛÇß°í:
+Squid는 다ìŒê³¼ ê°™ì€ FTP ëª…ë ¹ì–´ë¥¼ ì „ì†¡í–ˆê³ :
%f
-¾Æ·¡ÀÇ ÀÀ´äÀ» ¹Þ¾Ò½À´Ï´Ù.
+ì•„ëž˜ì˜ ì‘ë‹µì„ ë°›ì•˜ìŠµë‹ˆë‹¤.
%F
-ÀÌ°ÍÀÇ Àǹ̴ ´ÙÀ½°ú °°½À´Ï´Ù:
+ì´ê²ƒì˜ ì˜ë¯¸ëŠ” 다ìŒê³¼ 같습니다:
-°æ·Î¿Í Æ۹̼ǰú µð½ºÅ© ¿ë·®¸¦ È®ÀÎÇÏ°í ´Ù½Ã ½ÃµµÇϽʽÿÀ.
+경로와 í¼ë¯¸ì…˜ê³¼ ë””ìŠ¤í¬ ìš©ëŸ‰ë¥¼ 확ì¸í•˜ê³ 다시 ì‹œë„하ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Korean/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,11 +1,11 @@
-
-
FTP PUT ¼öÇà ¿Ï·á: ÆÄÀÏÀÌ º¯°æµÇ¾ú½À´Ï´Ù
+
+
FTP PUT 수행 완료: 파ì¼ì´ 변경ë˜ì—ˆìŠµë‹ˆë‹¤
-
¼öÇà ¿Ï·á
-
ÆÄÀÏÀÌ º¯°æµÇ¾ú½À´Ï´Ù
+
수행 완료
+
파ì¼ì´ 변경ë˜ì—ˆìŠµë‹ˆë‹¤
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Korean/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Korean/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:27.000000000 +1300
@@ -1,19 +1,19 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-FTP ¼¹ö¿¡ ¿ä±¸°¡ ¸ô·Á ´ÙÀ½ URLÀ» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù:
+FTP ì„œë²„ì— ìš”êµ¬ê°€ ëª°ë ¤ ë‹¤ìŒ URLì„ ì²˜ë¦¬í• ìˆ˜ 없습니다:
%U
-Squid´Â ´ÙÀ½°ú °°Àº FTP ¸í·É¾î¸¦ Àü¼ÛÇß°í:
+Squid는 다ìŒê³¼ ê°™ì€ FTP ëª…ë ¹ì–´ë¥¼ ì „ì†¡í–ˆê³ :
%f
-¾Æ·¡ÀÇ ÀÀ´äÀ» ¹Þ¾Ò½À´Ï´Ù.
+ì•„ëž˜ì˜ ì‘ë‹µì„ ë°›ì•˜ìŠµë‹ˆë‹¤.
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_INVALID_REQ squid-3.1.0.4/errors/Korean/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Korean/ERR_INVALID_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_INVALID_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,34 +1,34 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ ¿äûÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ ìš”ì²ì„ 처리 í•˜ë˜ ì¤‘:
%R
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-À߸øµÈ ¿äû
+ìž˜ëª»ëœ ìš”ì²
-HTTP ¿äû ¹æ¹ýÁß ´ÙÀ½°ú °°Àº ºÎºÐÀÌ À߸øµÉ ¼ö ÀÖ½À´Ï´Ù.
+HTTP ìš”ì² ë°©ë²•ì¤‘ 다ìŒê³¼ ê°™ì€ ë¶€ë¶„ì´ ìž˜ëª»ë 수 있습니다.
-- Request method°¡ À߸øµÇ¾ú°Å³ª ºüÁ® ÀÖ´Ù.
-
- URLÀÌ ºüÁ® ÀÖ´Ù.
-
- HTTP Identifier (HTTP/1.0)ÀÌ ºüÁ® ÀÖ´Ù.
-
- Request°¡ ³Ê¹« Å©´Ù.
-
- POST³ª PUT ¿äûÀÏ °æ¿ì Content-Length°¡ ºüÁ® ÀÖ´Ù.
-
- È£½ºÆ®³×ÀÓ¿¡ À߸ø µÈ ¹®ÀÚ°¡ ÀÖ´Ù; ¹ØÁÙÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù.
+
- Request methodê°€ 잘못ë˜ì—ˆê±°ë‚˜ ë¹ ì ¸ 있다.
+
- URLì´ ë¹ ì ¸ 있다.
+
- HTTP Identifier (HTTP/1.0)ì´ ë¹ ì ¸ 있다.
+
- Requestê°€ 너무 í¬ë‹¤.
+
- POST나 PUT ìš”ì²ì¼ 경우 Content-Lengthê°€ ë¹ ì ¸ 있다.
+
- í˜¸ìŠ¤íŠ¸ë„¤ìž„ì— ìž˜ëª» ëœ ë¬¸ìžê°€ 있다; ë°‘ì¤„ì€ í—ˆìš©ë˜ì§€ 않습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_INVALID_URL squid-3.1.0.4/errors/Korean/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Korean/ERR_INVALID_URL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_INVALID_URL 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-À߸øµÈ URL
+ìž˜ëª»ëœ URL
-URLÁß ´ÙÀ½°ú °°Àº ºÎºÐÀÌ À߸øµÉ ¼ö ÀÖ½À´Ï´Ù.
+URL중 다ìŒê³¼ ê°™ì€ ë¶€ë¶„ì´ ìž˜ëª»ë 수 있습니다.
-- Á¢¼Ó ÇÁ·ÎÅäÄÝÀÌ À߸øµÇ¾ú°Å³ª ºüÁ® ÀÖ´Ù. ('http://' ¿Í °°Àº ¹æ½ÄÀ¸·Î µÇ¾î ÀÖ¾î¾ß ÇÕ´Ï´Ù)
-
- È£½ºÆ®³×ÀÓÀÌ ºüÁ® ÀÖ´Ù.
-
- URL-Path¿¡ double-escapeÀÌ ÀÖ´Ù.
-
- È£½ºÆ®³×ÀÓ¿¡ À߸ø µÈ ¹®ÀÚ°¡ ÀÖ´Ù; ¹ØÁÙÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù.
+
- ì ‘ì† í”„ë¡œí† ì½œì´ ìž˜ëª»ë˜ì—ˆê±°ë‚˜ ë¹ ì ¸ 있다. ('http://' 와 ê°™ì€ ë°©ì‹ìœ¼ë¡œ ë˜ì–´ 있어야 합니다)
+
- í˜¸ìŠ¤íŠ¸ë„¤ìž„ì´ ë¹ ì ¸ 있다.
+
- URL-Pathì— double-escapeì´ ìžˆë‹¤.
+
- í˜¸ìŠ¤íŠ¸ë„¤ìž„ì— ìž˜ëª» ëœ ë¬¸ìžê°€ 있다; ë°‘ì¤„ì€ í—ˆìš©ë˜ì§€ 않습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Korean/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Korean/ERR_LIFETIME_EXP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_LIFETIME_EXP 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-Á¢¼Ó Çã¿ë ½Ã°£ÀÌ °æ°úµÇ¾ú½À´Ï´Ù.
+ì ‘ì† í—ˆìš© ì‹œê°„ì´ ê²½ê³¼ë˜ì—ˆìŠµë‹ˆë‹¤.
-ÃÖ´ë Á¢¼Ó Çã¿ë ½Ã°£ÀÌ °æ°úÇÏ¿© Squid·ÎºÎÅÍÀÇ ¿äûÀÌ ÁßÁöµÇ¾ú½À´Ï´Ù.
+최대 ì ‘ì† í—ˆìš© ì‹œê°„ì´ ê²½ê³¼í•˜ì—¬ Squidë¡œë¶€í„°ì˜ ìš”ì²ì´ 중지ë˜ì—ˆìŠµë‹ˆë‹¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_NO_RELAY squid-3.1.0.4/errors/Korean/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Korean/ERR_NO_RELAY 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_NO_RELAY 2009-01-23 18:37:27.000000000 +1300
@@ -1,25 +1,25 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-WAIS Relay°¡ ¾ø½À´Ï´Ù.
+WAIS Relay가 없습니다.
- ÀÌ Ä³½¬´Â WAIS Relay È£½ºÆ®°¡ ÁöÁ¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù.
- °ü¸®ÀÚ ¿¡°Ô ¿äûÇϽʽÿÀ.
+ ì´ ìºì‰¬ëŠ” WAIS Relay 호스트가 ì§€ì •ë˜ì–´ 있지 않습니다.
+ ê´€ë¦¬ìž ì—게 ìš”ì²í•˜ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Korean/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Korean/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:27.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-ij½¬¿¡ À¯È¿ÇÑ ¹®¼°¡ ¾ø°í
only-if-cached°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù.
+ìºì‰¬ì— ìœ íš¨í•œ 문서가 ì—†ê³ only-if-cachedê°€ ì§€ì •ë˜ì—ˆìŠµë‹ˆë‹¤.
-only-if-cached°¡ ÁöÁ¤µÇ¾î ¹®¼°¡ ¿äûµÇ¾ú½À´Ï´Ù.
-¿äûµÈ ¹®¼°¡ ij½¬¿¡ ¾ø°Å³ª, ȤÀº ÀçÈ®ÀÎÀ» ÇØ¾ß ÇÕ´Ï´Ù.
+only-if-cachedê°€ ì§€ì •ë˜ì–´ 문서가 ìš”ì²ë˜ì—ˆìŠµë‹ˆë‹¤.
+ìš”ì²ëœ 문서가 ìºì‰¬ì— 없거나, í˜¹ì€ ìž¬í™•ì¸ì„ 해야 합니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_READ_ERROR squid-3.1.0.4/errors/Korean/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Korean/ERR_READ_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_READ_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-½Ã½ºÅÛÀº ¾Æ·¡¿Í °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô°í:
+ì‹œìŠ¤í…œì€ ì•„ëž˜ì™€ ê°™ì€ ë©”ì‹œì§€ë¥¼ ë³´ë‚´ì™”ê³ :
%E
-µ¥ÀÌÅ͸¦ ³×Æ®¿÷À» ÅëÇØ Àоî¿À´Â µ¿¾È ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù.
-´Ù½Ã ¿äûÇϽʽÿÀ.
+ë°ì´í„°ë¥¼ 네트ì›ì„ 통해 ì½ì–´ì˜¤ëŠ” ë™ì•ˆ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤.
+다시 ìš”ì²í•˜ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Korean/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Korean/ERR_READ_TIMEOUT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_READ_TIMEOUT 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-Àб⠽ð£ ÃÊ°ú
+ì½ê¸° 시간 초과
-½Ã½ºÅÛÀº ¾Æ·¡¿Í °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô°í:
+ì‹œìŠ¤í…œì€ ì•„ëž˜ì™€ ê°™ì€ ë©”ì‹œì§€ë¥¼ ë³´ë‚´ì™”ê³ :
%E
-µ¥ÀÌÅ͸¦ ³×Æ®¿÷À» ÅëÇØ Àоî¿À·Á°í ±â´Ù¸®´ø Áß ½Ã°£ÀÌ °æ°úÇÏ¿´½À´Ï´Ù.
-³×Æ®¿÷ÀÌ È¥Àâ»óÅ¿¡ Àְųª ¼¹ö°¡ ¼ºñ½º ºÒ´É »óÅÂÀÏ ¼ö ÀÖ½À´Ï´Ù.
-´Ù½Ã ¿äûÇϽʽÿÀ.
+ë°ì´í„°ë¥¼ 네트ì›ì„ 통해 ì½ì–´ì˜¤ë ¤ê³ ê¸°ë‹¤ë¦¬ë˜ ì¤‘ ì‹œê°„ì´ ê²½ê³¼í•˜ì˜€ìŠµë‹ˆë‹¤.
+네트ì›ì´ 혼잡ìƒíƒœì— 있거나 서버가 서비스 불능 ìƒíƒœì¼ 수 있습니다.
+다시 ìš”ì²í•˜ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Korean/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Korean/ERR_SHUTTING_DOWN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_SHUTTING_DOWN 2009-01-23 18:37:27.000000000 +1300
@@ -1,21 +1,21 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-ÀÌ Ä³½¬´Â ¼ºñ½º¸¦ ¸¶Ä¡·Á°í Çϱ⠶§¹®¿¡
-ÇöÀç´Â ¿äûµÈ ¼ºñ½º¸¦ ¼öÇàÇÒ ¼ö ¾ø½À´Ï´Ù.
-Á¶±Ý ÈÄ ´Ù½Ã ½ÃµµÇØ ÁֽʽÿÀ.
+ì´ ìºì‰¬ëŠ” 서비스를 ë§ˆì¹˜ë ¤ê³ í•˜ê¸° 때문ì—
+현재는 ìš”ì²ëœ 서비스를 ìˆ˜í–‰í• ìˆ˜ 없습니다.
+조금 후 다시 ì‹œë„í•´ 주ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Korean/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Korean/ERR_SOCKET_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_SOCKET_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,30 +1,30 @@
-
-¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-¿¡·¯
-¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+ì—러
+ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-¼ÒÄÏ »ý¼º ½ÇÆÐ
+소켓 ìƒì„± 실패
-½Ã½ºÅÛÀº ¾Æ·¡¿Í °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô½À´Ï´Ù:
+ì‹œìŠ¤í…œì€ ì•„ëž˜ì™€ ê°™ì€ ë©”ì‹œì§€ë¥¼ 보내왔습니다:
%E
-Squid°¡ TCP ¼ÒÄÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.
-½ÉÇÑ ·Îµå·Î ÀÎÇÑ °á°úÀÏ ¼ö ÀÖ½À´Ï´Ù.
-´Ù½Ã ½ÃµµÇØ ÁֽʽÿÀ.
+Squidê°€ TCP ì†Œì¼“ì„ ìƒì„±í• 수 없습니다.
+심한 로드로 ì¸í•œ ê²°ê³¼ì¼ ìˆ˜ 있습니다.
+다시 ì‹œë„í•´ 주ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_UNSUP_REQ squid-3.1.0.4/errors/Korean/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Korean/ERR_UNSUP_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_UNSUP_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-Áö¿øµÇÁö ¾Ê´Â Request Method¿Í ÇÁ·ÎÅäÄÝÀÔ´Ï´Ù.
+지ì›ë˜ì§€ 않는 Request Method와 í”„ë¡œí† ì½œìž…ë‹ˆë‹¤.
-Squid´Â ¸ðµç Á¢¼Ó ÇÁ·ÎÅäÄÝ¿¡ ´ëÇÑ request method¸¦
-Áö¿øÇÏÁö ¾Ê½À´Ï´Ù. ÇÑ°¡Áö ¿¹·Î, Gopher¿¡¼ POST
-request¸¦ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù.
+Squid는 ëª¨ë“ ì ‘ì† í”„ë¡œí† ì½œì— ëŒ€í•œ request method를
+지ì›í•˜ì§€ 않습니다. 한가지 예로, Gopherì—ì„œ POST
+request를 ì‚¬ìš©í• ìˆ˜ 없습니다.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_URN_RESOLVE squid-3.1.0.4/errors/Korean/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Korean/ERR_URN_RESOLVE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_URN_RESOLVE 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URNÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URNì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-URNÀ» ó¸®ÇÒ ¼ö ¾ø½À´Ï´Ù.
+URNì„ ì²˜ë¦¬í• ìˆ˜ 없습니다.
-%TÀÇ URN¿¡ ´ëÇØ ³Ê¹« ¸¹Àº °ÍÀ» ±â´ëÇÏÁö ¸¶¼¼¿ä. :)
+%Tì˜ URNì— ëŒ€í•´ 너무 ë§Žì€ ê²ƒì„ ê¸°ëŒ€í•˜ì§€ 마세요. :)
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_WRITE_ERROR squid-3.1.0.4/errors/Korean/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Korean/ERR_WRITE_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_WRITE_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-½Ã½ºÅÛÀº ¾Æ·¡¿Í °°Àº ¸Þ½ÃÁö¸¦ º¸³»¿Ô°í:
+ì‹œìŠ¤í…œì€ ì•„ëž˜ì™€ ê°™ì€ ë©”ì‹œì§€ë¥¼ ë³´ë‚´ì™”ê³ :
%E
-³×Æ®¿÷À» ÅëÇؼ µ¥ÀÌÅ͸¦ ¾²´ø Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù.
-´Ù½Ã ½ÃµµÇØ ÁֽʽÿÀ.
+네트ì›ì„ 통해서 ë°ì´í„°ë¥¼ ì“°ë˜ ì¤‘ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤.
+다시 ì‹œë„í•´ 주ì‹ì‹œì˜¤.
diff -u -r -N squid-3.1.0.3/errors/Korean/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Korean/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Korean/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Korean/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿¡·¯: ¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
+
ì—러: ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-
¿¡·¯
-
¿äûµÈ URLÀ» °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù.
+
ì—러
+
ìš”ì²ëœ URLì„ ê°€ì ¸ì˜¬ 수 없습니다.
-´ÙÀ½ URLÀ» ó¸® ÇÏ´ø Áß:
+ë‹¤ìŒ URLì„ ì²˜ë¦¬ í•˜ë˜ ì¤‘:
%U
-¾Æ·¡¿Í °°Àº ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù:
+아래와 ê°™ì€ ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤:
-
-Å©±â°¡ 0ÀÎ ÀÀ´äÀÌ µ¹¾Æ¿Ô½À´Ï´Ù.
+í¬ê¸°ê°€ 0ì¸ ì‘ë‹µì´ ëŒì•„왔습니다.
-Squid´Â ÀÌ ¿äûÀ¸·Î ºÎÅÍ ¾Æ¹«·± µ¥ÀÌÅ͵µ ¹ÞÁö ¸øÇß½À´Ï´Ù.
+Squid는 ì´ ìš”ì²ìœ¼ë¡œ 부터 아무런 ë°ì´í„°ë„ 받지 못했습니다.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Lithuanian/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Lithuanian/ERR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Priëjimas draudþiamas.
+Priėjimas draudžiamas.
-Priëjimo kontrolës konfigûracija ðiuo metu neleidþia atsiøsti jûsø
+Priėjimo kontrolės konfigūracija šiuo metu neleidžia atsiųsti jūsų
nurodyto puslapio. Jei manote, kad tai yra neteisinga, galite susisiekti
-su jûsø Interneto paslaugø tiekëju.
+su jūsų Interneto paslaugų tiekėju.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,34 +1,34 @@
-
-
KLAIDA: Priëjimas prie keðo uþdraustas
+
+
KLAIDA: Priėjimas prie kešo uždraustas
KLAIDA
-
Priëjimas prie keðo uþdraustas
+
Priėjimas prie kešo uždraustas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Priëjimas prie keðo uþdraustas.
+Priėjimas prie kešo uždraustas.
-
Atsipraðome, bet jûs ðiuo metu negalite vykdyti uþklausos:
+
Atsiprašome, bet jūs šiuo metu negalite vykdyti užklausos:
%U
-per ðá serverá, kol jûs neprisistatysite.
+per šį serverį, kol jūs neprisistatysite.
Jums reikia Netscape v2.0 ar naujesnio, arba Microsoft Internet
-Explorer 3.0 ar naujesnio, arba kitos HTTP/1.1 suprantanèios perþiûros
-programos. Praðome susisiekti su proxy
+Explorer 3.0 ar naujesnio, arba kitos HTTP/1.1 suprantanÄios peržiÅ«ros
+programos. Prašome susisiekti su proxy
administratoriumi, jei jums kils sunkumai prisistatant arba
-pakeisti savo slaptaþodá.
+pakeisti savo slaptažodį.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,36 +1,36 @@
-
-
KLAIDA: Keðo menedþerio priëjimas uþdraustas
+
+
KLAIDA: Kešo menedžerio priėjimas uždraustas
KLAIDA
-
Keðo menedþerio priëjimas uþdraustas
+
Kešo menedžerio priėjimas uždraustas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Keðo menedþerio priëjimas uþdraustas.
+Kešo menedžerio priėjimas uždraustas.
-
Atsipraðome, bet jûs negalite vykdyti uþklausos:
+
Atsiprašome, bet jūs negalite vykdyti užklausos:
%U
-ðiam keðo menedþeriui, kol jûs neprisistatysite.
+šiam kešo menedžeriui, kol jūs neprisistatysite.
Jums reikia Netscape v2.0 ar naujesnio, arba Microsoft Internet
-Explorer 3.0 ar naujesnio, arba kitos HTTP/1.1 suprantanèios perþiûros
-programos. Praðome susisiekti su administratoriumi,
-jei jums iðkilo problemos prisistatant arba, jei jûs esate
-administratorius, perskaitykite Squid documentacijà dël keðo menedþerio
-interfeiso ir patikrinkite keðo þurnalà dël detalesniø praneðimø apie
+Explorer 3.0 ar naujesnio, arba kitos HTTP/1.1 suprantanÄios peržiÅ«ros
+programos. Prašome susisiekti su administratoriumi,
+jei jums iškilo problemos prisistatant arba, jei jūs esate
+administratorius, perskaitykite Squid documentaciją dėl kešo menedžerio
+interfeiso ir patikrinkite kešo žurnalą dėl detalesnių pranešimų apie
klaidas.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Lithuanian/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Lithuanian/ERR_CANNOT_FORWARD 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_CANNOT_FORWARD 2009-01-23 18:37:27.000000000 +1300
@@ -1,29 +1,29 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Ðiuo metu negaliu persiøsti uþklausos.
+Šiuo metu negaliu persiųsti užklausos.
-Uþklausa negali bûti persiøsta á pagrindiná serverá arba kurá nors
-pagalbiná proxy serverá. Pagrindinës tokios klaidos prieþastys yra ðios:
+Užklausa negali būti persiųsta į pagrindinį serverį arba kurį nors
+pagalbinį proxy serverį. Pagrindinės tokios klaidos priežastys yra šios:
-- Proxy administratorius neleidþia serveriui kurti tiesioginiø
- susijungimø su serveriais, ir
-
- Visi pagalbiniai proxy serveriai ðiuo metu yra nepasiekiami.
+
- Proxy administratorius neleidžia serveriui kurti tiesioginių
+ susijungimų su serveriais, ir
+
- Visi pagalbiniai proxy serveriai Å¡iuo metu yra nepasiekiami.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Lithuanian/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Lithuanian/ERR_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_CONNECT_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,28 +1,28 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Ryðys neveikia
+Ryšys neveikia
-Sistema atsakë:
+Sistema atsakÄ—:
%E
Nurodytas serveris arba tinklas yra atjungtas.
-Pabandykite vykdyti uþklausà vëliau.
+Pabandykite vykdyti užklausą vėliau.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_DNS_FAIL squid-3.1.0.4/errors/Lithuanian/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Lithuanian/ERR_DNS_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_DNS_FAIL 2009-01-23 18:37:27.000000000 +1300
@@ -1,32 +1,32 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Neámanoma nustatyti %H serverio IP adreso
+Neįmanoma nustatyti %H serverio IP adreso
-DNS serveris atsakë:
+DNS serveris atsakÄ—:
%z
-Tai reiðkia, kad:
+Tai reiškia, kad:
- Neámanoma aptikti serverio nurodytu adresu.
- Patikrinkite, ar teisingai ávedëte adresà.
+ Neįmanoma aptikti serverio nurodytu adresu.
+ Patikrinkite, ar teisingai įvedėte adresą.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Lithuanian/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Lithuanian/ERR_FORWARDING_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FORWARDING_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Ðis keðas negali perkelti jûsø uþklausos, kadangi ji bando sukurti
-sibling tipo ryðius. Gal bût klientas %i yra keðas, kuris klaidingai
-sukonfigûruotas.
+Šis kešas negali perkelti jūsų užklausos, kadangi ji bando sukurti
+sibling tipo ryšius. Gal būt klientas %i yra kešas, kuris klaidingai
+sukonfigūruotas.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_DISABLED squid-3.1.0.4/errors/Lithuanian/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_DISABLED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_DISABLED 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Ðis proxy serveris nepalaiko FTP.
+Å is proxy serveris nepalaiko FTP.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_FAILURE squid-3.1.0.4/errors/Lithuanian/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,19 +1,19 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Ávyko FTP protokolo klaida
-bandant atsiøsti puslapá:
+Įvyko FTP protokolo klaida
+bandant atsiųsti puslapį:
%U
-Squid nusiuntë ðià FTP komandà:
+Squid nusiuntÄ— Å¡iÄ… FTP komandÄ…:
%f
-ir gavo ðá atsakymà:
+ir gavo šį atsakymą:
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Lithuanian/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_FORBIDDEN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_FORBIDDEN 2009-01-23 18:37:27.000000000 +1300
@@ -1,18 +1,18 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Nepavyko FTP prisistatymas bandant atsiøsti puslapá:
+Nepavyko FTP prisistatymas bandant atsiųsti puslapį:
%U
-Squid nusiuntë ðià FTP komandà:
+Squid nusiuntÄ— Å¡iÄ… FTP komandÄ…:
%f
-ir gavo ðá atsakymà:
+ir gavo šį atsakymą:
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Lithuanian/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_NOT_FOUND 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_NOT_FOUND 2009-01-23 18:37:27.000000000 +1300
@@ -1,22 +1,22 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Nepavyko atsiøsti puslapio:
+Nepavyko atsiųsti puslapio:
%U
-Squid nusiuntë ðià FTP komandà:
+Squid nusiuntÄ— Å¡iÄ… FTP komandÄ…:
%f
-ir gavo ðá atsakymà:
+ir gavo šį atsakymą:
%F
%g
-Tai gali bûti sàlygota FTP adreso su pilnu keliu (kuris neatitinka
-RFC 1738 standarto). Jei taip atsitiko, tada duomenys gali bûti
+Tai gali būti sąlygota FTP adreso su pilnu keliu (kuris neatitinka
+RFC 1738 standarto). Jei taip atsitiko, tada duomenys gali būti
rasti %B adresu.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_CREATED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_CREATED 2009-01-23 18:37:27.000000000 +1300
@@ -1,9 +1,9 @@
-
-
FTP PUT operacija buvo sëkminga: Failas sukurtas
+
+
FTP PUT operacija buvo sÄ—kminga: Failas sukurtas
-
Operacija buvo sëkminga
+
Operacija buvo sÄ—kminga
Failas sukurtas
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,5 +1,5 @@
-
+
KLAIDA: FTP uploadas nepavyko
@@ -7,20 +7,20 @@
FTP PUT/uploadas nepavyko
-Bandydamas pakrauti dokumentà:
+Bandydamas pakrauti dokumentÄ…:
%U
-Squid nusiuntë ðià FTP komandà:
+Squid nusiuntÄ— Å¡iÄ… FTP komandÄ…:
%f
-ir gavo toká atsakymà:
+ir gavo tokį atsakymą:
%F
-Tai reiðkia:
+Tai reiškia:
-Patikrinkite kelià, teises, disko talpà ir pabandykite dar kartà.
+Patikrinkite keliÄ…, teises, disko talpÄ… ir pabandykite dar kartÄ….
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,9 +1,9 @@
-
-
FTP PUT operacija sëkminga: Failas atnaujintas
+
+
FTP PUT operacija sÄ—kminga: Failas atnaujintas
-
Operacija sëkminga
+
Operacija sÄ—kminga
Failas atnaujintas
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Lithuanian/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Lithuanian/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:27.000000000 +1300
@@ -1,18 +1,18 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-FTP serveris buvo uþimtas bandant atsiøsti puslapá:
+FTP serveris buvo užimtas bandant atsiųsti puslapį:
%U
-Squid nusiuntë ðià FTP komandà:
+Squid nusiuntÄ— Å¡iÄ… FTP komandÄ…:
%f
-ir gavo ðá atsakymà:
+ir gavo šį atsakymą:
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_REQ squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,33 +1,33 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant ávykdyti uþklausà:
+Bandant įvykdyti užklausą:
%R
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Neteisinga uþklausa
+Neteisinga užklausa
-Dalis HTTP uþklausos yra klaidinga. Galimos problemos:
+Dalis HTTP užklausos yra klaidinga. Galimos problemos:
-- 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
+
- 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
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_RESP squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_RESP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_RESP 2009-01-23 18:37:27.000000000 +1300
@@ -1,18 +1,18 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant ávykdyti uþklausà:
+Bandant įvykdyti užklausą:
%R
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Ið serverio gautas nesuprantamas HTTP atsakymas arba jis buvo klaidingai
-suformuotas. Susisiekite su serverio operatoriumi. Jûsø proxy serverio
-administratorius gali suteikti jums daugiau informacijos apie ðià problemà.
+IÅ¡ serverio gautas nesuprantamas HTTP atsakymas arba jis buvo klaidingai
+suformuotas. Susisiekite su serverio operatoriumi. Jūsų proxy serverio
+administratorius gali suteikti jums daugiau informacijos apie Å¡iÄ… problemÄ….
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_URL squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Lithuanian/ERR_INVALID_URL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_INVALID_URL 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Kaþkuri adreso dalis yra klaidinga. Galimos ðios problemos:
+Kažkuri adreso dalis yra klaidinga. Galimos šios problemos:
-- Trûksta arba klaidingas protokolas (turetø bûti `http://' ar panaðus)
-
- Trûksta serverio vardo
+
- Trūksta arba klaidingas protokolas (turetų būti `http://' ar panašus)
+
- Trūksta serverio vardo
- Neleistinas double-escape kodas adrese
- Neleistinas simbolis serverio varde; pabraukimo simboliai yra neleistini
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Lithuanian/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Lithuanian/ERR_LIFETIME_EXP 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_LIFETIME_EXP 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Ryðio trukmës laiko pabaiga
+Ryšio trukmės laiko pabaiga
-Squid nutraukë uþklausà, kadangi ji virðijo maksimalià
-ryðio trukmës reikðmæ.
+Squid nutraukė užklausą, kadangi ji viršijo maksimalią
+ryšio trukmės reikšmę.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_NO_RELAY squid-3.1.0.4/errors/Lithuanian/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Lithuanian/ERR_NO_RELAY 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_NO_RELAY 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Nëra Wais Relay
+NÄ—ra Wais Relay
-WAIS Relay serveris yra nenurodytas ðiame proxy serveryje!
-Ðauk ant (tik ne á) admino.
+WAIS Relay serveris yra nenurodytas Å¡iame proxy serveryje!
+Šauk ant (tik ne į) admino.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Jûs davëte uþklausà su only-if-cached proxy kontrolës
+Jūs davėte užklausą su only-if-cached proxy kontrolės
komanda. Dokumentas nerastas serveryje, arba jis pareikalavo
-patvirtinimo uþdrausto only-if-cached komandos.
+patvirtinimo uždrausto only-if-cached komandos.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_READ_ERROR squid-3.1.0.4/errors/Lithuanian/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Lithuanian/ERR_READ_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_READ_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Sistema atsakë:
+Sistema atsakÄ—:
%E
-Ávyko klaida skaitant duomenis tinkle.
-Praðome pakartoti savo uþklausà.
+Įvyko klaida skaitant duomenis tinkle.
+Prašome pakartoti savo užklausą.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Lithuanian/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Lithuanian/ERR_READ_TIMEOUT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_READ_TIMEOUT 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Sistema atsakë:
+Sistema atsakÄ—:
%E
-Klaida ávyko laukiant duomenø atsiuntimo ið tinklo. Tinklas arba serveris
-gali bûti atjungtas arba perkrautas. Praðome pakartoti uþklausà.
+Klaida įvyko laukiant duomenų atsiuntimo iš tinklo. Tinklas arba serveris
+gali būti atjungtas arba perkrautas. Prašome pakartoti užklausą.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Lithuanian/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Lithuanian/ERR_SHUTTING_DOWN 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_SHUTTING_DOWN 2009-01-23 18:37:27.000000000 +1300
@@ -1,17 +1,17 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Ðiuo metu keðas yra iðjungiamas ir negali jûsø aptarnauti.
-Praðome pakartoti uþklausà vëliau.
+Šiuo metu kešas yra išjungiamas ir negali jūsų aptarnauti.
+Prašome pakartoti užklausą vėliau.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Lithuanian/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Lithuanian/ERR_SOCKET_FAILURE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_SOCKET_FAILURE 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Sistema atsakë:
+Sistema atsakÄ—:
%E
-Squid negalëjo sukurti TCP socket, greièiausiai dël per didelio apkrovimo.
-Praðome pakartoti savo uþklausà.
+Squid negalÄ—jo sukurti TCP socket, greiÄiausiai dÄ—l per didelio apkrovimo.
+Prašome pakartoti savo užklausą.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_TOO_BIG squid-3.1.0.4/errors/Lithuanian/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Lithuanian/ERR_TOO_BIG 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_TOO_BIG 2009-01-23 18:37:27.000000000 +1300
@@ -1,27 +1,27 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Uþklausa arba atsakymas yra per dideli.
+Užklausa arba atsakymas yra per dideli.
-Jei jûs vykdote POST arba PUT uþklausà, jûsø uþklausos dydis
-(tai, kà jûs bandote nusiøsti) yra per didelis. Jei jûs vykdote
-GET uþklausà, atsakymo dydis (tai, kà jûs bandote atsisiøsti)
-yra per didelis. Ðie apribojimai yra uþdëti jûsø Interneto
-tiekëjo. Praðome kreiptis á savo administratoriø arba Interneto
-tiekëjà, jei manote, kad tai neteisinga.
+Jei jūs vykdote POST arba PUT užklausą, jūsų užklausos dydis
+(tai, ką jūs bandote nusiųsti) yra per didelis. Jei jūs vykdote
+GET užklausą, atsakymo dydis (tai, ką jūs bandote atsisiųsti)
+yra per didelis. Šie apribojimai yra uždėti jūsų Interneto
+tiekėjo. Prašome kreiptis į savo administratorių arba Interneto
+tiekÄ—jÄ…, jei manote, kad tai neteisinga.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_UNSUP_REQ squid-3.1.0.4/errors/Lithuanian/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Lithuanian/ERR_UNSUP_REQ 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_UNSUP_REQ 2009-01-23 18:37:27.000000000 +1300
@@ -1,24 +1,24 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Nepalaikomas uþklausos metodas ir protokolas
+Nepalaikomas užklausos metodas ir protokolas
-Squid palaiko ne visus uþklausos metodus daliai protokolø.
-Pavyzdþiui, jûs negalite vykdyti POST Gopher tipo uþklausoje.
+Squid palaiko ne visus užklausos metodus daliai protokolų.
+Pavyzdžiui, jūs negalite vykdyti POST Gopher tipo užklausoje.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_URN_RESOLVE squid-3.1.0.4/errors/Lithuanian/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Lithuanian/ERR_URN_RESOLVE 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_URN_RESOLVE 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Nurodytas URN negali bûti atsiøstas
+
+
KLAIDA: Nurodytas URN negali būti atsiųstas
KLAIDA
-
puslapis nurodytam URN negali bûti atsiøstas
+
puslapis nurodytam URN negali būti atsiųstas
-Bandant atsiøsti URN:
+Bandant atsiųsti URN:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Mielieji, siûlau daug nesitikëti ið URNø %T :)
+Mielieji, siūlau daug nesitikėti iš URNų %T :)
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_WRITE_ERROR squid-3.1.0.4/errors/Lithuanian/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Lithuanian/ERR_WRITE_ERROR 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_WRITE_ERROR 2009-01-23 18:37:27.000000000 +1300
@@ -1,28 +1,28 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-
-Raðymo klaida
+Rašymo klaida
-Sistema atsakë:
+Sistema atsakÄ—:
%E
-Ávyko klaida bandant raðyti tinkle.
-Praðome pakartoti savo uþklausà.
+Įvyko klaida bandant rašyti tinkle.
+Prašome pakartoti savo užklausą.
diff -u -r -N squid-3.1.0.3/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:27.000000000 +1300
@@ -1,16 +1,16 @@
-
-
KLAIDA: Puslapis nurodytu adresu negali bûti atsiøstas
+
+
KLAIDA: Puslapis nurodytu adresu negali būti atsiųstas
KLAIDA
-
Puslapis nurodytu adresu negali bûti atsiøstas
+
Puslapis nurodytu adresu negali būti atsiųstas
-Bandant atsiøsti puslapá:
+Bandant atsiųsti puslapį:
%U
-Gautas klaidos praneðimas:
+Gautas klaidos pranešimas:
-Squid negavo jokiø duomenø ðiai uþklausai.
+Squid negavo jokių duomenų šiai užklausai.
diff -u -r -N squid-3.1.0.3/errors/Makefile.am squid-3.1.0.4/errors/Makefile.am
--- squid-3.1.0.3/errors/Makefile.am 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Makefile.am 2009-01-23 18:37:27.000000000 +1300
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
#
-# $Id: Makefile.am,v 1.16 2008/02/24 12:10:30 hno Exp $
+# $Id$
#
errordir = $(datadir)/errors
@@ -14,6 +14,7 @@
# List of automated translations possible:
TRANSLATIONS = \
+ az \
bg \
ca \
cs \
@@ -21,39 +22,36 @@
de \
en en-au en-gb en-nz en-us \
es \
+ et \
+ fi \
fr \
+ hy \
id \
it \
ja \
nl \
pt-br \
+ ro \
ru \
+ sr \
sv \
+ tr \
uk \
zh-cn
# Legacy language contributions...
#
LANGUAGES = \
- Armenian \
- Azerbaijani \
- Czech \
- Estonian \
- Finnish \
Greek \
Hebrew \
Hungarian \
- Japanese \
Korean \
Lithuanian \
Polish \
Portuguese \
- Romanian \
- Serbian \
Simplify_Chinese \
Slovak \
- Traditional_Chinese \
- Turkish
+ Traditional_Chinese
install-data-local:
@for l in $(LANGUAGES); do \
@@ -141,7 +139,7 @@
|| exit 1; \
fi; \
done; \
- cp $(srcdir)/errorpage.css $(distdir)/errorpage.css
+ cp -p $(srcdir)/errorpage.css $(distdir)/errorpage.css
translate:
@ if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no"; then \
diff -u -r -N squid-3.1.0.3/errors/Makefile.in squid-3.1.0.4/errors/Makefile.in
--- squid-3.1.0.3/errors/Makefile.in 2008-12-05 16:09:47.000000000 +1300
+++ squid-3.1.0.4/errors/Makefile.in 2009-01-23 18:37:50.000000000 +1300
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.16 2008/02/24 12:10:30 hno Exp $
+# $Id$
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -288,6 +288,7 @@
# List of automated translations possible:
TRANSLATIONS = \
+ az \
bg \
ca \
cs \
@@ -295,14 +296,20 @@
de \
en en-au en-gb en-nz en-us \
es \
+ et \
+ fi \
fr \
+ hy \
id \
it \
ja \
nl \
pt-br \
+ ro \
ru \
+ sr \
sv \
+ tr \
uk \
zh-cn
@@ -310,25 +317,16 @@
# Legacy language contributions...
#
LANGUAGES = \
- Armenian \
- Azerbaijani \
- Czech \
- Estonian \
- Finnish \
Greek \
Hebrew \
Hungarian \
- Japanese \
Korean \
Lithuanian \
Polish \
Portuguese \
- Romanian \
- Serbian \
Simplify_Chinese \
Slovak \
- Traditional_Chinese \
- Turkish
+ Traditional_Chinese
all: all-am
@@ -580,7 +578,7 @@
|| exit 1; \
fi; \
done; \
- cp $(srcdir)/errorpage.css $(distdir)/errorpage.css
+ cp -p $(srcdir)/errorpage.css $(distdir)/errorpage.css
translate:
@ if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no"; then \
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_ACCESS_DENIED squid-3.1.0.4/errors/nl/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/nl/ERR_ACCESS_DENIED 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_ACCESS_DENIED 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Toegang niet toegestaan.
U heeft geen toegang tot de URL die u probeerde op te vragen van deze server. Neem contact op met uw service provider als u denkt dat dit niet klopt.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Toegang Geweigerd.
U heeft geen toegang tot de URL die u probeerde op te vragen van deze server. Neem contact op met uw service provider als u denkt dat dit niet klopt.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/nl/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/nl/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: Cache Access Denied
ERROR
Cache Toegang niet toegestaan.
The following error was encountered while trying to retrieve the URL: %U
Cache toegang niet toegestaan.
Sorry, het is u niet toegestaan om %U van deze cache op te vragen totdat u zich geidentificeerd hebt.
Neem contact op met de cache beheerder als u problemen heeft om uzelf te identificeren of verander hier uw standaard wachtwoord.
\ No newline at end of file
+
FOUT: Cache Access Denied
ERROR
Cache Toegang Geweigerd.
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Cache toegang niet toegestaan.
Sorry, het is u niet toegestaan om %U van deze cache op te vragen totdat u zich geidentificeerd hebt.
Neem contact op met de cache beheerder als u problemen heeft met authenticatie of verander hier uw standaard wachtwoord.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: Cache Manager Access Denied
ERROR
Cache Manager Toegang niet toegestaan.
The following error was encountered while trying to retrieve the URL: %U
Cache Manager toegang niet toegestaan.
Sorry, you are not currently allowed to request %U from this cache manager until you have authenticated yourself.
Neem contact op met de cache beheerder als u problemen heeft om uzelf te identificeren. Als U de beheerder bent, lees dan de Squid documentatie over de cache manager interface en lees de cache log voor meer gedetailleerde foutmeldingen.
\ No newline at end of file
+
FOUT: Cache Manager Access Denied
ERROR
Cache Manager Toegang Geweigerd.
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Cache Manager toegang niet toegestaan.
Sorry, het is u momenteel niet toegestaan om %U op te vragen via deze cache manager totdat u zichzelf hebt geauthenticeerd.
Neem contact op met de cache beheerder als u problemen heeft met authenticatie. Als U de beheerder bent, lees dan de Squid documentatie over de cache manager interface en lees de cache log voor meer gedetailleerde foutmeldingen.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/nl/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/nl/ERR_CANNOT_FORWARD 2008-12-05 16:12:40.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_CANNOT_FORWARD 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Momenteel niet in staat dit verzoek door te sturen.
Dit verzoek kon niet worden doorgestuurd naar de oorspronkelijke server of een van de parent caches. De meest waarschijnlijke reden voor deze fout is dat de cache beheerder het deze cache niet toestaat met de oorspronkelijke server te praten, en alle ingestelde parent caches op dit moment onbereikbaar zijn.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Momenteel niet in staat dit verzoek door te sturen.
Dit verzoek kon niet worden doorgestuurd naar de oorspronkelijke server of een van de parent caches. De meest waarschijnlijke reden voor deze fout is dat de cache beheerder het deze cache niet toestaat met de oorspronkelijke server te praten, en alle ingestelde parent caches op dit moment onbereikbaar zijn.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_CONNECT_FAIL squid-3.1.0.4/errors/nl/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/nl/ERR_CONNECT_FAIL 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_CONNECT_FAIL 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Connection to %I failed.
Het systeem gaf terug: %E
De door u gezochte server of het netwerk is onbereikbaar. Probeer het verzoek opnieuw.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Verbinding met %I mislukt.
Het systeem gaf als antwoord: %E
De server of het netwerk dat u probeert te benaderen is onbereikbaar. Probeer het opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_DNS_FAIL squid-3.1.0.4/errors/nl/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/nl/ERR_DNS_FAIL 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_DNS_FAIL 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Niet in staat om het IP adres te bepalen van de hostnaam %H
De DNS server gaf als antwoord:
%z
Dit betekent dat de cache niet in staat was om de hostnaam uit de URL te herleiden. Controleer of de naam klopt.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Niet in staat om het IP adres te bepalen van server %H
De DNS server heeft geantwoord:
%z
Dit betekent dat de cache niet in staat was om de hostnaam uit de URL te herleiden. Controleer of de naam klopt.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_ESI squid-3.1.0.4/errors/nl/ERR_ESI
--- squid-3.1.0.3/errors/nl/ERR_ESI 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_ESI 2009-01-23 18:40:45.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESI Processing failed.
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
+
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
De volgende fout is opgetreden tijdens het ophalen van URL: %U
ESI processing mislukt.
De ESI processor heeft geantwoord:
%Z
Dit betekent dat de vervanger niet in staat was om de ESI template te bewerken. Geef deze fout door aan de webmaster, asltublieft.
Uw cachebeheerder is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/nl/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/nl/ERR_FORWARDING_DENIED 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FORWARDING_DENIED 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Doorsturen niet toegestaan.
Deze cache zal uw verzoek niet doorsturen, omdat het een sibling relatie tracht te bewerkstelligen. Wellicht dat de client op %i een fout ingestelde cache is.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Doorsturen niet toegestaan.
Deze cache zal uw verzoek niet doorsturen, omdat het een sibling relatie tracht te bewerkstelligen. Wellicht dat de client op %i een fout ingestelde cache is.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_DISABLED squid-3.1.0.4/errors/nl/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/nl/ERR_FTP_DISABLED 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_DISABLED 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTP is uitgeschakeld
Deze cache ondersteunt geen FTP.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
FTP is uitgeschakeld
Deze cache ondersteunt geen FTP.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_FAILURE squid-3.1.0.4/errors/nl/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/nl/ERR_FTP_FAILURE 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_FAILURE 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
Er is een FTP protocolfout voorgekomen tijdens het ophalen van de URL: %U
Squid stuurde de volgende FTP opdracht:
%f
The server responded with:
%F
%g
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
Er is een FTP protocolfout opgetreden tijdens het ophalen van de URL: %U
Squid heeft de volgende FTP opdracht verstuurd:
%f
De server antwoordde met:
%F
%g
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/nl/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/nl/ERR_FTP_FORBIDDEN 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_FORBIDDEN 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
De FTP authenticatie is mislukt tijdens het opvragen van de URL: %U
Squid stuurde de volgende FTP opdracht:
%f
The server responded with:
%F
%g
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
De FTP authenticatie is mislukt tijdens het openen van URL: %U
Squid heeft de volgende FTP opdracht verstuurd:
%f
De server antwoordde met:
%F
%g
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_LISTING squid-3.1.0.4/errors/nl/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/nl/ERR_FTP_LISTING 2008-12-05 16:12:41.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_LISTING 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FTP Directory: %U
\ No newline at end of file
+
FTP Map: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/nl/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/nl/ERR_FTP_NOT_FOUND 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_NOT_FOUND 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid stuurde de volgende FTP opdracht:
%f
The server responded with:
%F
%g
Dit kan veroorzaakt worden door een FTP URL met een absoluut pad (hetgeen niet in overeenstemming is met RFC 1738). Als dit de oorzaak is, dan kan het bestand gevonden worden op %B.
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
De volgende URL kon niet worden opgehaald: %U
Squid heeft de volgende FTP opdracht verstuurd:
%f
De server antwoordde met:
%F
%g
Dit kan veroorzaakt worden door een FTP URL met een absoluut pad (hetgeen niet in overeenstemming is met RFC 1738). Als dit de oorzaak is, dan kan het bestand gevonden worden op %B.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/nl/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/nl/ERR_FTP_PUT_CREATED 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_PUT_CREATED 2009-01-23 18:40:46.000000000 +1300
@@ -1 +1 @@
-
FTP PUT Succesvol: Bestand aangemaakt
Bewerking succesvol
Bestand aangemaakt
\ No newline at end of file
+
FTP PUT Succesvol: Bestand aangemaakt
Bewerking succesvol
Bestand aangemaakt
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/nl/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/nl/ERR_FTP_PUT_ERROR 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_PUT_ERROR 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: FTP upload failed
ERROR
FTP PUT/upload mislukt
While trying to PUT the following URL: %U
Squid stuurde de volgende FTP opdracht:
%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.
De beheerder van deze cache is %w.
\ No newline at end of file
+
FOUT: FTP upload failed
ERROR
FTP PUT/upload mislukt
Bij een poging om naar de volgende URL te schrijven: %U
Squid heeft de volgende FTP opdracht verstuurd:
%f
De server antwoordde met:
%F
Dit betekent dat de FTP server geen toegang of opslagcapaciteit heeft om het bestand op te slaan. Controleer het pad, de rechten en opslagcapaciteit en probeer het opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/nl/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/nl/ERR_FTP_PUT_MODIFIED 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_PUT_MODIFIED 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FTP PUT Succesvol: Bestand Vernieuwd
Bewerking succesvol
Bestand vernieuwd
\ No newline at end of file
+
FTP PUT Succesvol: Bestand Vernieuwd
Bewerking succesvol
Bestand vernieuwd
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/nl/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/nl/ERR_FTP_UNAVAILABLE 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_FTP_UNAVAILABLE 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
De FTP server was te druk bezet tijdens het opvragen van de URL: %U
Squid stuurde de volgende FTP opdracht:
%f
The server responded with:
%F
%g
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
De FTP server was overbelast tijdens het opvragen van de URL: %U
Squid heeft de volgende FTP opdracht verstuurd:
%f
De server antwoordde met:
%F
%g
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_ICAP_FAILURE squid-3.1.0.4/errors/nl/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/nl/ERR_ICAP_FAILURE 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_ICAP_FAILURE 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAP protocol error.
Het systeem gaf terug: %E
This means that some aspect of the ICAP communication failed.
Mogelijke problemen zijn:
\ No newline at end of file
+
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
De volgende fout is opgetreden tijdens het ophalen van URL: %U
ICAP protocol fout.
Het systeem gaf als antwoord: %E
Dit betekent dat een onderdeel van de ICAP communicatie is mislukt.
Mogelijke problemen zijn:
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_INVALID_REQ squid-3.1.0.4/errors/nl/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/nl/ERR_INVALID_REQ 2008-12-05 16:12:42.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_INVALID_REQ 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%R
Mogelijke problemen zijn:
Ontbrekende of onbekende verzoekmethode.
Ontbrekende URL.
Ontbrekende HTTP identificatie (HTTP/1.0).
Het verzoek is mogelijk 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.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_INVALID_RESP squid-3.1.0.4/errors/nl/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/nl/ERR_INVALID_RESP 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_INVALID_RESP 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
Invalid Response error was encountered while trying to process the request:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
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
Onverwachte reactie er is een fout opgetreden tijdens het uitvoeren van opdracht:
%R
Het ontvangen HTTP bericht is niet begrepen of beschadigd. Neem contact op met de beheerder van de website die u probeert te bereiken.
De cache beheerder kan u meer informatie verstrekken met betrekking tot de exacte reden van dit probleem.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_INVALID_URL squid-3.1.0.4/errors/nl/ERR_INVALID_URL
--- squid-3.1.0.3/errors/nl/ERR_INVALID_URL 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_INVALID_URL 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Ongeldige URL
Een gedeelte van de gevraagde URL is ongeldig.
Mogelijke problemen zijn:
Ontbrekend of onjuist toegangsprotocol (moet zijn http://
of vergelijkbaar)
Ontbrekende hostnaam
Ongeldige double-escape
in het URL pad
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Ongeldige URL
Een gedeelte van de gevraagde URL is ongeldig.
Mogelijke problemen zijn:
Ontbrekend of onjuist toegangsprotocol (moet zijn http://
of vergelijkbaar)
Ontbrekende hostnaam
Ongeldige dubbele escape
in het URL pad
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
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_LIFETIME_EXP squid-3.1.0.4/errors/nl/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/nl/ERR_LIFETIME_EXP 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_LIFETIME_EXP 2009-01-23 18:40:47.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
De levensduur van de verbindings is verstreken
Squid heeft het verzoek afgebroken omdat het de maximale verbindingslevensduur heeft overschreden.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
De levensduur van de verbindings is verstreken
Squid heeft het verzoek afgebroken omdat het de maximale verbindingslevensduur heeft overschreden.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_NO_RELAY squid-3.1.0.4/errors/nl/ERR_NO_RELAY
--- squid-3.1.0.3/errors/nl/ERR_NO_RELAY 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_NO_RELAY 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Geen WAIS Relay
Er is geen WAIS Relay host gedefinieerd voor deze Cache! Neem contact op met de cachebeheerder.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Geen WAIS Relay
Er is geen WAIS Relay host gedefinieerd voor deze Cache! Neem contact op met de cachebeheerder.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/nl/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/nl/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Een geldig document werd niet gevonden in de cache, en de only-if-cached
richtlijn was ingesteld.
U heeft een verzoek gedaan met een only-if-cached
cachebeheer richtlijn. Het document werd niet gevonden in de cache of er was een herbevestiging nodig die niet werd toegestaan door de only-if-cached
richtlijn.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Een geldig document werd niet gevonden in de cache, en de only-if-cached
richtlijn was ingesteld.
U heeft een verzoek gedaan met een only-if-cached
cachebeheer richtlijn. Het document werd niet gevonden in de cache of er was een herbevestiging nodig die niet werd toegestaan door de only-if-cached
richtlijn.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_READ_ERROR squid-3.1.0.4/errors/nl/ERR_READ_ERROR
--- squid-3.1.0.3/errors/nl/ERR_READ_ERROR 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_READ_ERROR 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Leesfout
Het systeem gaf terug: %E
Een foutwaarde kwam voor tijdens het lezen van data van het netwerk. Probeer uw verzoek opnieuw.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Leesfout
Het systeem gaf als antwoord: %E
Er is een fout opgetreden tijdens het lezen van data van het netwerk. Probeer het opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_READ_TIMEOUT squid-3.1.0.4/errors/nl/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/nl/ERR_READ_TIMEOUT 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_READ_TIMEOUT 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Lees Timeout
Het systeem gaf terug: %E
Een timeout kwam voor bij het lezen van data van het netwerk. Het netwerk of de server kan niet beschikbaar of overbelast zijn. Probeer uw verzoek opnieuw.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Lees Timeout
Het systeem gaf als antwoord: %E
Er is een timeout opgetreden tijdens het lezen van data van het netwerk. Het netwerk of de server zijn niet beschikbaar of overbelast. Probeer het opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/nl/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/nl/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:12:43.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Failed to establish a secure connection to %I
Het systeem gaf terug: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Het opzetten van een beveiligde verbinding naar %I is mislukt
Het systeem gaf als antwoord: %E
Deze proxy en de benaderde server hebben geen overeenstemming bereikt over de beveiling om uw aanvraag af te handelen. Het is mogelijk dat de benaderde server geen beveiligde verbindingen ondersteund of dat de proxy een te lage beveiliging heeft gedetecteerd.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/nl/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/nl/ERR_SHUTTING_DOWN 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_SHUTTING_DOWN 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Deze cache is bezig met herstarten en kan daarom momenteel niet aan uw verzoek voldoen. Probeer uw verzoek zo nog eens.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Deze cache is bezig met herstarten en kan daarom momenteel niet aan uw verzoek voldoen. Probeer het later opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/nl/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/nl/ERR_SOCKET_FAILURE 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_SOCKET_FAILURE 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Socket Fout
Het systeem gaf terug: %E
Squid is niet in staat een TCP socket aan te maken, waarschijnlijk als gevolg van een te hoge bezettingsgraad. Probeer uw verzoek opnieuw.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Socket Fout
Het systeem gaf als antwoord: %E
Squid is niet in staat een TCP socket aan te maken, waarschijnlijk als gevolg van overbelasting. Probeer uw verzoek opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_TOO_BIG squid-3.1.0.4/errors/nl/ERR_TOO_BIG
--- squid-3.1.0.3/errors/nl/ERR_TOO_BIG 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_TOO_BIG 2009-01-23 18:40:48.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
De aanvraag of het antwoord is te groot.
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.
Deze grootte-beperkingen zijn ingesteld door de beheerder van deze cache. Neem contact op met de beheerder van deze cache, wanneer U van mening bent dat deze beperking onjuist is.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
De aanvraag of het antwoord is te groot.
De POST of PUT opdracht die u heeft verstuurd is te groot.
Indien u een bestande probeerde te downloaden, dan was het bestand dat U probeert te ontvangen, te groot.
Deze grootte-beperkingen zijn ingesteld door de beheerder van deze cache. Neem contact op met de beheerder van deze cache, wanneer U van mening bent dat deze beperking onjuist is.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_UNSUP_REQ squid-3.1.0.4/errors/nl/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/nl/ERR_UNSUP_REQ 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_UNSUP_REQ 2009-01-23 18:40:49.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Niet ondersteunde verzoekmethode of protocol
Squid ondersteunt niet alle verzoekmethoden voor alle toegangsprotocollen. U kunt bijvoorbeeld geen Gopher verzoek POSTen.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Niet ondersteunde verzoekmethode of protocol
Squid ondersteunt niet alle verzoekmethoden voor alle toegangsprotocollen. U kunt bijvoorbeeld geen Gopher verzoek POSTen.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_URN_RESOLVE squid-3.1.0.4/errors/nl/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/nl/ERR_URN_RESOLVE 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_URN_RESOLVE 2009-01-23 18:40:49.000000000 +1300
@@ -1 +1 @@
-
FOUT: The requested URN not be retrieved
ERROR
De gevraagde URN kon niet worden opgehaald
The following error was encountered while trying to retrieve the URN: %U
Kan de URN niet herleiden
Hmmm, verwacht niet teveel van URNs op %T :)
De beheerder van deze cache is %w.
\ No newline at end of file
+
FOUT: The requested URN not be retrieved
ERROR
De gevraagde URN kon niet worden benaderd
De volgende fout is opgetreden tijdens het ophalen van URN: %U
Kan de URN niet herleiden
Hmmm, verwacht niet teveel van URNs op %T :)
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_WRITE_ERROR squid-3.1.0.4/errors/nl/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/nl/ERR_WRITE_ERROR 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_WRITE_ERROR 2009-01-23 18:40:49.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Schrijffout
Het systeem gaf terug: %E
Een foutwaarde kwam voor tijdens het schrijven naar het netwerk. Probeer uw verzoek opnieuw.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Schrijffout
Het systeem gaf als antwoord: %E
Er is een fout opgetreden tijdens het schrijven naar het netwerk. Probeer het opnieuw.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/nl/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/nl/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/nl/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:12:44.000000000 +1300
+++ squid-3.1.0.4/errors/nl/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:40:49.000000000 +1300
@@ -1 +1 @@
-
FOUT: De gevraagde URL kon niet worden opgehaald
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Leeg object antwoord
Squid ontving in het geheel geen data op dit verzoek.
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
De volgende fout is opgetreden tijdens het ophalen van URL: %U
Antwoord is leeg
Squid ontving in het geheel geen data op dit verzoek.
De beheerder van deze cache is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Polish/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Polish/ERR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,27 +1,27 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ pobrany
+
+
BÅÄ„D: Żądany URL nie może zostać pobrany
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ pobrany
+Żądany URL nie może zostać pobrany
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-Dostêp zabroniony.
+Dostęp zabroniony.
-Konfiguracja serwera wyklucza Twój dostêp do niego w chwili obecnej. Skontaktuj
-siê z Twoim providerem je¶li jest jest to nieprawid³owo¶æ.
+Konfiguracja serwera wyklucza Twój dostęp do niego w chwili obecnej. Skontaktuj
+się z Twoim providerem jeśli jest jest to nieprawidłowość.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Polish/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Polish/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,32 +1,32 @@
-
-
B£¡D: Dostêp do serwera cache zabroniony
+
+
BÅÄ„D: DostÄ™p do serwera cache zabroniony
-B£¡D
+BÅÄ„D
-Dostêp do serwera cache zabroniony
+Dostęp do serwera cache zabroniony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-Dostêp do serwera cache zabroniony.
+Dostęp do serwera cache zabroniony.
-Niestety, nie mo¿esz sprowadziæ:
+Niestety, nie możesz sprowadzić:
%U
-z tego serwera cache, dopóki nie dokona³e¶ autoryzacji.
+z tego serwera cache, dopóki nie dokonałeś autoryzacji.
-
Musisz u¿ywaæ Netscape 2.0 lub nowszej lub Microsoft Internet Explorer
-3.0 lub innej przegl±darki zgodnej z HTTP/1.1. Skontaktuj siê z administratorem
-serwera cache je¶li masz trudno¶ci z autoryzacj± lub zmieñ
+
Musisz używać Netscape 2.0 lub nowszej lub Microsoft Internet Explorer
+3.0 lub innej przeglÄ…darki zgodnej z HTTP/1.1. Skontaktuj siÄ™ z administratorem
+serwera cache jeśli masz trudności z autoryzacją lub zmień
haslo.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:27.000000000 +1300
@@ -1,34 +1,34 @@
-
-
B£¡D: Dostêp do cache managera zabroniony
+
+
BÅÄ„D: DostÄ™p do cache managera zabroniony
-B£¡D
+BÅÄ„D
-Dostêp do cache managera zabroniony
+Dostęp do cache managera zabroniony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
Dostep do cache managera zabroniony.
-Niestety, nie mo¿esz sprowadziæ:
+Niestety, nie możesz sprowadzić:
%U
-z tego cache managera, dopóki nie dokona³e¶ autoryzacji
+z tego cache managera, dopóki nie dokonałeś autoryzacji
-
Musisz u¿ywaæ Netscape 2.0 lub nowszej lub Microsoft Internet Explorer
-3.0, lub innej przegl±darki zgodnej z HTTP/1.1. Skontaktuj siê z administratorem
-serwera cache je¶li masz trudno¶ci z autoryzacj±, je¶li jeste¶
-administratorem, przeczytaj w dokumentacji Squida fragment dotycz±cy cache
-managera i sprawd¼ log serwera cache w poszukiwaniu bardziej szczegó³owych
-komunikatów o b³êdach.
+
Musisz używać Netscape 2.0 lub nowszej lub Microsoft Internet Explorer
+3.0, lub innej przeglÄ…darki zgodnej z HTTP/1.1. Skontaktuj siÄ™ z administratorem
+serwera cache jeśli masz trudności z autoryzacją, jeśli jesteś
+administratorem, przeczytaj w dokumentacji Squida fragment dotyczÄ…cy cache
+managera i sprawdź log serwera cache w poszukiwaniu bardziej szczegółowych
+komunikatów o błędach.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Polish/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Polish/ERR_CANNOT_FORWARD 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_CANNOT_FORWARD 2009-01-23 18:37:27.000000000 +1300
@@ -1,35 +1,35 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-Nie mo¿na przekazaæ tego ¿±dania w chwili obecnej.
+Nie można przekazać tego żądania w chwili obecnej.
-¯±danie nie mo¿e zostaæ przakazane serwerowi ¼ród³owemu ani ¿adnemu z serwerów-rodziców.
-Najbardziej prawdopodobne ¼ród³a b³êdu to:
+Żądanie nie może zostać przakazane serwerowi źródłowemu ani żadnemu z serwerów-rodziców.
+Najbardziej prawdopodobne źródła błędu to:
-
-Administrator serwera cache nie pozwala temu cache na bezpo¶rednie
-po³±czenia do serwerów ¼ród³owych
+Administrator serwera cache nie pozwala temu cache na bezpośrednie
+połączenia do serwerów źródłowych
-
-Wszystkie kooperuj±ce serwery-rodzice s± w tej chwili niedostêpne.
+Wszystkie kooperujące serwery-rodzice są w tej chwili niedostępne.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Polish/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Polish/ERR_CONNECT_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
B£¡D:¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D:Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-Nie mo¿na zrealizowaæ po³±czenia
+Nie można zrealizować połączenia
-System zwróci³ nastêpuj±c± warto¶æ:
+System zwrócił następującą wartość:
%E
-Serwer ¼ród³owy lub sieæ mog± byæ nieczynne. Spróbuj ponowiæ ¿±danie pó¼niej.
+Serwer źródłowy lub sieć mogą być nieczynne. Spróbuj ponowić żądanie później.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_DNS_FAIL squid-3.1.0.4/errors/Polish/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Polish/ERR_DNS_FAIL 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_DNS_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,24 +1,24 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
-
Nie mo¿na ustaliæ adresu IP hosta o nazwie %H
-Serwer DNS zwróci³ nastêpuj±c± warto¶æ
+
wystąpił następujący błąd:
+
Nie można ustalić adresu IP hosta o nazwie %H
+Serwer DNS zwrócił następującą wartość
%z
-To oznacza, ¿e:
-
Serwer cache nie jest w stanie polaczyæ siê z hostem o nazwie wymienionej w URL.
- Sprawd¼ czy podany adres jest poprawny.
+To oznacza, że:
+
Serwer cache nie jest w stanie polaczyć się z hostem o nazwie wymienionej w URL.
+ Sprawdź czy podany adres jest poprawny.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Polish/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Polish/ERR_FORWARDING_DENIED 2008-12-05 16:09:28.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FORWARDING_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,26 +1,26 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a:
%U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-Przekazanie ¿±dania zabronione.
+Przekazanie żądania zabronione.
-Ten serwer cache nie przeka¿e Twojego ¿±dania poniewa¿ wymusza ono relacjê
-typu sibling. Byæ mo¿e klient %i jest b³êdnie skonfigurowanym serwerem
+Ten serwer cache nie przekaże Twojego żądania ponieważ wymusza ono relację
+typu sibling. Być może klient %i jest błędnie skonfigurowanym serwerem
cache.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FTP_DISABLED squid-3.1.0.4/errors/Polish/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Polish/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FTP_DISABLED 2009-01-23 18:37:28.000000000 +1300
@@ -1,25 +1,25 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podzcas sprowadznia URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-FTP jest wy³±czone
+FTP jest wyłączone
-Ten serwer cache nie prowadzi po³±czeñ FTP.
+Ten serwer cache nie prowadzi połączeń FTP.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FTP_FAILURE squid-3.1.0.4/errors/Polish/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Polish/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FTP_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
-
Wyst±pi³ b³±d protoko³u FTP podczas sprowadznia URL-a: %U
+
Wystąpił błąd protokołu FTP podczas sprowadznia URL-a: %U
-
Squid wys³a³ nastêpuj±c± komendê FTP:
+
Squid wysłał następującą komendę FTP:
%f
-i otrzyma³ odpowied¼
+i otrzymał odpowiedź
%F
@@ -29,6 +29,6 @@
%g
-Przyczyn± mog³ byæ FTP URL z podan± bezwzglêdn± ¶cie¿k± (co nie jest zgodne
-z RFC 1738). Je¶li rzeczywi¶cie tak by³o, to plik mo¿e byæ znaleziony
+Przyczyną mogł być FTP URL z podaną bezwzględną ścieżką (co nie jest zgodne
+z RFC 1738). Jeśli rzeczywiście tak było, to plik może być znaleziony
tu:
%B.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_CREATED 2009-01-23 18:37:28.000000000 +1300
@@ -1,16 +1,16 @@
-
-
Operacja FTP PUT uda³a siê: plik zosta³ utworzony
+
+
Operacja FTP PUT udała się: plik został utworzony
-Operacja zakoñczona pomy¶lnie
+Operacja zakończona pomyślnie
-plik zosta³ utworzony
+plik został utworzony
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,31 +1,31 @@
-
-
B£¡D: Nieudany FTP upload
+
+
BÅÄ„D: Nieudany FTP upload
-B£¡D
+BÅÄ„D
Nieudany FTP PUT/upload
-
Podczas próby przes³ania URL-a: %U via FTP komend±
+
Podczas próby przesłania URL-a: %U via FTP komendą
PUT
-
Squid wys³a³ nastêpuj±c± komendê FTP:
+
Squid wysłał następującą komendę FTP:
%f
-i otrzyma³ odpowied¼
+i otrzymał odpowiedź
%F
-Oznacz to, ¿e:
-
nale¿y sprwdziæ ¶cie¿kê, prawa dostêpu, wolen miejsce na dysku
+Oznacz to, że:
+
należy sprwdzić ścieżkę, prawa dostępu, wolen miejsce na dysku
-
i spróbowaæ ponownie.
+
i spróbować ponownie.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Polish/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,7 +1,7 @@
-
+
Operacja FTP PUT udana: plik uaktualniony
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_INVALID_REQ squid-3.1.0.4/errors/Polish/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Polish/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_INVALID_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,28 +1,28 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
-
Podczas obs³ugi nastêpuj±cego ¿±dania:
+
Podczas obsługi następującego żądania:
%R
-wyst±pi³ nastêpuj±cy b³±d:
+wystąpił następujący błąd:
-
-b³êdne ¿±danie
+błędne żądanie
-Niektóre czê¶ci ¿±dania HTTP mog± byæ b³êdne. Mo¿liwe problemy to:
+Niektóre części żądania HTTP mogą być błędne. Możliwe problemy to:
-
Brak lub nieznana metoda (GET, POST)
@@ -34,12 +34,12 @@
Brak identyfikatora HTTP (HTTP/1.0)
-
-RZbyt du¿y rozmiar ¿±dania
+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
+Błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_INVALID_URL squid-3.1.0.4/errors/Polish/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Polish/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_INVALID_URL 2009-01-23 18:37:28.000000000 +1300
@@ -1,39 +1,39 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-b³êdny URL
+błędny URL
-Niektóre czê¶ci URL-a s± b³êdne. Mo¿liwe problemy to:
+Niektóre części URL-a są błędne. Możliwe problemy to:
-
-Brak lub niew³a¶ciwy protokó³ (should be `http://'' or similar)
+Brak lub niewłaściwy protokół (should be `http://'' or similar)
-
Brak nazwy hosta
-
-podwójna sekwencja escape w ¶cie¿ce URL
+podwójna sekwencja escape w ścieżce URL
-
-b³êdny znak w nazwie hosta; podkre¶lenia (underscores) s± niedozwolone
+błędny znak w nazwie hosta; podkreślenia (underscores) są niedozwolone
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Polish/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Polish/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_LIFETIME_EXP 2009-01-23 18:37:28.000000000 +1300
@@ -1,26 +1,26 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowzdzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-przekroczony dopuszczalny czas po³±czenie
+przekroczony dopuszczalny czas połączenie
-Squid zakoñczy³ realizacjê ¿±dania, poniewa¿ czas jego realizacji przekroczy³
+Squid zakończył realizację żądania, ponieważ czas jego realizacji przekroczył
dopuszczalny limit.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_NO_RELAY squid-3.1.0.4/errors/Polish/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Polish/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_NO_RELAY 2009-01-23 18:37:28.000000000 +1300
@@ -1,26 +1,26 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-Dla tego serwera cache nie zosta³ zdefiniowany WAIS relay! Zawiadom
+Dla tego serwera cache nie został zdefiniowany WAIS relay! Zawiadom
administratora.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Polish/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Polish/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:28.000000000 +1300
@@ -1,28 +1,28 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-¿±danie z dyrektyw± only-if-cached dotyczy³o dokumentu aktualnie
+żądanie z dyrektywą only-if-cached dotyczyło dokumentu aktualnie
nie przechowywanego przez sewer cache.
-¯±danie zawiera³o dyrektywê
only-if-cached. Dokument nie zosta³
-znaleziony w zasobech serwera cache
lub wymaga³ od¶wie¿enia zabronionego
-dyrektyw±
only-if-cached.
+Żądanie zawierało dyrektywę
only-if-cached. Dokument nie został
+znaleziony w zasobech serwera cache
lub wymagał odświeżenia zabronionego
+dyrektywÄ…
only-if-cached.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_READ_ERROR squid-3.1.0.4/errors/Polish/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Polish/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_READ_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-b³±d odczytu
+błąd odczytu
-System zwróci³ warto¶æ:
+System zwrócił wartość:
%E
-Podczas czytania dokumentu z sieci wyst±pi³ b³±d. Proszê ponowiæ ¿±danie.
+Podczas czytania dokumentu z sieci wystąpił błąd. Proszę ponowić żądanie.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Polish/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Polish/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_READ_TIMEOUT 2009-01-23 18:37:28.000000000 +1300
@@ -1,32 +1,32 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
przekroczony czas odczytu
-System zwróci³ nastêpuj±c± warto¶æ:
+System zwrócił następującą wartość:
-
Przekroczony zostal dopuszczalny czas oczekiwania na dane z sieci. Sieæ
-lub serwer ¼ród³owy mog± byæ niedostêpne lub przeci±¿one. Proszê ponowiæ
-¿±danie.
+
Przekroczony zostal dopuszczalny czas oczekiwania na dane z sieci. Sieć
+lub serwer źródłowy mogą być niedostępne lub przeciążone. Proszę ponowić
+żądanie.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Polish/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Polish/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_SOCKET_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,28 +1,28 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-b³±d gniazdka (socket failure)
+błąd gniazdka (socket failure)
-System zwróci³ nastêpuj±c± warto¶æ:
+System zwrócił następującą wartość:
%E
-Squid nie jest w stanie otworzyæ gniazdka TCP (TCP socket), prawdopodobnie
-z powodu przeci±¿enia systemu. Proszê ponowiæ ¿±danie.
+Squid nie jest w stanie otworzyć gniazdka TCP (TCP socket), prawdopodobnie
+z powodu przeciążenia systemu. Proszę ponowić żądanie.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_UNSUP_REQ squid-3.1.0.4/errors/Polish/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Polish/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_UNSUP_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,26 +1,26 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-u¿yta w ¿±daniu kombinacja metoda/protokó³ jest niew³a¶ciwa
+użyta w żądaniu kombinacja metoda/protokół jest niewłaściwa
-Squid nie wspiera wszystkich metod we wszystkich protoko³ach. Na przyk³ad
-nie mo¿esz u¿yæ metody POST w ¿±daniu skierowanym do us³ugi Gopher.
+Squid nie wspiera wszystkich metod we wszystkich protokołach. Na przykład
+nie możesz użyć metody POST w żądaniu skierowanym do usługi Gopher.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_URN_RESOLVE squid-3.1.0.4/errors/Polish/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Polish/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_URN_RESOLVE 2009-01-23 18:37:28.000000000 +1300
@@ -1,25 +1,25 @@
-
-
B£¡D: ¯±dany URN nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URN nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-URL dla ¿±danego URN nie mo¿e zostaæ sprowadzony
+URL dla żądanego URN nie może zostać sprowadzony
Podzcas sprowadzania URN: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-nie mo¿na zlokalizowaæ URN
+nie można zlokalizować URN
-Proszê nie spodziewaæ siê zbyt wiele od URNów z %T :)
+Proszę nie spodziewać się zbyt wiele od URNów z %T :)
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_WRITE_ERROR squid-3.1.0.4/errors/Polish/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Polish/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_WRITE_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ zapisany
+
+
BÅÄ„D: Żądany URL nie może zostać zapisany
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ zapisany
+Żądany URL nie może zostać zapisany
Podczas zapisywania URL-a:
%U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
-b³±d zapisu
+błąd zapisu
-System zwróci³ nastêpuj±c± warto¶æ:
+System zwrócił następującą wartość:
-Wyst±pi³ b³±d podczas próby zapisu do sieci. Proszê ponowiæ ¿±danie.
+Wystąpił błąd podczas próby zapisu do sieci. Proszę ponowić żądanie.
diff -u -r -N squid-3.1.0.3/errors/Polish/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Polish/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Polish/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Polish/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:28.000000000 +1300
@@ -1,25 +1,25 @@
-
-
B£¡D: ¯±dany URL nie mo¿e zostaæ sprowadzony
+
+
BÅÄ„D: Żądany URL nie może zostać sprowadzony
-B£¡D
+BÅÄ„D
-¯±dany URL nie mo¿e zostaæ sprowadzony
+Żądany URL nie może zostać sprowadzony
Podczas sprowadzania URL-a: %U
-
wyst±pi³ nastêpuj±cy b³±d:
+
wystąpił następujący błąd:
-
sprowadzony dokument ma zerowy rozmiar
-Squid nie otrzyma³ ¿adnych danych w odpowiedzi na to ¿±danie.
+Squid nie otrzymał żadnych danych w odpowiedzi na to żądanie.
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Portuguese/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Portuguese/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Portuguese/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: Proibido o acesso ao Cache
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: Proibido o acesso ao Gerenciador do Cache
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Portuguese/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Portuguese/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_CANNOT_FORWARD 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Portuguese/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Portuguese/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_DNS_FAIL squid-3.1.0.4/errors/Portuguese/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Portuguese/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_DNS_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Portuguese/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Portuguese/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FORWARDING_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_DISABLED squid-3.1.0.4/errors/Portuguese/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_DISABLED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_FAILURE squid-3.1.0.4/errors/Portuguese/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Portuguese/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_FORBIDDEN 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Portuguese/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_NOT_FOUND 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_CREATED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
Sucesso no FTP PUT: Arquivo criado
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERROR: Erro no FTP upload
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
Sucesso no FTP PUT: Arquivo atualizado
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Portuguese/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Portuguese/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_INVALID_REQ squid-3.1.0.4/errors/Portuguese/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Portuguese/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_INVALID_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_INVALID_RESP squid-3.1.0.4/errors/Portuguese/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Portuguese/ERR_INVALID_RESP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_INVALID_RESP 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERROR: The requested URL could not be retrieved
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_INVALID_URL squid-3.1.0.4/errors/Portuguese/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Portuguese/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_INVALID_URL 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Portuguese/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Portuguese/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_LIFETIME_EXP 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_NO_RELAY squid-3.1.0.4/errors/Portuguese/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Portuguese/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_NO_RELAY 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_READ_ERROR squid-3.1.0.4/errors/Portuguese/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Portuguese/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_READ_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Portuguese/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Portuguese/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_READ_TIMEOUT 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/Portuguese/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/Portuguese/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERROR: The requested URL could not be retrieved
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Portuguese/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Portuguese/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_SHUTTING_DOWN 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Portuguese/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Portuguese/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_SOCKET_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_TOO_BIG squid-3.1.0.4/errors/Portuguese/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Portuguese/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_TOO_BIG 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_UNSUP_REQ squid-3.1.0.4/errors/Portuguese/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Portuguese/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_UNSUP_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_URN_RESOLVE squid-3.1.0.4/errors/Portuguese/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Portuguese/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_URN_RESOLVE 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: URN requisitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_WRITE_ERROR squid-3.1.0.4/errors/Portuguese/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Portuguese/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_WRITE_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/Portuguese/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Portuguese/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Portuguese/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:28.000000000 +1300
@@ -1,5 +1,5 @@
-
+
ERRO: A URL solicitada não pode ser recuperada
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_ACCESS_DENIED squid-3.1.0.4/errors/ro/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ro/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_ACCESS_DENIED 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Acces interzis.
Configuraţia de control al accesului împiedică permiterea cererii dumneavoastră în acest moment. Vă rugăm contactaţi furnizorul de servicii dacă credeţi că acest lucru nu este corect.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/ro/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/ro/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: Cache Access Denied
ERROR
Cache Acces interzis.
The following error was encountered while trying to retrieve the URL: %U
Interzis accesul la cache.
Ne pare rău, dar nu sunteţi îndreptăţit să accesaţi %U din acest cache pana cand nu v-aţi autenticat.
Vă rugăm contactaţi administratorul cache-ului dacă aveţi dificultăţi în a vă autentifica sau schimbaţi-vă parola implicită.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: Cache Manager Access Denied
ERROR
Cache Manager Acces interzis.
The following error was encountered while trying to retrieve the URL: %U
Interzis accesul la cache manager.
Cu regret, nu aveţi momentan permisiunea de a face cererea %U de la acest cache manager până când nu vă autentificaţi.
Vă rugăm contactaţi administratorul cache-ului dacă aveţi dificultăţi în a vă autentifica sau, dacă sunteţi administratorul, citiţi documentaţia Squid despre interfaţa cache managerului şi verificaţi jurnalul cache pentru mesaje de eroare mai detaliate.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/ro/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/ro/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_CANNOT_FORWARD 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nu pot să forwardez această cerere la acest moment.
Această cerere nu a putut fi înaintată către serverul de origine sau un cache părinte. Cea mai probabilă cauză de eroare este administratorul cache-ului nu permite acestui cache să facă conexiuni directe către serverele de origine, şi toate cache-urile părinte nu pot fi contactate îm acest moment.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_CONNECT_FAIL squid-3.1.0.4/errors/ro/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/ro/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_CONNECT_FAIL 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Conexiunea la %I a eÅŸuat.
Sistemul de operare a returnat mesajul:%E
Calculatorul sau reţeaua destinaţie s-ar putea să fie inoperabile. Repetaţi cererea mai târziu.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_DNS_FAIL squid-3.1.0.4/errors/ro/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/ro/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_DNS_FAIL 2009-01-23 18:40:54.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nu pot determina adresa IP din numele host-ului pentru %H
Serverul DNS a răspuns:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_ESI squid-3.1.0.4/errors/ro/ERR_ESI
--- squid-3.1.0.3/errors/ro/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_ESI 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Procesarea ESI a eÅŸuat.
Procesorul ESI a răspuns:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/ro/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/ro/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FORWARDING_DENIED 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Înaintarea cererii este interzisă.
Acest cache nu va înainta cererea dumneavoastră din cauză că încearcă să stabilească o relaţie de echivalenţă. Poate că clientul %i este un cache care a fost configurat greşit.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_DISABLED squid-3.1.0.4/errors/ro/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/ro/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_DISABLED 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTP este dezactivat
Acest cache nu suportă protocolul FTP.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_FAILURE squid-3.1.0.4/errors/ro/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/ro/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_FAILURE 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
O eroare în protocolul FTP a survenit în timp ce se încerca aducerea URL-ului: %U
Squid a trimis următoarea comandă FTP:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/ro/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/ro/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_FORBIDDEN 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
Autentificărea FTP a eşuat în timp ce se încerca aducerea URL-ului: %U
Squid a trimis următoarea comandă FTP:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_LISTING squid-3.1.0.4/errors/ro/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/ro/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_LISTING 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
Directorul FTP: %U
Conţinutul directorului:
%z
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/ro/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/ro/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_NOT_FOUND 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid a trimis următoarea comandă FTP:
%f
The server responded with:
%F
%g
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/ro/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/ro/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_PUT_CREATED 2009-01-23 18:40:55.000000000 +1300
@@ -0,0 +1 @@
+
FTP PUT reuÅŸit: fiÅŸierul a fost creat
Operaţie reuşită
FiÅŸierul a fost creat
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/ro/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/ro/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_PUT_ERROR 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: FTP upload failed
ERROR
FTP PUT/încărcare eşuată
În timp ce făceam PUT la următorul URL: %U
Squid a trimis următoarea comandă FTP:
%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.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/ro/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/ro/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_PUT_MODIFIED 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
FTP PUT reuÅŸit: fiÅŸierul a fost actualizat
Operaţie reuşită
FiÅŸierul a fost actualizat
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/ro/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/ro/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_FTP_UNAVAILABLE 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
Serverul FTP a fost prea ocupat pentru a aduce URL-ul: %U
Squid a trimis următoarea comandă FTP:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_ICAP_FAILURE squid-3.1.0.4/errors/ro/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/ro/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_ICAP_FAILURE 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Eroare la protocolul ICAP
Sistemul de operare a returnat mesajul:%E
This means that some aspect of the ICAP communication failed.
Câteva probleme posibile sunt:
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_INVALID_REQ squid-3.1.0.4/errors/ro/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/ro/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_INVALID_REQ 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
Eroarea Cerere invalidă a fost întâlnită în timp ce se încerca procesarea cererii:
%R
Câteva probleme posibile 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.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_INVALID_RESP squid-3.1.0.4/errors/ro/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/ro/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_INVALID_RESP 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
Eroarea Răspuns invalid a fost întâlnită în timp ce se încerca procesarea cererii:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_INVALID_URL squid-3.1.0.4/errors/ro/ERR_INVALID_URL
--- squid-3.1.0.3/errors/ro/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_INVALID_URL 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
URL invalid
O parte a URL-ului cerut este incorectă.
Câteva probleme posibile sunt:
Protocolul de acces lipseşte sau nu este corect (ar trebui să fie http://
sau similar)
Lipseşte numele staţiei
Illegal double-escape in the URL-Path
Caracter ilegal în numele staţiei; liniuţele de subliniere nu sunt permise.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_LIFETIME_EXP squid-3.1.0.4/errors/ro/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/ro/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_LIFETIME_EXP 2009-01-23 18:40:56.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Durata de viaţă a conexiunii a expirat
Squid a terminat conexiunea din cauză că a depăşit durata maximă admisă pentru o conexiune.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_NO_RELAY squid-3.1.0.4/errors/ro/ERR_NO_RELAY
--- squid-3.1.0.3/errors/ro/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_NO_RELAY 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Nu există relay Wais
Nu este definit nici un calculator relay Wais pentru acest cache! Strigaţi la administrator!
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/ro/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/ro/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Un document cu cale corectă de altfel nu a fost găsit în cache şi directiva only-if-cached
(numai dacă este deja în cache) a fost specificată.
AÅ£i cerut un document cu directiva only-if-cached
(numai dacă există deja în cache). Documentul nu a fost găsit în cache, sau a necesitat o revalidare, revalidare interzisă de directiva only-if-cached
.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_READ_ERROR squid-3.1.0.4/errors/ro/ERR_READ_ERROR
--- squid-3.1.0.3/errors/ro/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_READ_ERROR 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Eroare la citire
Sistemul de operare a returnat mesajul:%E
A survenit o condiţie de eroare în timp ce se citeau date de la reţea. Vă rugăm încercaţi din nou.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_READ_TIMEOUT squid-3.1.0.4/errors/ro/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/ro/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_READ_TIMEOUT 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Read Timeout
Sistemul de operare a returnat mesajul:%E
S-a depăşit timpul de aşteptare în tipul citirii datelor de la reţea. Reţeaua sau serverul ar putea fi căzute sau congestionate. Vă rugăm să încercaţi din nou.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/ro/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/ro/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Failed to establish a secure connection to %I
Sistemul de operare a returnat mesajul:%E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/ro/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/ro/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_SHUTTING_DOWN 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/ro/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/ro/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_SOCKET_FAILURE 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Eroare de Socket
Sistemul de operare a returnat mesajul:%E
Squid nu poate crea un soclu TCP, probabil din cauza încărcării excesive. Vă rugăm încercaţi din nou.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_TOO_BIG squid-3.1.0.4/errors/ro/ERR_TOO_BIG
--- squid-3.1.0.3/errors/ro/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_TOO_BIG 2009-01-23 18:40:57.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
The request or reply is too large.
În cazul în care faceţi o cerere POST sau PUT, ceea ce încercaţi să încărcaţi este prea mare.
În cazul în care faceţi o cerere GET, ceea ce încercaţi să descărcaţi este prea mare.
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_UNSUP_REQ squid-3.1.0.4/errors/ro/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/ro/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_UNSUP_REQ 2009-01-23 18:40:58.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Unsupported Request Method and Protocol
Squid nu suportă toate metodele de cerere pentru toate protocolurile de acces. De exemplu, nu puteţi face o cerere de tip POST pentru Gopher.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_URN_RESOLVE squid-3.1.0.4/errors/ro/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/ro/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_URN_RESOLVE 2009-01-23 18:40:58.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: The requested URN not be retrieved
ERROR
Un URL pentru URN-ul cerut nu a putut fi adus
The following error was encountered while trying to retrieve the URN: %U
Nu se poate rezolva URN-ul
Hei, nu vă aşteptaţi la prea multe de la URN-uri pe %T :)
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_WRITE_ERROR squid-3.1.0.4/errors/ro/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/ro/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_WRITE_ERROR 2009-01-23 18:40:58.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Eroare la scriere
Sistemul de operare a returnat mesajul:%E
A survenit o condiţie de eroare în timp ce se scriau date la reţea. Vă rugăm încercaţi din nou.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ro/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/ro/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/ro/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/ro/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:40:58.000000000 +1300
@@ -0,0 +1 @@
+
EROARE: URL-ul cerut nu a putut fi citit
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Replică de lungime Zero
Squid nu a recepţionat nici un fel de date pentru această cerere.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Romanian/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Romanian/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmatoarea eroare:
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Romanian/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Romanian/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,34 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Accesul la cache refuzat.
-
-
-
-
-
Ne pare rãu, dar nu sunteþi îndreptãþit sã accesaþi:
-
%U
-din acest cache pana cand nu v-aþi autenticat.
-
-
-
-Aveti nevoie de Netscape versiunea 2.0 sau mai mare, sau Microsoft
-Internet Explorer 3.0, sau un browser care cunoaºte HTTP/1.1 pentru
-a vã putea autentica. Vã rugãm contactaþi
-administratorul cache-ului daca aveþi dificultãþi în autentificare
-sau schimbaþi-vã parola.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,37 +0,0 @@
-
-
-
EROARE: Accesul interzis la Managerul Cache-ului
-
-
-
-
-
ERROR
-
Accesul interzis la Managerul Cache-ului
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Accesul interzis la Managerul Cache-ului
-
-
-
-
-
Ne pare rãu, dar nu sunteþi îndreptãþit sã accesaþi:
-
%U
-din acest cache pana cand nu v-aþi autenticat.
-
-
-
-Aveti nevoie de Netscape versiunea 2.0 sau mai mare, sau Microsoft
-Internet Explorer 3.0, sau un browser care cunoaºte HTTP/1.1 pentru
-a vã putea autentica. Vã rugãm contactaþi
-administratorul cache-ului daca aveþi dificultãþi în autentificare
-sau, dacã sunteþi administratorul, citiþi în documentaþia
-Squid-ului secþiunea despre interfaþa managerului de cache ºi
-verificaþi logurile pentru mesaje de eroare mai detaliate.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Romanian/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Romanian/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Nu pot sã forwardez aceastã cerere la acest moment.
-
-
-
-
-Aceastã cerere nu a putut fi înaintatã cãtre serverul de origine
-sau un cache pãrinte. Cea mai probabilã cauzã de eroare este:
-
-- Administratorul cache-ului nu permite acestui cache sã facã
- conexiuni directe cãtre serverele de origine, ºi
-
- Toate cache-urile pãrinte nu pot fi contactate îm acest moment.
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Romanian/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Romanian/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Realizarea conexiunii a eºuat
-
-
-
-
-Sistemul de operare a returnat mesajul:
-
%E
-
-
-Calculatorul sau reþeaua destinaþie s-ar putea sã fie inoperabile.
-Repetaþi cererea mai târziu.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_DNS_FAIL squid-3.1.0.4/errors/Romanian/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Romanian/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
-Nu pot determina adresa IP din numele host-ului pentru
-%H
-
-
-
-
-Serverul de DNS a returnat:
-
-%z
-
-
-
-Aceasta înseamnã cã:
-
- Cache-ul nu a putut rezolva numele host-ului scris în URL.
- Verificaþi dacã adresa este corectã.
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_ESI squid-3.1.0.4/errors/Romanian/ERR_ESI
--- squid-3.1.0.3/errors/Romanian/ERR_ESI 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-ESI Processing failed.
-
-
-
-The ESI processor returned:
-
-%Z
-
-
-
-This means that:
-
- The surrogate was not able to process the ESI template. Please report this error to the webmaster.
-
-
Your webmaster is %w.
-
This page is in english because a translation has not been made. If you are able to, please create a translation and contact the squid project to get it included.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Romanian/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Romanian/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Înaintarea cererii este interzisã.
-
-
-
-
-Acest cache nu va înainta cererea dumneavoastrã din cauzã cã încearcã
-sã stabileascã o relaþie de echivalenþã. Poate cã clientul %i este un
-cache care a fost configurat greºit.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_DISABLED squid-3.1.0.4/errors/Romanian/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Protocolul FTP este dezactivat
-
-
-
-
-Acest cache nu suportã protocolul FTP.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_FAILURE squid-3.1.0.4/errors/Romanian/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-O eroare de FTP a survenit în
-timp ce încercam sã citesc URL-ul:
-%U
-
-Squid a trimis urmãtoarea comandã FTP:
-
%f
-ºi a primit aceastã replicã
-
%F
-
%g
-
-Acest lucru ar putea fi cauzat de un URL FTP cu o cale absolutã
-(fapt care nu este coform cu standardul RFC 1738). Dacã aceasta
-este cauza, atunci fiºierul poate fi gãsit la adresa
-%B.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Romanian/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Romanian/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,22 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-The following URL could not be retrieved:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,12 +0,0 @@
-
-
-
Comanda FTP PUT a reuºit: Fiºierul a fost creat
-
-
-
-
Operaþiune reuºitãl
-
Fiºierul a fost creat
-
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
EROARE: Trimiterea de fiºier prin FTP a eºuat
-
-
-
-
ERROR
-
Comanda FTP PUT/trimiterea a eºuat
-
-
-În timp ce fãceam PUT la urmãtorul URL:
-%U
-
-Squid a trimis urmãtoarea comandã FTP:
-
- %f
-
-ºi a primit urmãtoarea replicã
-
- %F
-
-
-Aceasta înseamnã cã:
-
-Verificaþi calea, drepturile, spaþiul liber ºi
-încercaþi din nou.
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,11 +0,0 @@
-
-
-
Comanda FTP PUT a reuºit: Fiºierul a fost modificat
-
-
-
Operaþiune reuºitã
-
Fiºier modificat
-
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Romanian/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Romanian/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,18 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-The FTP server was too busy while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_ICAP_FAILURE squid-3.1.0.4/errors/Romanian/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/Romanian/ERR_ICAP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-ICAP protocol error.
-
-
-
-
-The system returned:
-
%E
-
-
-This means that:
-Some aspect of the ICAP communication failed. Possible problems:
-
-- ICAP server is not reachable.
-
- Illegal response from ICAP server.
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_INVALID_REQ squid-3.1.0.4/errors/Romanian/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Romanian/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
-
-
-Câteva aspecte ale cererii HTTP sunt invalide. Probleme posibile:
-
-- Comanda din cerere lipseºte sau este necunoscutã
-
- URL-ul lipseºte
-
- Lipseºte identificatorul HTTP (HTTP/1.0)
-
- Cererea este prea mare
-
- Câmpul Content-Length lipseºte pentru cereri POST sau PUT
-
- Caracter(e) ilegal în numele calculatorului; underscore (_) nu este acceptat
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_INVALID_RESP squid-3.1.0.4/errors/Romanian/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Romanian/ERR_INVALID_RESP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
--
-
-Invalid Response
-
-
-
-
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_INVALID_URL squid-3.1.0.4/errors/Romanian/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Romanian/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
-
-
-Câteva aspecte ale URL-ului cerunt sunt incorecte. Probleme posibile:
-
-- Lipseºte sau este incorect protocolul de access (ar trebui sã fie `http://' sau ceva similar)
-
- Lipseºte numele calculatorului
-
- Caracterul escape-dublu este ilegal în calea URL
-
- Caracter(e) ilegal în numele calculatorului; underscore (_) nu este acceptat
-
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Romanian/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Romanian/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Durate de viaþã a conexiunii a expirat
-
-
-
-
-Squid a terminat conexiunea din cauzã cã a depãºit durata maximã
-admisã pentru o conexiune.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_NO_RELAY squid-3.1.0.4/errors/Romanian/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Romanian/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Nu existã relay Wais
-
-
-
-
-Nu este definit nici un calculator relay Wais pentru acest cache! Strigaþi la administrator!
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Romanian/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Un document cu cale corectã de altfel nu a fost gãsit în cache ºi
-directiva
only-if-cached (numai dacã este deja în cache)
-a fost specificatã.
-
-
-
-
-Aþi cerut un document cu directiva only-if-cached
-(numai dacã existã deja în cache). Documentul nu a fost gãsit în
-cache, sau a necesitat o revalidare, revalidare interzisã
-de directivaonly-if-cached.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_READ_ERROR squid-3.1.0.4/errors/Romanian/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Romanian/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Eroare la citire
-
-
-
-
-Sistemul de operare a returnat:
-
%E
-
-
-O condiþie de eroare în timp ce citeam date din reþea. Vã rog
-retrimiteþi cererea.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Romanian/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Romanian/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Cererea de citire a expirat înainte sã primesc rãspuns
-
-
-
-
-Sistemul de operare a returnat:
-
%E
-
-
-O depãºire de duratã s-a întâmplat îm timp ce citeam date din reþea.
-Serverul sau reþeaua ar putea fi inpoerabile sau congestionate. Încercaþi
-din nou.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/Romanian/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/Romanian/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Failed to establish a secure connection to %I
-
-
-
-
-The system returned:
-
%E
-
-
-This proxy and the remote host failed to negotiate a mutually acceptable
-security settings for handling your request. It is possible that the remote
-host does not support secure connections, or the proxy is not satisfied with
-the host security credentials.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Romanian/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Romanian/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Romanian/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Romanian/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-ERROR
-URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Eroare de Socket
-
-
-
-
-Sistemul de operare a returnat:
-
%E
-
-
-Squid nu a reuºit sã creeze un socket TCP, probabil din cauza încãrcãrii
-excesive. Încercaþi mai târziu.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_TOO_BIG squid-3.1.0.4/errors/Romanian/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Romanian/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-The request or reply is too large.
-
-
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-
-
-Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_UNSUP_REQ squid-3.1.0.4/errors/Romanian/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Romanian/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Combinaþie de protocol ºi cerere invalidã
-
-
-
-
-Squid nu suportã toate cererile sub toate protocoalele.
-De exemplu, nu puteþi sã POST o cerere Gopher.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_URN_RESOLVE squid-3.1.0.4/errors/Romanian/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Romanian/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Nu pot înþelege sau rezolva URN-ul
-
-
-
-
-Hei, nu te aºtepta la prea multe de la URN-uri pe %T :)
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_WRITE_ERROR squid-3.1.0.4/errors/Romanian/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Romanian/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Eroare la scriere
-
-
-
-
-Sistemul de operare a returnat:
-
%E
-
-
-O condiþie de eroare a survenit în timp ce scriam date în reþea. Reîncercaþi
-operaþia.
-
diff -u -r -N squid-3.1.0.3/errors/Romanian/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Romanian/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Romanian/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Romanian/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
EROARE: URL-ul cerut nu a putut fi citit
-
-
-
-
ERROR
-
URL-ul cerut nu a putut fi citit
-
-
-În timp ce citeam URL-ul:
-%U
-
-Am întâlnit urmãtoarea eroare:
-
--
-
-Replicã de lungime zero
-
-
-
-
-Squid nu a recepþionat nici o informaþie ca urmare a acestei cereri.
-
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_ACCESS_DENIED squid-3.1.0.4/errors/ru/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ru/ERR_ACCESS_DENIED 2008-12-05 16:12:49.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_ACCESS_DENIED 2009-01-23 18:40:58.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе отказано.
ÐаÑтройка ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð´Ð¾Ñтупа не даёт возможноÑти выполнить Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² наÑтоÑщее времÑ. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð’Ð°ÑˆÐ¸Ð¼ поÑтавщиком уÑлуг Интернет, еÑли Ð’Ñ‹ Ñчитаете Ñто неправильным.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе отказано.
ÐаÑтройка ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð´Ð¾Ñтупа не даёт возможноÑти выполнить Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² наÑтоÑщее времÑ. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð’Ð°ÑˆÐ¸Ð¼ поÑтавщиком уÑлуг Интернет, еÑли Ð’Ñ‹ Ñчитаете Ñто неправильным.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/ru/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/ru/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:12:49.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:40:58.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Cache Access Denied
ERROR
Cache Ð’ доÑтупе отказано.
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе к кÑшу отказано.
Извините, Ð’Ñ‹ не можете запроÑить %U из Ñтого кÑша до тех пор, пока не пройдёте идентификацию.
ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором кÑша, еÑли у Ð’Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ проблемы Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÐµÐ¹, либо Ñмените Ваш пароль по умолчанию.
\ No newline at end of file
+
ОШИБКÐ: Cache Access Denied
ERROR
Cache Ð’ доÑтупе отказано.
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе к кÑшу отказано.
Извините, Ð’Ñ‹ не можете запроÑить %U из Ñтого кÑша до тех пор, пока не пройдёте идентификацию.
ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором кÑша, еÑли у Ð’Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ проблемы Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÐµÐ¹, либо Ñмените Ваш пароль по умолчанию.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:12:49.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:40:58.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Cache Manager Access Denied
ERROR
Cache Manager Ð’ доÑтупе отказано.
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе к админиÑтратору кÑша отказано.
Извините, Ð’Ñ‹ не можете запроÑить %U из ÑиÑтемы ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑша до тех пор, пока не пройдете идентификацию.
ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором кÑша, еÑли у Ð’Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ проблемы Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÐµÐ¹, еÑли же Ð’Ñ‹ админиÑтратор, прочитайте документацию по интерфейÑу ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑшем и проÑмотрите лог-файл на предмет более детальных Ñообщений об ошибках.
\ No newline at end of file
+
ОШИБКÐ: Cache Manager Access Denied
ERROR
Cache Manager Ð’ доÑтупе отказано.
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ доÑтупе к админиÑтратору кÑша отказано.
Извините, Ð’Ñ‹ не можете запроÑить %U из ÑиÑтемы ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑша до тех пор, пока не пройдете идентификацию.
ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором кÑша, еÑли у Ð’Ð°Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¸ проблемы Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÐµÐ¹, еÑли же Ð’Ñ‹ админиÑтратор, прочитайте документацию по интерфейÑу ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑшем и проÑмотрите лог-файл на предмет более детальных Ñообщений об ошибках.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/ru/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/ru/ERR_CANNOT_FORWARD 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_CANNOT_FORWARD 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно перенаправить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² данное времÑ.
Ðтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ может быть перенаправлен ни к первичному Ñерверу, ни к родительÑким кÑшам. Ðаиболее вероÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð° Ñтой ошибки в том, что админиÑтратор запретил прÑмые ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº первычным Ñерверам, а вÑе указанные родительÑкие кÑши в данный момент недоÑтупны.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно перенаправить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² данное времÑ.
Ðтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ может быть перенаправлен ни к первичному Ñерверу, ни к родительÑким кÑшам. Ðаиболее вероÑÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð° Ñтой ошибки в том, что админиÑтратор запретил прÑмые ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº первычным Ñерверам, а вÑе указанные родительÑкие кÑши в данный момент недоÑтупны.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_CONNECT_FAIL squid-3.1.0.4/errors/ru/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/ru/ERR_CONNECT_FAIL 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_CONNECT_FAIL 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Соединение Ñ %I не удалоÑÑŒ
СиÑтема вернула: %E
Удаленный узел или Ñеть могут быть недоÑтупны. ПожалуйÑта, повторите Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð·Ð¶Ðµ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Соединение Ñ %I не удалоÑÑŒ
СиÑтема вернула: %E
Удаленный узел или Ñеть могут быть недоÑтупны. ПожалуйÑта, повторите Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð·Ð¶Ðµ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_DNS_FAIL squid-3.1.0.4/errors/ru/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/ru/ERR_DNS_FAIL 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_DNS_FAIL 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно определить IP Ð°Ð´Ñ€ÐµÑ Ð¸Ð· имени узла %H
Сервер DNS ответил:
%z
Ðто означает, что кÑш не Ñмог преобразовать Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° в URL. Проверьте Ð°Ð´Ñ€ÐµÑ Ð½Ð° правильноÑÑ‚ÑŒ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно определить IP Ð°Ð´Ñ€ÐµÑ Ð¸Ð· имени узла %H
Сервер DNS ответил:
%z
Ðто означает, что кÑш не Ñмог преобразовать Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° в URL. Проверьте Ð°Ð´Ñ€ÐµÑ Ð½Ð° правильноÑÑ‚ÑŒ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_ESI squid-3.1.0.4/errors/ru/ERR_ESI
--- squid-3.1.0.3/errors/ru/ERR_ESI 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_ESI 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Обработка ESI не удалаÑÑŒ.
Обработчик ESI ответил:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Ваш вебмаÑтер: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Обработка ESI не удалаÑÑŒ.
Обработчик ESI ответил:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Ваш вебмаÑтер: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/ru/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/ru/ERR_FORWARDING_DENIED 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FORWARDING_DENIED 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ переÑылке отказано
Ðтот кÑш не будет переÑылать Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾ причине уÑтановки взаимоотношений типа sibling. Скорее вÑего клиент %i - неправильно Ñконфигурированный кÑш.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’ переÑылке отказано
Ðтот кÑш не будет переÑылать Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾ причине уÑтановки взаимоотношений типа sibling. Скорее вÑего клиент %i - неправильно Ñконфигурированный кÑш.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_DISABLED squid-3.1.0.4/errors/ru/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/ru/ERR_FTP_DISABLED 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_DISABLED 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
FTP отключен
Ðтот кÑш не поддерживает FTP.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
FTP отключен
Ðтот кÑш не поддерживает FTP.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_FAILURE squid-3.1.0.4/errors/ru/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/ru/ERR_FTP_FAILURE 2008-12-05 16:12:50.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_FAILURE 2009-01-23 18:40:59.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP протокола при попытке получить Ñледующий URL (унифицированный указатель информационного реÑурÑа): %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP протокола при попытке получить Ñледующий URL (унифицированный указатель информационного реÑурÑа): %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/ru/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/ru/ERR_FTP_FORBIDDEN 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_FORBIDDEN 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP идентификации при попытке получить URL (унифицированный указатель информационного реÑурÑа): %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Произошла ошибка FTP идентификации при попытке получить URL (унифицированный указатель информационного реÑурÑа): %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_LISTING squid-3.1.0.4/errors/ru/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/ru/ERR_FTP_LISTING 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_LISTING 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
FTP Directory: %U
\ No newline at end of file
+
FTP директориÑ: %U FTP директориÑ: %U/
Содержимое директории:
%z
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/ru/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/ru/ERR_FTP_NOT_FOUND 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_NOT_FOUND 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Следующий URL не может быть получен: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
Ðто может быть вызвано FTP URL c абÑолютным путем (который не ÑоответÑтвует RFC 1738). ЕÑли Ñта причина верна, то файл можно найти на %B.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Следующий URL не может быть получен: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
Ðто может быть вызвано FTP URL c абÑолютным путем (который не ÑоответÑтвует RFC 1738). ЕÑли Ñта причина верна, то файл можно найти на %B.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/ru/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/ru/ERR_FTP_PUT_CREATED 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_PUT_CREATED 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT завершилаÑÑŒ уÑпешно: файл Ñоздан
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ уÑпешно
Файл Ñоздан
\ No newline at end of file
+
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT завершилаÑÑŒ уÑпешно: файл Ñоздан
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ уÑпешно
Файл Ñоздан
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/ru/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/ru/ERR_FTP_PUT_ERROR 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_PUT_ERROR 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: FTP upload failed
ERROR
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT (загрузка) не удалаÑÑŒ
При попытке PUT Ñледующего URL: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
Ðто означает, что FTP Ñервер может не иметь прав или Ñвободного меÑта Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°. Проверьте путь, права, Ñвободное меÑто и повторите Ñнова.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: FTP upload failed
ERROR
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT (загрузка) не удалаÑÑŒ
При попытке PUT Ñледующего URL: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
Ðто означает, что FTP Ñервер может не иметь прав или Ñвободного меÑта Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°. Проверьте путь, права, Ñвободное меÑто и повторите Ñнова.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/ru/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/ru/ERR_FTP_PUT_MODIFIED 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_PUT_MODIFIED 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT завершилаÑÑŒ уÑпешно: файл обновлен
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ уÑпешно
Файл обновлен
\ No newline at end of file
+
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ FTP PUT завершилаÑÑŒ уÑпешно: файл обновлен
ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ уÑпешно
Файл обновлен
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/ru/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/ru/ERR_FTP_UNAVAILABLE 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_FTP_UNAVAILABLE 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Сервер FTP Ñлишком нагружен, чтобы получить URL: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Сервер FTP Ñлишком нагружен, чтобы получить URL: %U
Squid поÑлал Ñледующую FTP комманду:
%f
Сервер ответил:
%F
%g
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_ICAP_FAILURE squid-3.1.0.4/errors/ru/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/ru/ERR_ICAP_FAILURE 2008-12-05 16:12:51.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_ICAP_FAILURE 2009-01-23 18:41:00.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка ICAP протокола.
СиÑтема вернула: %E
Ðто означает, что некоторые аÑпекты ICAP ÑвÑзи неудалиÑÑŒ.
Возможные проблемы:
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка ICAP протокола.
СиÑтема вернула: %E
Ðто означает, что некоторые аÑпекты ICAP ÑвÑзи неудалиÑÑŒ.
Возможные проблемы:
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_INVALID_REQ squid-3.1.0.4/errors/ru/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/ru/ERR_INVALID_REQ 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_INVALID_REQ 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Ошибка неверный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ñ€Ð¸ обработке запроÑа:
%R
Возможные проблемы:
ОтÑутÑтвует или неизвеÑтен метод запроÑа.
ОтÑутÑтвует URL.
ОтÑутÑтвует HTTP идентификатор (HTTP/1.0).
Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñлишком велик.
Упещенный Content-Length в POST или PUT запроÑе.
ÐедопуÑтимый Ñимвол в имени (hostname), Ð¿Ð¾Ð´Ñ‡ÐµÑ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ñ‹.
ÐдминиÑтратор Вашего кÑша: %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 запроÑе.
ÐедопуÑтимый Ñимвол в имени (hostname), Ð¿Ð¾Ð´Ñ‡ÐµÑ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ñ‹.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_INVALID_RESP squid-3.1.0.4/errors/ru/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/ru/ERR_INVALID_RESP 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_INVALID_RESP 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Ошибка неверный ответ при обработке запроÑа:
%R
Ответ HTTP (HTTP Response message), полученный от Ñервера не может быть обработан или неверно Ñформирован. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ Ñервера.
ÐдминиÑтратор вашего кÑша, при необходимоÑти, может предоÑтавить Вам более подробную информацию о дейÑтвительных причинах проблемы.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
Ошибка неверный ответ при обработке запроÑа:
%R
Ответ HTTP (HTTP Response message), полученный от Ñервера не может быть обработан или неверно Ñформирован. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ Ñервера.
ÐдминиÑтратор вашего кÑша, при необходимоÑти, может предоÑтавить Вам более подробную информацию о дейÑтвительных причинах проблемы.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_INVALID_URL squid-3.1.0.4/errors/ru/ERR_INVALID_URL
--- squid-3.1.0.3/errors/ru/ERR_INVALID_URL 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_INVALID_URL 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðеверный URL
Ðекоторые параметры URL неверны
Возможные проблемы:
ОтÑутÑтвет или неверено указан протокол (должен быть http://
или похожий)
ОтÑутÑтвует Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° (hostname)
ÐедопуÑтимое двойное Ñкранирование в пути URL (URL-Path)
ÐедопуÑтимый Ñимвол в имени (hostname), Ð¿Ð¾Ð´Ñ‡ÐµÑ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ñ‹.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðеверный URL
Ðекоторые параметры URL неверны
Возможные проблемы:
ОтÑутÑтвет или неверено указан протокол (должен быть http://
или похожий)
ОтÑутÑтвует Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° (hostname)
ÐедопуÑтимое двойное Ñкранирование в пути URL (URL-Path)
ÐедопуÑтимый Ñимвол в имени (hostname), Ð¿Ð¾Ð´Ñ‡ÐµÑ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ñ‹.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_LIFETIME_EXP squid-3.1.0.4/errors/ru/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/ru/ERR_LIFETIME_EXP 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_LIFETIME_EXP 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло
Squid прервал Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¸Ð·-за Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ð¼Ð°ÐºÑимального времени ÑоединениÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло
Squid прервал Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¸Ð·-за Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ð¼Ð°ÐºÑимального времени ÑоединениÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_NO_RELAY squid-3.1.0.4/errors/ru/ERR_NO_RELAY
--- squid-3.1.0.3/errors/ru/ERR_NO_RELAY 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_NO_RELAY 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Wais Relay не определен
Ð”Ð»Ñ Ñтого кÑша не определен Wais Relay узел. Кричите на админиÑтратора.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Wais Relay не определен
Ð”Ð»Ñ Ñтого кÑша не определен Wais Relay узел. Кричите на админиÑтратора.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/ru/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/ru/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
ДейÑтвительный документ не найден в кÑше и указана деректива only-if-cached
.
Ð’Ñ‹ Ñделали Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð¾Ð¹ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑшем only-if-cached
. Документ не был найден в кÑше или он требует обновлениÑ, запрешенного директивой only-if-cached
.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
ДейÑтвительный документ не найден в кÑше и указана деректива only-if-cached
.
Ð’Ñ‹ Ñделали Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð¾Ð¹ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÑшем only-if-cached
. Документ не был найден в кÑше или он требует обновлениÑ, запрешенного директивой only-if-cached
.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_READ_ERROR squid-3.1.0.4/errors/ru/ERR_READ_ERROR
--- squid-3.1.0.3/errors/ru/ERR_READ_ERROR 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_READ_ERROR 2009-01-23 18:41:01.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка при чтении
СиÑтема вернула: %E
При попытке Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… из Ñети произошла ошибка. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка при чтении
СиÑтема вернула: %E
При попытке Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… из Ñети произошла ошибка. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_READ_TIMEOUT squid-3.1.0.4/errors/ru/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/ru/ERR_READ_TIMEOUT 2008-12-05 16:12:52.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_READ_TIMEOUT 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸ чтении иÑтекло
СиÑтема вернула: %E
Превышено Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° во Ð²Ñ€ÐµÐ¼Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… из Ñети. Сеть или Ñервер не работают либо перегружены. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸ чтении иÑтекло
СиÑтема вернула: %E
Превышено Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð° во Ð²Ñ€ÐµÐ¼Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… из Ñети. Сеть или Ñервер не работают либо перегружены. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/ru/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/ru/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðе удалоÑÑŒ уÑтановить безопаÑное Ñоединение Ñ %I
СиÑтема вернула: %E
При обработке Вашего запроÑа Ñтот кÑш и удаленный узел не Ñмогли выбрать взаимно удовлетворÑющие наÑтройки безопаÑноÑти. Возможно удаленный узел не поддерживает безопаÑные ÑоединениÑ, или кÑш не не удовлетворен аттеÑтатом безопаÑноÑти узла.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðе удалоÑÑŒ уÑтановить безопаÑное Ñоединение Ñ %I
СиÑтема вернула: %E
При обработке Вашего запроÑа Ñтот кÑш и удаленный узел не Ñмогли выбрать взаимно удовлетворÑющие наÑтройки безопаÑноÑти. Возможно удаленный узел не поддерживает безопаÑные ÑоединениÑ, или кÑш не не удовлетворен аттеÑтатом безопаÑноÑти узла.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/ru/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/ru/ERR_SHUTTING_DOWN 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_SHUTTING_DOWN 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðтот кÑш в процеÑÑе Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ и не может выполнить Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² наÑтоÑщее времÑ. ПожалуйÑта, повторите Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ‡ÐµÑ€ÐµÐ· некторое времÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðтот кÑш в процеÑÑе Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ и не может выполнить Ваш Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð² наÑтоÑщее времÑ. ПожалуйÑта, повторите Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ‡ÐµÑ€ÐµÐ· некторое времÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/ru/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/ru/ERR_SOCKET_FAILURE 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_SOCKET_FAILURE 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка Ñокета
СиÑтема вернула: %E
Squid не может Ñоздать TCP Ñокет, предположительно из-за большой нагрузки. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка Ñокета
СиÑтема вернула: %E
Squid не может Ñоздать TCP Ñокет, предположительно из-за большой нагрузки. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_TOO_BIG squid-3.1.0.4/errors/ru/ERR_TOO_BIG
--- squid-3.1.0.3/errors/ru/ERR_TOO_BIG 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_TOO_BIG 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¸Ð»Ð¸ ответ Ñлишком велик.
ЕÑли Ð’Ñ‹ делаете POST или PUT запроÑÑ‹, то закачиваемый объект Ñлишком велик.
ЕÑли Ð’Ñ‹ делаете GET запроÑ, то Ñкачиваемый объект Ñлишком велик.
Ðти Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑƒÑтановлены вышим интернет провайдером, который управлÑет Ñтим кÑшем. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð½Ð¸Ð¼Ð¸, еÑли Ð’Ñ‹ Ñчитаете Ñто неправильным.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¸Ð»Ð¸ ответ Ñлишком велик.
ЕÑли Ð’Ñ‹ делаете POST или PUT запроÑÑ‹, то закачиваемый объект Ñлишком велик.
ЕÑли Ð’Ñ‹ делаете GET запроÑ, то Ñкачиваемый объект Ñлишком велик.
Ðти Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑƒÑтановлены вышим интернет провайдером, который управлÑет Ñтим кÑшем. ПожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð½Ð¸Ð¼Ð¸, еÑли Ð’Ñ‹ Ñчитаете Ñто неправильным.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_UNSUP_REQ squid-3.1.0.4/errors/ru/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/ru/ERR_UNSUP_REQ 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_UNSUP_REQ 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðеподдерживаемый метод запроÑа или протокол
Squid не поддерживает вÑе методы запроÑов Ð´Ð»Ñ Ð²Ñех протоколов. К примеру, Ð´Ð»Ñ Gopher протокола Ð’Ñ‹ не можете выполнÑÑ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ POST.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðеподдерживаемый метод запроÑа или протокол
Squid не поддерживает вÑе методы запроÑов Ð´Ð»Ñ Ð²Ñех протоколов. К примеру, Ð´Ð»Ñ Gopher протокола Ð’Ñ‹ не можете выполнÑÑ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾Ñ POST.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_URN_RESOLVE squid-3.1.0.4/errors/ru/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/ru/ERR_URN_RESOLVE 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_URN_RESOLVE 2009-01-23 18:41:02.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: The requested URN not be retrieved
ERROR
URL Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ URN не может быть получен
При получении URN: %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно определить URN
Ðе Ñтоит ожидать Ñ‡ÑƒÐ´ÐµÑ Ð¾Ñ‚ URN-ов на %T :)
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: The requested URN not be retrieved
ERROR
URL Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð¾Ð³Ð¾ URN не может быть получен
При получении URN: %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ðевозможно определить URN
Ðе Ñтоит ожидать Ñ‡ÑƒÐ´ÐµÑ Ð¾Ñ‚ URN-ов на %T :)
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_WRITE_ERROR squid-3.1.0.4/errors/ru/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/ru/ERR_WRITE_ERROR 2008-12-05 16:12:53.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_WRITE_ERROR 2009-01-23 18:41:03.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка запиÑи
СиÑтема вернула: %E
При попытке запиÑи данных в Ñеть произошла ошибка. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
Ошибка запиÑи
СиÑтема вернула: %E
При попытке запиÑи данных в Ñеть произошла ошибка. ПожалуйÑта, повторите запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/ru/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/ru/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/ru/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:12:54.000000000 +1300
+++ squid-3.1.0.4/errors/ru/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:41:03.000000000 +1300
@@ -1 +1 @@
-
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
ПуÑтой ответ (нулевой длины)
Squid не получил никаких данных в ответ на Ñтот запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
+
ОШИБКÐ: Запрошенный URL не может быть получен
ERROR
The requested URL could not be retrieved
При получении URL %U произошла ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°
ПуÑтой ответ (нулевой длины)
Squid не получил никаких данных в ответ на Ñтот запроÑ.
ÐдминиÑтратор Вашего кÑша: %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Serbian/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Serbian/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
GREŠKA: Pristup nije dozvoljen
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Serbian/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Serbian/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
GREŠKA: Pristup proksi/keš serveru nije dozvoljen
-
-
-
GREŠKA
-
Pristup proksi/keš serveru nije dozvoljen
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Pristup proksi/keš serveru nije dozvoljen
-
-
-
-
Na žalost trenutno vam nije dozvoljeno da zahtevate:
-
%U
-iz ovog proksi servera pre nego što se ne autentifikujete.
-
-
-
-Da bi to funkcionisalo potreban vam je Netscape verzija 2 ili novija ili
-Microsoft Intenet Explorer 3.0, ili browser koji podržava HTTP/1.1.
-Ukoliko budete imali problema oko autentifikacije molimo kontaktirajte
-proksi administratora ili želite da
-promenite svoju poèetnu lozinku.
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
GREŠKA: Pristup proksi/keš server menadžeru nije dozvoljen
-
-
-
GREŠKA
-
Pristup proksi/keš server menadžeru nije dozvoljen
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Pristup proksi/keš server menadžeru nije dozvoljen
-
-
-
Na žalost trenutno vam nije dozvoljeno da zahtevate:
-
%U
-iz ovog keš menadžera pre nego što se autentifikujete.
-
-
-
Da bi to funkcionisalo potreban vam je Netscape verzija 2 i više ili
-Microsoft Intenet Explorer 3.0, ili browser koji podržava HTTP/1.1.
-Ukoliko 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.
-
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Serbian/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Serbian/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Vaš zahtev ne može da se prosledi u ovom trenutku.
-
-
-
-
-Ovaj zahtev nije mogao da bude prosleðen izvonom serveru niti bilo kom
-nadreðenom proxy serveru. Najverovatniji uzrok ove greške je da:
-
-- Keš administrator ne dozvoljava da ovaj proksi server
-direktno pristupi izvonom serveru,
-
- Svi konfigurisani nadreðeni proksi serveri su trenutno nedostupni.
-
-
Vaš keš administrator je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Serbian/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Serbian/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-@SHORT_DESCRIPTION@
-
-
-
-
-Sistem je dao povratnu informaciju:
-
Konekcija je raskinuta.
-
-
-što znaèi:
-
- Udaljeni raèunar ili mreža nisu operativni. Molimo pokušajte kasnije.
-
-
-
Vaš keš administrator je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_DNS_FAIL squid-3.1.0.4/errors/Serbian/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Serbian/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,36 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-
-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š administrator je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_ESI squid-3.1.0.4/errors/Serbian/ERR_ESI
--- squid-3.1.0.3/errors/Serbian/ERR_ESI 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuce
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuce
-
-
-Tokom pokušaja da se dovuce strana sa sledecom adresom (URL):
-%U
-
-Dogodila se sledeca greška:
-
-ESI obrada nije uspela.
-
-
-
-ESI procesor je vratio:
-
-%Z
-
-
-
-Ovo znaci da:
-
- Surogat nije uspeo da obradi ESI zahtev. Molimo obavestite webmastera o ovoj grešci
-
-
Vaš webmaster je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Serbian/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Serbian/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,30 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Prosleðivanje odbijeno.
-
-
-
-
-što znaèi:
-
- 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.3/errors/Serbian/ERR_FTP_DISABLED squid-3.1.0.4/errors/Serbian/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-FTP nije omoguæen.
-
-
-
-
-što znaèi:
-
- Ovaj proksi server ne omoguèava FTP saobraæaj.
-
-
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_FAILURE squid-3.1.0.4/errors/Serbian/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-Desila se greška u FTP protokolu prilikom dovlaèenja URL-a:
%U
-
-
-Squid je poslao sledeæu FTP komandu:
-
%f
-i onda dobio sledeæi odgovor
-
%F
-
%g
-
-
Vaš keš/proksi administrator je: %w.
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Serbian/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-Prilikom pokušaja da se dovuèe URL:
%U
-nije uspela FTP autentifikacija.
-
-
-Squid je poslao sledeæu FTP komandu:
-
%f
-i onda dobio sledeæi odgovor
-
%F
-
%g
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Serbian/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,22 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-URL:
%U ne može da se dovuèe.
-
-
-Squid je poslao sledeæu FTP komandu:
-
%f
-i onda dobio sledeæi odgovor
-
%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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,8 +0,0 @@
-
-
-
FTP PUT uspešan: Fajl je prenesen
-
-
-
Operacija je okonèana uspešno.
-
Fajl je prenesen.
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
GREŠKA: FTP PUT/upload nije uspeo
-
-
-
GREŠKA
-
FTP upload nije uspeo
-
-
-Tokom pokušaja da se PRENESE strana sa sledeæom adresom (URL):
-%U
-
-dok je pokušavao da prenese (PUT) sledeæi URL:
-%U
-
-Squid je zadao sledeæu komandu:
-
- %f
-
-da bi dobio odgovor:
-
- %F
-
-
-
-što znaèi da:
-
-treba da proverite putanju, privilegije, raspoloživ prostor na disku i pokušate ponovo.
-
-
-
Vaš keš/proksi administrator je: %w.
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,8 +0,0 @@
-
-
-
FTP PUT uspešan: Fajl je osvežen
-
-
-
Operacija je okonèana uspešno.
-
Fajl je osvežen.
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Serbian/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Serbian/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-FTP server je bio preoptereæen prilikom pokušaja da se dovuèe URL:
%U
-
-
-Squid je poslao sledeæu FTP komandu:
-
%f
-i onda dobio sledeæi odgovor
-
%F
-
%g
-
-
Vaš keš/proksi administrator je: %w.
-
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_ICAP_FAILURE squid-3.1.0.4/errors/Serbian/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/Serbian/ERR_ICAP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuce
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuce
-
-
-Tokom pokušaja da se dovuce strana sa sledecom adresom (URL):
-%U
-
-Dogodila se sledeca greška:
-
--
-
-Greška u ICAP protokolu.
-
-
-
-
-Sistem je vratio:
-
%E
-
-
-Ovo znaci da:
-Neki aspekti ICAP protokola nisu u redu. Moguci problemi:
-
-- ICAP server je nedostupan.
-
- Pogrešan odgovor od ICAP servera.
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_INVALID_REQ squid-3.1.0.4/errors/Serbian/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Serbian/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,36 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Za vreme obrade sledeæeg zahteva:
-
-%R
-
-
-Desila se greška:
-
--
-
-Neispravan zahtev.
-
-
-
-
-Jedan od aspekta HTTP zahteva nije ispravan. Moguæi problemi:
-
-- 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.
-
-
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_INVALID_RESP squid-3.1.0.4/errors/Serbian/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Serbian/ERR_INVALID_RESP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuce
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuce
-
-
-U pokušaju da se izvrši zahtev:
-
-%R
-
-
-Desila se sledeca greška:
-
--
-
-Pogrešan odgovor
-
-
-
-
-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. Vaš keš administrator
-vas može informisati o detaljima prirode vašeg problema.
-
-
Vaš keš administrator je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_INVALID_URL squid-3.1.0.4/errors/Serbian/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Serbian/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Neispravna adresa (URL)
-
-
-
-Jedan od aspekata zahtevane adrese (URL) nije ispravan. Moguæi problemi:
-
-- 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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Serbian/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Serbian/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Dozvoljeno trajanje konekcije je prekoraèeno.
-
-
-
-Proksi server je prekinuo konekciju jer je prekoraèila
-dozvoljeno trajanje konekcije.
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_NO_RELAY squid-3.1.0.4/errors/Serbian/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Serbian/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Nema Wais relay-a
-
-
-
-Za ovaj proksi server nije definisan WAIS relay raèunar! Pitajte administratora.
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Serbian/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-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 koja
-je zabranjena direktivom only-if-cached.
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_READ_ERROR squid-3.1.0.4/errors/Serbian/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Serbian/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,32 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-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.3/errors/Serbian/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Serbian/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Serbian/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-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.3/errors/Serbian/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/Serbian/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/Serbian/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuce
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuce
-
-
-Tokom pokušaja da se dovuce strana sa sledecom adresom (URL):
-%U
-
-Dogodila se sledeca greška:
-
--
-
-Nije uspelo uspostavljanje sigune konekcije sa %I
-
-
-
-
-Sistem je vratio:
-
%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š administrator je %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Serbian/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Serbian/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,22 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Serbian/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Serbian/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Greška prilikom uspostavljanja konekcije (SOCKET)
-
-
-
-
-Sistem je dao povratnu informaciju:
-
%E
-
-
-što znaèi:
-
- Squid nije u stanju da kreira TCP socket, verovatno zbog preoptereæenosti.
- Molimo pokušajte ponovo.
-
-
-
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_TOO_BIG squid-3.1.0.4/errors/Serbian/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Serbian/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Zahtev ili odgovor je prevelik.
-
-
-Ukoliko je vaš zahtev POST ili PUT, onda je telo zahteva (to što
-pokušavate da upload-ujete) preveliko. Ako ste uputili GET zahtev,
-onda je telo odgovora (to što pokušavate da skinete) preveliko.
-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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_UNSUP_REQ squid-3.1.0.4/errors/Serbian/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Serbian/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Nepodržan metod ili protokol zahteva (request)
-
-
-
-
-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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_URN_RESOLVE squid-3.1.0.4/errors/Serbian/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Serbian/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) za URN ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URN):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Ne mogu da odgonetnem URN
-
-
-
-
-Hej, nemoj mnogo da oèekujes od URNova na %T! :)
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_WRITE_ERROR squid-3.1.0.4/errors/Serbian/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Serbian/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
-
-
-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.
diff -u -r -N squid-3.1.0.3/errors/Serbian/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Serbian/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Serbian/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Serbian/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
GREŠKA: Tražena adresa (URL) ne može da se dovuèe
-
-
-
GREŠKA
-
Tražena adresa (URL) ne može da se dovuèe
-
-
-Tokom pokušaja da se dovuèe strana sa sledeæom adresom (URL):
-%U
-
-Dogodila se sledeæa greška:
-
--
-
-Odgovor nulte dužine
-
-
-
-
-Proksi nije dobio nikakav odgovor na vaš zahtev.
-
Vaš keš/proksi administrator je: %w.
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Simplify_Chinese/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,31 +1,31 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,32 +1,32 @@
-
-
´íÎó£ºÍøÂ绺´æ·þÎñÆ÷¾Ü¾ø·ÃÎÊ
+
+
错误：网络缓å˜æœåŠ¡å™¨æ‹’ç»è®¿é—®
-
´íÎó
-
ÍøÂ绺´æ·þÎñÆ÷¾Ü¾ø·ÃÎÊ
+
错误
+
网络缓å˜æœåŠ¡å™¨æ‹’ç»è®¿é—®
-µ±³¢ÊÔ¶ÁÈ¡ÏÂÃæµÄÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–下é¢çš„网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Cache Access Denied.
-»º´æ·þÎñÆ÷¾Ü¾ø·ÃÎÊ
+缓å˜æœåŠ¡å™¨æ‹’ç»è®¿é—®
-±§Ç¸£¬Äú²»±»ÔÊÐíͨ¹ý±¾ÍøÂ绺´æ·þÎñÆ÷·ÃÎÊÏÂÁÐλÖãº
+抱æ‰ï¼Œæ‚¨ä¸è¢«å…许通过本网络缓å˜æœåŠ¡å™¨è®¿é—®ä¸‹åˆ—ä½ç½®ï¼š
%U
-³ý·ÇÄúͨ¹ýÁËÎÒÃǵÄÉí·ÝÑéÖ¤¡£
+除éžæ‚¨é€šè¿‡äº†æˆ‘们的身份验è¯ã€‚
@@ -36,9 +36,9 @@
difficulties authenticating yourself or
change your default password.
-ÄúÐèҪʹÓà Netscape version 2.0 »ò¸üеİ汾£¬»òÊÇʹÓà Microsoft Internet
-Explorer 3.0£¬»òÊÇÒ»¸ö HTTP/1.1 ÏàÈݵÄä¯ÀÀÆ÷À´½øÐй¤×÷¡£Èç¹ûÄúÔÚÉí·ÝÑéÖ¤ÉÏ
-·¢ÉúÀ§ÄÑ£¬ÇëÓë ¹ÜÀíÕß ÁªÏµ¡£
-»òÊǸü¸ÄÄúµÄÃÜÂë¡£
+您需è¦ä½¿ç”¨ Netscape version 2.0 或更新的版本，或是使用 Microsoft Internet
+Explorer 3.0，或是一个 HTTP/1.1 相容的æµè§ˆå™¨æ¥è¿›è¡Œå·¥ä½œã€‚如果您在身份验è¯ä¸Š
+å‘生困难，请与 管ç†è€… è”系。
+或是更改您的密ç 。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,32 +1,32 @@
-
-
´íÎ󣺻º´æ¹ÜÀíÆ÷¾Ü¾ø·ÃÎÊ
+
+
错误：缓å˜ç®¡ç†å™¨æ‹’ç»è®¿é—®
-
´íÎó
-
»º´æ¹ÜÀíÆ÷¾Ü¾ø·ÃÎÊ
+
错误
+
缓å˜ç®¡ç†å™¨æ‹’ç»è®¿é—®
-µ±³¢ÊÔ¶ÁÈ¡ÏÂÃæµÄÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–下é¢çš„网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Cache Manager Access Denied.
-»º´æ¹ÜÀíÆ÷¾Ü¾ø·ÃÎÊ
+缓å˜ç®¡ç†å™¨æ‹’ç»è®¿é—®
-±§Ç¸£¬Äú²»±»ÔÊÐíͨ¹ý±¾»º´æ¹ÜÀíÆ÷·ÃÎÊÒÔÏÂλÖãº
+抱æ‰ï¼Œæ‚¨ä¸è¢«å…许通过本缓å˜ç®¡ç†å™¨è®¿é—®ä»¥ä¸‹ä½ç½®ï¼š
%U
-³ý·ÇÄúͨ¹ýÎÒÃǵÄÉí·ÝÑéÖ¤¡£
+除éžæ‚¨é€šè¿‡æˆ‘们的身份验è¯ã€‚
You need to use Netscape version 2.0 or greater, or Microsoft Internet
@@ -36,10 +36,10 @@
administrator, read Squid documentation on cache manager interface and check
cache log for more detailed error messages.
-ÄúÐèҪʹÓà Netscape version 2.0 »ò×îеİ汾£¬»òÊÇʹÓà Microsoft Internet
-Explorer 3.0£¬»òÊÇÒ»¸ö HTTP/1.1 ÏàÈݵÄä¯ÀÀÆ÷À´½øÐй¤×÷¡£Èç¹ûÄúÊÇÔÚÉí·ÝÑéÖ¤ÉÏ·¢
-ÉúÎÊÌ⣬ÇëÏÈÈ·¶¨ÄúÓÐȨ¶Ô»º´æʹÓùÜÀíÆ÷¡£
-»òÊÇÓë¹ÜÀíÕßÁªÏµ¡£Èç¹ûÄú¾ÍÊǹÜÀíÕߣ¬ÇëÏêϸÔĶÁ Squid Ëù¸½ÎļþÖÐÓë
-cache manager Óйز¿·Ý»ò¼ì²é cache log ÒÔ±ãµÃµ½¸üÏ꾡µÄϸ½Ú¡£
+您需è¦ä½¿ç”¨ Netscape version 2.0 或最新的版本，或是使用 Microsoft Internet
+Explorer 3.0，或是一个 HTTP/1.1 相容的æµè§ˆå™¨æ¥è¿›è¡Œå·¥ä½œã€‚如果您是在身份验è¯ä¸Šå‘
+生问题，请先确定您有æƒå¯¹ç¼“å˜ä½¿ç”¨ç®¡ç†å™¨ã€‚
+或是与管ç†è€…è”系。如果您就是管ç†è€…，请详细阅读 Squid 所附文件ä¸ä¸Ž
+cache manager 有关部份或检查 cache log 以便得到更详尽的细节。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_CANNOT_FORWARD 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
-
´íÎó£»ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误；您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÏÂÃæµÄÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–下é¢çš„网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Unable to forward this request at this time.
-Ä¿Ç°ÎÞ·¨½«ÄúµÄÇëÇó½øÐÐתËͲÙ×÷
+ç›®å‰æ— 法将您的请求进行转é€æ“作
@@ -31,10 +31,10 @@
-ÄúµÄÇëÇóÎÞ·¨±»×ªË͵½ÔʼÍøÂç·þÎñÆ÷»òÆäËûµÄÉϲ㻺´æ·þÎñÆ÷£¬·¢ÉúÕâ¸öÎÊÌâ×î¿ÉÄܵÄÔÒòÊÇ£º
+æ‚¨çš„è¯·æ±‚æ— æ³•è¢«è½¬é€åˆ°åŽŸå§‹ç½‘络æœåŠ¡å™¨æˆ–其他的上层缓å˜æœåŠ¡å™¨ï¼Œå‘生这个问题最å¯èƒ½çš„åŽŸå› æ˜¯ï¼š
-- »º´æ·þÎñÆ÷¹ÜÀíÔ±²»ÔÊÐí±¾·þÎñÆ÷ÓëÔʼÍøÂç·þÎñÆ÷Ö±½ÓÁ¬½á£¬¶ø
-
- ËùÓб¾·þÎñÆ÷Ö¸¶¨µÄÉϲ㻺´æ·þÎñÆ÷¶¼ÔÝʱÎÞ·¨Á¬½á¡£
+
- 缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ä¸å…许本æœåŠ¡å™¨ä¸ŽåŽŸå§‹ç½‘络æœåŠ¡å™¨ç›´æŽ¥è¿žç»“，而
+
- 所有本æœåŠ¡å™¨æŒ‡å®šçš„上层缓å˜æœåŠ¡å™¨éƒ½æš‚æ—¶æ— æ³•è¿žç»“ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Simplify_Chinese/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,33 +1,33 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Connection Failed
-Á¬½Óʧ°Ü
+连接失败
-ϵͳ·µ»ØÒÔÏÂÄÚÈÝ£º
+系统返回以下内容：
%E
The remote host or network may be down. Please try the request again.
-ÄúÒªÁ¬½áµÄÍøÂç·þÎñÆ÷»òÍøÂç¿ÉÄÜ·¢Éú¹ÊÕÏ¡£ÇëÉÔºóÔÙÊÔ¡£
+您è¦è¿žç»“的网络æœåŠ¡å™¨æˆ–网络å¯èƒ½å‘生故障。请ç¨åŽå†è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_DNS_FAIL squid-3.1.0.4/errors/Simplify_Chinese/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_DNS_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,34 +1,34 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-ÎÞ·¨½«ÄúÊäÈëµÄÖ÷»úÃû³Æ£º%Hת»»³É IP µØÖ·
+æ— æ³•å°†æ‚¨è¾“å…¥çš„ä¸»æœºå称：%H转æ¢æˆ IP 地å€
-ÓòÃû·þÎñÆ÷·µ»ØÒÔÏÂѶϢ£º
+域åæœåŠ¡å™¨è¿”回以下讯æ¯ï¼š
%z
-Õâ±íʾ£º
+这表示：
The cache was not able to resolve the hostname presented in the URL.
Check if the address is correct.
- »º´æ·þÎñÆ÷ÎÞ·¨½âÎöÄúÊäÈëÍøÖ·£¨URL£©ÖеÄÖ÷»úÃû³Æ£¬
- Çë¼ì²é¸ÃÃû³ÆÊÇ·ñÕýÈ·¡£
+ 缓å˜æœåŠ¡å™¨æ— 法解æžæ‚¨è¾“入网å€ï¼ˆURL）ä¸çš„主机å称，
+ 请检查该å称是å¦æ£ç¡®ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FORWARDING_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Forwarding Denied.
-¾Ü¾øתËÍ
+æ‹’ç»è½¬é€
@@ -26,7 +26,7 @@
sibling relationship. Perhaps the client at %i is a cache which has been
misconfigured.
-±¾»º´æ·þÎñÆ÷ÎÞ·¨×ªËÍÄúµÄÇëÇó£¬Ò²ÐíÄúÊÇͨ¹ýÒ»¸ö²¢Î´±»±¾»º´æ·þÎñÆ÷
-É趨ΪÔÊÐí´æÈ¡µÄ»º´æ·þÎñÆ÷£¨%i£©À´·ÃÎʵġ£
+本缓å˜æœåŠ¡å™¨æ— 法转é€æ‚¨çš„请求，也许您是通过一个并未被本缓å˜æœåŠ¡å™¨
+设定为å…许å˜å–的缓å˜æœåŠ¡å™¨ï¼ˆ%i）æ¥è®¿é—®çš„。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_DISABLED squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_DISABLED 2009-01-23 18:37:28.000000000 +1300
@@ -1,29 +1,29 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
FTP is Disabled
-½ûֹʹÓÃÎļþ´«ÊäÐÒé
+ç¦æ¢ä½¿ç”¨æ–‡ä»¶ä¼ 输åè®®
This cache does not support FTP.
-±¾»º´æ·þÎñÆ÷먦·ÅÎļþ´«Êä·þÎñ¡£
+本缓å˜æœåŠ¡å™¨æœªå¼€æ”¾æ–‡ä»¶ä¼ 输æœåŠ¡ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_FAILURE squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±·¢ÉúÎļþ´«ÊäÐÒé´íÎó£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时å‘ç”Ÿæ–‡ä»¶ä¼ è¾“å议错误：
%U
-±¾»º´æ·þÎñÆ÷·¢³öÒÔÏ FTP ÃüÁ
+本缓å˜æœåŠ¡å™¨å‘出以下 FTP 命令：
%f
-È»ºóÊÕµ½ÈçÏ»ØÓ¦£º
+然åŽæ”¶åˆ°å¦‚下回应：
%F
%g
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±Îļþ´«ÊäÐÒ飨FTP£©Éí·ÝÑé֤ʧ°Ü£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURLï¼‰æ—¶æ–‡ä»¶ä¼ è¾“å议（FTP）身份验è¯å¤±è´¥ï¼š
%U
-±¾»º´æ·þÎñÆ÷·¢³öÒÔÏ FTP ÃüÁ
+本缓å˜æœåŠ¡å™¨å‘出以下 FTP 命令：
%f
-È»ºóÊÕµ½ÈçÏ»ØÓ¦£º
+然åŽæ”¶åˆ°å¦‚下回应：
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-ÒÔÏÂÍøÖ·ÎÞ·¨¶ÁÈ¡£º
+以下网å€æ— 法读å–：
%U
-±¾»º´æ·þÎñÆ÷·¢³öÒÔÏ FTP ÃüÁ
+本缓å˜æœåŠ¡å™¨å‘出以下 FTP 命令：
%f
-È»ºóÊÕµ½ÈçÏ»ØÓ¦£º
+然åŽæ”¶åˆ°å¦‚下回应：
%F
%g
-Õâ¿ÉÄÜÊÇÓÉÓÚ FTP ÍøÖ·£¨URL£©Öаüº¬Á˾ø¶Ô·¾¶ËùÖ£¨²»·ûºÏ RFC1738£©¡£Èç¹ûÕæµÄÊÇÕâÑù£¬
-Îļþ¿ÉÒÔ´Ó%BλÖÃÕÒµ½¡£
+è¿™å¯èƒ½æ˜¯ç”±äºŽ FTP 网å€ï¼ˆURL）ä¸åŒ…å«äº†ç»å¯¹è·¯å¾„所致（ä¸ç¬¦åˆ RFC1738ï¼‰ã€‚å¦‚æžœçœŸçš„æ˜¯è¿™æ ·ï¼Œ
+文件å¯ä»¥ä»Ž%Bä½ç½®æ‰¾åˆ°ã€‚
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED 2009-01-23 18:37:28.000000000 +1300
@@ -1,11 +1,11 @@
-
-
ÎļþÉÏ´« PUT Ö¸ÁîÍê³É£ºÎļþÒѱ»½¨Á¢
+
+
æ–‡ä»¶ä¸Šä¼ PUT 指令完æˆï¼šæ–‡ä»¶å·²è¢«å»ºç«‹
-
²Ù×÷³É¹¦
-
ÎļþÒѽ¨Á¢
+
æ“作æˆåŠŸ
+
文件已建立
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
´íÎó£ºÎļþÉÏ´«Ê§°Ü
+
+
é”™è¯¯ï¼šæ–‡ä»¶ä¸Šä¼ å¤±è´¥
-
´íÎó
-
ÎļþÉÏ´«£¨FTP PUT£©²Ù×÷ʧ°Ü
+
错误
+
æ–‡ä»¶ä¸Šä¼ ï¼ˆFTP PUT）æ“作失败
-µ±³¢ÊÔÉÏ´«£¨PUT£©µ½ÒÔÏÂλÖÃʱ£º
+当å°è¯•ä¸Šä¼ （PUT）到以下ä½ç½®æ—¶ï¼š
%U
-±¾»º´æ·þÎñÆ÷·¢³öÒÔÏ FTP ÃüÁ
+本缓å˜æœåŠ¡å™¨å‘出以下 FTP 命令：
%f
-È»ºóÊÕµ½ÈçÏ»ØÓ¦£º
+然åŽæ”¶åˆ°å¦‚下回应：
%F
-Çë¼ì²éÉÏ´«Â·¾¶£¬ÉÏ´«Î»ÖöÁдȨÏÞ£¬¿ÉÓôÅÅÌ¿Õ¼äºóÔÙ½øÐг¢ÊÔ¡£
+è¯·æ£€æŸ¥ä¸Šä¼ è·¯å¾„ï¼Œä¸Šä¼ ä½ç½®è¯»å†™æƒé™ï¼Œå¯ç”¨ç£ç›˜ç©ºé—´åŽå†è¿›è¡Œå°è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,11 +1,11 @@
-
-
ÎļþÉÏ´« PUT Ö¸ÁîÍê³É£ºÎļþÒѱ»¸üÐÂ
+
+
æ–‡ä»¶ä¸Šä¼ PUT 指令完æˆï¼šæ–‡ä»¶å·²è¢«æ›´æ–°
-
²Ù×÷³É¹¦
-
ÎļþÒѸüÐÂ
+
æ“作æˆåŠŸ
+
文件已更新
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:28.000000000 +1300
@@ -1,20 +1,20 @@
-
-
´íÎó: ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误: 您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê± FTP ·þÎñÆ÷¹ý棺
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时 FTP æœåŠ¡å™¨è¿‡å¿™ï¼š
%U
-±¾»º´æ·þÎñÆ÷·¢³öÒÔÏ FTP ÃüÁ
+本缓å˜æœåŠ¡å™¨å‘出以下 FTP 命令：
%f
-È»ºóÊÕµ½ÈçÏ»ØÓ¦£º
+然åŽæ”¶åˆ°å¦‚下回应：
%F
%g
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_INVALID_REQ squid-3.1.0.4/errors/Simplify_Chinese/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_INVALID_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,45 +1,45 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ½øÐÐÒÔÏÂÇëÇóʱ£º
+当å°è¯•è¿›è¡Œä»¥ä¸‹è¯·æ±‚时：
%R
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Invalid Request
-ÎÞЧµÄÇëÇó
+æ— æ•ˆçš„è¯·æ±‚
Some aspect of the HTTP Request is invalid. Possible problems:
-HTTP ÇëÇóµÄijЩ·½ÃæÊÇÎÞЧµÄ¡£¿ÉÄÜÊÇÏÂÁÐÎÊÌ⣺
+HTTP 请求的æŸäº›æ–¹é¢æ˜¯æ— 效的。å¯èƒ½æ˜¯ä¸‹åˆ—问题：
- Missing or unknown request method
-
ȱÉÙÇëÇó·½Ê½»òδ֪µÄÇëÇó·½Ê½
+
缺少请求方å¼æˆ–未知的请求方å¼
- Missing URL
-
ȱÉÙÍøÖ·
+
缺少网å€
- Missing HTTP Identifier (HTTP/1.0)
-
ȱÉÙ HTTP ±êʶ£¨HTTP/1.0£©
+
缺少 HTTP æ ‡è¯†ï¼ˆHTTP/1.0）
- Request is too large
-
ÇëÇóÃüÁî¹ý³¤
+
请求命令过长
- Content-Length missing for POST or PUT requests
-
POST »ò PUT ÇëÇóȱÉÙÄÚÈݳ¤¶È
+
POST 或 PUT 请求缺少内容长度
- Illegal character in hostname; underscores are not allowed
-
Ö÷»úÃû³ÆÖаüº¬²»ºÏ·¨µÄ×Ö·û£»Ï»®ÏßÊDz»ÔÊÐíµÄ¡£
+
主机å称ä¸åŒ…å«ä¸åˆæ³•çš„å—符；下划线是ä¸å…许的。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w.
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w.
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_INVALID_URL squid-3.1.0.4/errors/Simplify_Chinese/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_INVALID_URL 2009-01-23 18:37:28.000000000 +1300
@@ -1,39 +1,39 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Invalid URL
-ÎÞЧµÄÍøÖ·
+æ— æ•ˆçš„ç½‘å€
Some aspect of the requested URL is incorrect. Possible problems:
-ÊäÈëÍøÖ·µÄijЩµØ·½ÓÐÎ󣬿ÉÄÜÊÇÒòΪ£º
+输入网å€çš„æŸäº›åœ°æ–¹æœ‰è¯¯ï¼Œå¯èƒ½æ˜¯å› 为：
- Missing or incorrect access protocol (should be `http://'' or similar)
-
ȱÉÙ»ò²»ÕýÈ·µÄͨѶÐÒ飨Ӧ¸ÃÈç `http://''»òÀàËƵĿªÍ·£©
+
缺少或ä¸æ£ç¡®çš„通讯å议（应该如 `http://''或类似的开头）
- Missing hostname
-
ȱÉÙÓûÁ¬½áµÄÖ÷»úÃû³Æ
+
缺少欲连结的主机å称
- Illegal double-escape in the URL-Path
-
Íøַ·¾¶ÖÐÓв»ºÏ·¨Ë«ÖØתÒå·û
+
网å€è·¯å¾„ä¸æœ‰ä¸åˆæ³•åŒé‡è½¬ä¹‰ç¬¦
- Illegal character in hostname; underscores are not allowed
-
Ö÷»úÃû³ÆÖаüº¬²»ºÏ·¨µÄ×Ö·û£»Ï»®ÏßÊDz»ÔÊÐíµÄ¡£
+
主机å称ä¸åŒ…å«ä¸åˆæ³•çš„å—符；下划线是ä¸å…许的。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Simplify_Chinese/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_LIFETIME_EXP 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Connection Lifetime Expired
-Á¬½Ó³¬Ê±
+连接超时
@@ -25,6 +25,6 @@
Squid has terminated the request because it has exceeded the maximum
connection lifetime.
-»º´æ·þÎñÆ÷ÒÑÖÕÖ¹ÄúµÄÁ¬½ÓÇëÇó£¬ÒòΪÒѾ³¬¹ýÁË×î´óÁ¬½ÓµÈ´ýʱ¼ä¡£
+缓å˜æœåŠ¡å™¨å·²ç»ˆæ¢æ‚¨çš„è¿žæŽ¥è¯·æ±‚ï¼Œå› ä¸ºå·²ç»è¶…过了最大连接ç‰å¾…时间。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_NO_RELAY squid-3.1.0.4/errors/Simplify_Chinese/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_NO_RELAY 2009-01-23 18:37:28.000000000 +1300
@@ -1,29 +1,29 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
No Wais Relay
-ÎÞ Wais ÖмÌ
+æ— Wais ä¸ç»§
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
-±¾»º´æ·þÎñÆ÷ûÓÐÉ趨 WAIS ÖмÌÖ÷»ú£¡ÈçÓÐÒÉÎÊÇëÓ뻺´æ·þÎñÆ÷¹ÜÀíÔ±ÁªÏµ¡£
+本缓å˜æœåŠ¡å™¨æ²¡æœ‰è®¾å®š WAIS ä¸ç»§ä¸»æœºï¼å¦‚有疑问请与缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜è”系。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:28.000000000 +1300
@@ -1,25 +1,25 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Valid document was not found in the cache and
only-if-cached
directive was specified.
-ÇëÇóµÄÎļþÔÚ±¾»º´æ·þÎñÆ÷ÉÏδÕÒµ½£¬¶øÄúÉ趨ÁËonly-if-cached£¨Ö»¶ÁÈ¡»º´æ£©
-Ö¸Áî¡£
+请求的文件在本缓å˜æœåŠ¡å™¨ä¸Šæœªæ‰¾åˆ°ï¼Œè€Œæ‚¨è®¾å®šäº†only-if-cached（åªè¯»å–缓å˜ï¼‰
+指令。
@@ -29,8 +29,8 @@
directive. The document was not found in the cache,
or it required
revalidation prohibited by
only-if-cached directive.
-ÄúËͳöÁËÒ»¸ö°üº¬
only-if-cached £¨Ö»¶ÁÈ¡»º´æ£©»º´æ¿ØÖÆÖ¸ÁîµÄÁ¬½áÇëÇó¡£
-¶øËùÒªµÄÎļþ²¢Î´´æÔÚÓÚ±¾»º´æ·þÎñÆ÷ÖУ¬
»òÕßÕâ¸öÁ¬½áÇëÇóÐèҪˢÐÂÎļþ¶ø
-
only-if-cached Ö¸Áî½ûÖ¹Õâô×ö¡£
+您é€å‡ºäº†ä¸€ä¸ªåŒ…å«
only-if-cached （åªè¯»å–缓å˜ï¼‰ç¼“å˜æŽ§åˆ¶æŒ‡ä»¤çš„连结请求。
+而所è¦çš„文件并未å˜åœ¨äºŽæœ¬ç¼“å˜æœåŠ¡å™¨ä¸ï¼Œ
或者这个连结请求需è¦åˆ·æ–°æ–‡ä»¶è€Œ
+
only-if-cached 指令ç¦æ¢è¿™ä¹ˆåšã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_READ_ERROR squid-3.1.0.4/errors/Simplify_Chinese/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_READ_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,34 +1,34 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Read Error
-¶ÁÈ¡´íÎó
+读å–错误
-ϵͳ»ØÓ¦£º
+系统回应：
%E
An error condition occurred while reading data from the network. Please
retry your request.
-ÕýÔÚͨ¹ýÍøÂç¶ÁÈ¡Êý¾Ýʱ·¢ÉúÁË´íÎó£¬ÇëÖØг¢ÊÔ¡£
+æ£åœ¨é€šè¿‡ç½‘络读å–æ•°æ®æ—¶å‘生了错误，请é‡æ–°å°è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Simplify_Chinese/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_READ_TIMEOUT 2009-01-23 18:37:28.000000000 +1300
@@ -1,35 +1,35 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Read Timeout
-¶ÁÈ¡³¬Ê±
+读å–超时
-ϵͳ»ØÓ¦£º
+系统回应：
%E
A Timeout occurred while waiting to read data from the network. The network
or server may be down or congested. Please retry your request.
-µ±Í¨¹ýÍøÂç¶ÁÈ¡Êý¾Ýʱ£¬³¬¹ýÁ˵ȴýʱÏÞ¡£
-¿ÉÄÜÊÇÒòΪÍøÂç¶ÂÈû»òÁ¬½ÓµÄÍøÂç·þÎñÆ÷Òѹرա£ÇëÖØг¢ÊÔ¡£
+当通过网络读å–æ•°æ®æ—¶ï¼Œè¶…过了ç‰å¾…æ—¶é™ã€‚
+å¯èƒ½æ˜¯å› ä¸ºç½‘ç»œå µå¡žæˆ–è¿žæŽ¥çš„ç½‘ç»œæœåŠ¡å™¨å·²å…³é—。请é‡æ–°å°è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_SHUTTING_DOWN 2009-01-23 18:37:28.000000000 +1300
@@ -1,24 +1,24 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
This cache is in the process of shutting down and can not
service your request at this time. Please retry your
request again soon.
-±¾»º´æ·þÎñÆ÷ÕýÔڹرգ¬ÔÝʱÎÞ·¨ÎªÄú·þÎñ¡£
-ÇëÉÔºîÔÙÊÔ¡£
+本缓å˜æœåŠ¡å™¨æ£åœ¨å…³é—ï¼Œæš‚æ—¶æ— æ³•ä¸ºæ‚¨æœåŠ¡ã€‚
+请ç¨ä¾¯å†è¯•ã€‚
-±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_SOCKET_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,35 +1,35 @@
-
-´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-´íÎó
-ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+错误
+您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Socket Failure
-Socket ½¨Á¢Ê§°Ü
+Socket 建立失败
-ϵͳ»ØÓ¦£º
+系统回应：
%E
Squid is unable to create a TCP socket, presumably due to excessive load.
Please retry your request.
-Squid £¨»º´æ·þÎñÆ÷£©ÎÞ·¨½¨Á¢ TCP socket£¨ÎÞ·¨ÏòϵͳÉêÇ뽨Á¢ÐµÄÍøÂçÁ¬½Ó£©£¬
-¿ÉÄÜÊÇÒòΪ¸ººÉ¹ýÖØ£¬ÇëÖØг¢ÊÔ¡£
+Squid （缓å˜æœåŠ¡å™¨ï¼‰æ— 法建立 TCP socketï¼ˆæ— æ³•å‘系统申请建立新的网络连接），
+å¯èƒ½æ˜¯å› 为负è·è¿‡é‡ï¼Œè¯·é‡æ–°å°è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_TOO_BIG squid-3.1.0.4/errors/Simplify_Chinese/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_TOO_BIG 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_UNSUP_REQ squid-3.1.0.4/errors/Simplify_Chinese/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_UNSUP_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Unsupported Request Method and Protocol
-²»Ö§³ÖµÄÇëÇó·½Ê½ºÍÐÒé
+ä¸æ”¯æŒçš„请求方å¼å’Œåè®®
@@ -25,7 +25,7 @@
Squid does not support all request methods for all access protocols.
For example, you can not POST a Gopher request.
-Squid £¨»º´æ·þÎñÆ÷£©²»ÄܶÔËùÓеĴæÈ¡ÐÒéÖ§³ÖËùÓеÄÇëÇó·½Ê½¡£
-±ÈÈç˵£¬Äã²»ÄÜ¶Ô GOPHER ½øÐÐÒ»¸ö POST ÇëÇó¡£
+Squid （缓å˜æœåŠ¡å™¨ï¼‰ä¸èƒ½å¯¹æ‰€æœ‰çš„å˜å–å议支æŒæ‰€æœ‰çš„请求方å¼ã€‚
+æ¯”å¦‚è¯´ï¼Œä½ ä¸èƒ½å¯¹ GOPHER 进行一个 POST 请求。
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_URN_RESOLVE squid-3.1.0.4/errors/Simplify_Chinese/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_URN_RESOLVE 2009-01-23 18:37:28.000000000 +1300
@@ -1,29 +1,29 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄ URN ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的 URN æ— æ³•èŽ·å–
-
´íÎó
-
URN ÖеÄÒ»¸öÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
URN ä¸çš„一个网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏ URN ʱ£º
+当å°è¯•è¯»å–以下 URN 时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Cannot Resolve URN
-ÎÞ·¨½âÎö URN
+æ— æ³•è§£æž URN
Hey, don't expect too much from URNs on %T :)
-±§Ç¸£¡Äú²»ÄÜ¶Ô %T É쵀 URNs ÆÚ´ýÌ«¶à :)
+抱æ‰ï¼æ‚¨ä¸èƒ½å¯¹ %T 上的 URNs 期待太多 :)
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_WRITE_ERROR squid-3.1.0.4/errors/Simplify_Chinese/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_WRITE_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,34 +1,34 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Write Error
-дÈë´íÎó
+写入错误
-ϵͳ»ØÓ¦£º
+系统回应：
%E
An error condition occurred while writing to the network. Please retry your
request.
-ͨ¹ýÍøÂçдÈëÊý¾Ýʱ·¢ÉúÁË´íÎó£¬ÇëÖØг¢ÊÔ¡£
+通过网络写入数æ®æ—¶å‘生了错误，请é‡æ–°å°è¯•ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:28.000000000 +1300
@@ -1,29 +1,29 @@
-
-
´íÎó£ºÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
+
错误：您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-
´íÎó
-
ÄúËùÇëÇóµÄÍøÖ·£¨URL£©ÎÞ·¨»ñÈ¡
+
错误
+
您所请求的网å€ï¼ˆURLï¼‰æ— æ³•èŽ·å–
-µ±³¢ÊÔ¶ÁÈ¡ÒÔÏÂÍøÖ·£¨URL£©Ê±£º
+当å°è¯•è¯»å–以下网å€ï¼ˆURL）时：
%U
-·¢ÉúÁËÏÂÁеĴíÎó£º
+å‘生了下列的错误：
-
Zero Sized Reply
-ÏìÓ¦ÄÚÈݳ¤¶ÈΪÁã
+å“应内容长度为零
Squid did not receive any data for this request.
-±¾»º´æ·þÎñÆ÷´Ó±»Á¬½ÓµÄ·þÎñÆ÷ÉÏûÓÐÊÕµ½ÈκÎÊý¾Ý¡£
+本缓å˜æœåŠ¡å™¨ä»Žè¢«è¿žæŽ¥çš„æœåŠ¡å™¨ä¸Šæ²¡æœ‰æ”¶åˆ°ä»»ä½•æ•°æ®ã€‚
-
±¾»º´æ·þÎñÆ÷¹ÜÀíÔ±£º%w
+
本缓å˜æœåŠ¡å™¨ç®¡ç†å‘˜ï¼š%w
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Slovak/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Slovak/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,26 +1,26 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
Access Denied.
-Pístup k dokumentu Vám teraz nebol umo¾nený v dôsledku nedostatoèných
-prístupových práv. Ak si myslíte, ¾e je to chyba, kontaktujte prosím správcu
-daného systému.
+PÃstup k dokumentu Vám teraz nebol umožnený v dôsledku nedostatoÄných
+prÃstupových práv. Ak si myslÃte, že je to chyba, kontaktujte prosÃm správcu
+daného systému.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Slovak/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Slovak/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,6 +1,6 @@
-
+
CHYBA: Cache Access Denied
@@ -9,10 +9,10 @@
Cache Access Denied
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
Prepáète, ale prístup k:
+
PrepáÄte, ale prÃstup k:
%U
-je povolený a¾ po autentifikácii.
+je povolený až po autentifikácii.
-Na to, aby ste boli schopný sa autentifikova» potrebujete prehliadaè
-Netscape verzia 2.0 alebo vy¹¹iu, Microsoft Internet Explorer 3.0 alebo
-prehliadaè podporujúci protokol HTTP/1.1. Ak máte problém pri
-autentifikácii, kontaktujte prosím cache
-administrátora alebo si
-zmeòte Va¹e implicitné heslo.
+Na to, aby ste boli schopný sa autentifikovaÅ¥ potrebujete prehliadaÄ
+Netscape verzia 2.0 alebo vyššiu, Microsoft Internet Explorer 3.0 alebo
+prehliadaÄ podporujúci protokol HTTP/1.1. Ak máte problém pri
+autentifikácii, kontaktujte prosÃm cache
+administrátora alebo si
+zmeňte Vaše implicitné heslo.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,6 +1,6 @@
-
+
CHYBA: Cache Manager Access Denied
@@ -9,10 +9,10 @@
Cache Manager Access Denied
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
Prístup k dokumentu:
+
PrÃstup k dokumentu:
%U
-Vám bude povolený a¾ po Va¹ej autentifikácii.
+Vám bude povolený až po Vašej autentifikácii.
-
Na to, aby ste boli schopný sa autentifikova» potrebujete prehliadaè
-Netscape verzia 2.0 alebo vy¹¹iu, Microsoft Internet Explorer 3.0 alebo
-prehliadaè podporujúci protokol HTTP/1.1. Ak máte problém pri
-autentifikácii, kontaktujte prosím cache administrátora.
-Ak Vy sám ste administrátor, preèítajte si prosím dokumentáciu k
-rozhraniu cache mana¾éra a prezrite si detailnej¹ie chybové hlásenie v cache
+
Na to, aby ste boli schopný sa autentifikovaÅ¥ potrebujete prehliadaÄ
+Netscape verzia 2.0 alebo vyššiu, Microsoft Internet Explorer 3.0 alebo
+prehliadaÄ podporujúci protokol HTTP/1.1. Ak máte problém pri
+autentifikácii, kontaktujte prosÃm cache administrátora.
+Ak Vy sám ste administrátor, preÄÃtajte si prosÃm dokumentáciu k
+rozhraniu cache manažéra a prezrite si detailnejšie chybové hlásenie v cache
logu.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Slovak/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Slovak/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_CANNOT_FORWARD 2009-01-23 18:37:28.000000000 +1300
@@ -1,30 +1,30 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
-Po¾iadavku teraz nie je mo¾né presmerova».
+Požiadavku teraz nie je možné presmerovať.
-Po¾iadavka nemô¾e by» presmerovaná k pôvodnému serveru alebo nadradeným
-cache serverom. Príèinou mô¾e by»:
+Požiadavka nemôže byť presmerovaná k pôvodnému serveru alebo nadradeným
+cache serverom. PrÃÄinou môže byÅ¥:
-- Cache server administrátor nedovolil tomuto cache serveru priamy prístup k
- pôvodnym serverom a
-
- v¹etky nadradené cache servery su práve nedostupné
+
- Cache server administrátor nedovolil tomuto cache serveru priamy prÃstup k
+ pôvodnym serverom a
+
- všetky nadradené cache servery su práve nedostupné
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Slovak/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Slovak/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Systém odpovedal:
+Systém odpovedal:
%E
-Vzdialený server alebo sie» sú nedostupné. Opakujte prosím Va¹u po¾iadavku.
+Vzdialený server alebo sieÅ¥ sú nedostupné. Opakujte prosÃm VaÅ¡u požiadavku.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_DNS_FAIL squid-3.1.0.4/errors/Slovak/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Slovak/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_DNS_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Nie je mo¾né previes» názov poèítaèa na IP adresu
+Nie je možné previesÅ¥ názov poÄÃtaÄa na IP adresu
%H
@@ -25,10 +25,10 @@
-To znamená, ¾e:
+To znamená, že:
- Cache server nebol schopný získa» adresu uvedenú v URL.
- Skontrolujte prosím adresu.
+ Cache server nebol schopný zÃskaÅ¥ adresu uvedenú v URL.
+ Skontrolujte prosÃm adresu.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Slovak/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Slovak/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FORWARDING_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Tento server nepresmeruje Va¹u po¾iadavku preto¾e mu to nedovoµujú vz»ahy v
-hierarchii cache serverov. Cache server %i je mo¾no zle nakonfigurovaný.
+Tento server nepresmeruje Vašu požiadavku pretože mu to nedovoľujú vzťahy v
+hierarchii cache serverov. Cache server %i je možno zle nakonfigurovaný.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_DISABLED squid-3.1.0.4/errors/Slovak/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_DISABLED 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-
Po¾adovaný dokument je nedostupný
+
Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_FAILURE squid-3.1.0.4/errors/Slovak/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,24 +1,24 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k"
+Pri pokuse o prÃstup k"
%U
sa vyskytla chyba FTP.
-Squid odoslal nasledujúci FTP príkaz:
+Squid odoslal nasledujúci FTP prÃkaz:
%f
-a obdr¾al túto odpoveï:
+a obdržal túto odpoveÄ:
%F
%g
-To mô¾e by» spôsobené uvedením absolútnej cesty v FTP URL (èo odporuje RFC
-1738). V tomto prípade by ste dokument mohli nájs» na %B.
+To môže byÅ¥ spôsobené uvedenÃm absolútnej cesty v FTP URL (Äo odporuje RFC
+1738). V tomto prÃpade by ste dokument mohli nájsÅ¥ na %B.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Slovak/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_FORBIDDEN 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse získa» URL sa vyskytla chyba autentifikácie:
+Pri pokuse zÃskaÅ¥ URL sa vyskytla chyba autentifikácie:
%U
-Squid zaslal nasledujúci FTP príkaz:
+Squid zaslal nasledujúci FTP prÃkaz:
%f
-a obdr¾al nasledovnú opoveï:
+a obdržal nasledovnú opoveÄ:
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Slovak/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_NOT_FOUND 2009-01-23 18:37:28.000000000 +1300
@@ -1,23 +1,23 @@
-
+
CHYBA: Pozadovane URL je nedostupne
CHYBA
-Po¾adované URL je nedostupné
+Požadované URL je nedostupné
-Nasledovné URL je nedostupné:
+Nasledovné URL je nedostupné:
%U
-Squid zaslal nasledujúci FTP príkaz:
+Squid zaslal nasledujúci FTP prÃkaz:
%f
-a obdr¾al nasledovnú opoveï:
+a obdržal nasledovnú opoveÄ:
%F
%g
-To mô¾e by» spôsobené uvedením absolútnej cesty v FTP URL (èo odporuje RFC
-1738). V tomto prípade by ste dokument mohli nájs» na %B.
+To môže byÅ¥ spôsobené uvedenÃm absolútnej cesty v FTP URL (Äo odporuje RFC
+1738). V tomto prÃpade by ste dokument mohli nájsÅ¥ na %B.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_CREATED 2009-01-23 18:37:28.000000000 +1300
@@ -1,11 +1,11 @@
-
+
operacia FTP PUT uspesna: subor vytvoreny
-operácia úspe¹ná
-súbor vytvorený
+operácia úspešná
+súbor vytvorený
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,28 +1,28 @@
-
+
CHYBA: neuspesny FTP upload
CHYBA
-neúspe¹ná FTP operácia PUT/upload
+neúspešná FTP operácia PUT/upload
-Pri pokuse o operáciu PUT na nasledovné URL:
+Pri pokuse o operáciu PUT na nasledovné URL:
%U
-Squid odoslal nasledujúci FTP príkaz:
+Squid odoslal nasledujúci FTP prÃkaz:
%f
-a obdr¾al túto odpoveï:
+a obdržal túto odpoveÄ:
%F
-Skúste:
+Skúste:
-Skontrolova» cestu, prístupové práva, voµné miesto na disku a pod. a skúste
+SkontrolovaÅ¥ cestu, prÃstupové práva, voľné miesto na disku a pod. a skúste
to znovu.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,11 +1,11 @@
-
+
operacia FTP PUT uspesna: subor aktualizovany
-operácia úspe¹ná
-súbor aktualizovaný
+operácia úspešná
+súbor aktualizovaný
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Slovak/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Slovak/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_FTP_UNAVAILABLE 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
+
CHYBA: Pozadovane URL je nedostupne
CHYBA
-Po¾adované URL je nedostupné
+Požadované URL je nedostupné
-FTP server bol príli¹ zaneprázdnený pri pokuse získat nasledovné URL:
+FTP server bol prÃliÅ¡ zaneprázdnený pri pokuse zÃskat nasledovné URL:
%U
-Squid zaslal nasledujúci FTP príkaz:
+Squid zaslal nasledujúci FTP prÃkaz:
%f
-a obdr¾al nasledovnú opoveï:
+a obdržal nasledovnú opoveÄ:
%F
%g
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_INVALID_REQ squid-3.1.0.4/errors/Slovak/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Slovak/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_INVALID_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,11 +1,11 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
While trying to process the request:
@@ -13,7 +13,7 @@
%R
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Èas» HTTP po¾iadavky nie je chybná. Mo¾né problémy"
+Časť HTTP požiadavky nie je chybná. Možné problémy"
-- Chýbajúca alebo neznáma metóda (POST, GET)
-
- Chýbajúce 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 or PUT
-
- Zakázaný znak v názve serveru; podtrhovník nie je povolený
+
- Chýbajúca alebo neznáma metóda (POST, GET)
+
- Chýbajúce 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 or PUT
+
- Zakázaný znak v názve serveru; podtrhovnÃk nie je povolený
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_INVALID_RESP squid-3.1.0.4/errors/Slovak/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Slovak/ERR_INVALID_RESP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_INVALID_RESP 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%R
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-HTTP odpovedi obdr¾anej z kontaktovaného servera nebolo mo¾né porozumie»
-alebo bola nejako po¹kodená. Kontaktujte prosím správcu servera. V prípade
-potreby Vám Vá¹ cache administrátor mô¾e poskytnú» detaily o presnej povahe
-problému.
+HTTP odpovedi obdržanej z kontaktovaného servera nebolo možné porozumieť
+alebo bola nejako poÅ¡kodená. Kontaktujte prosÃm správcu servera. V prÃpade
+potreby Vám Váš cache administrátor môže poskytnúť detaily o presnej povahe
+problému.
-Va¹ím cache administrátorom je %w.
+VaÅ¡Ãm cache administrátorom je %w.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_INVALID_URL squid-3.1.0.4/errors/Slovak/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Slovak/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_INVALID_URL 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Niektorá èas» Vami po¾adovaného URL je chybná. Mo¾né problémy:
+Niektorá ÄasÅ¥ Vami požadovaného URL je chybná. Možné problémy:
-- Chybný alebo chýbajúci protokol (mal by by» `http://' alebo nieèo podobné)
-
- Chýbajúci názov serveru
-
- Chybný double-escape v URL ceste
-
- Chybný znak v názve serveru; podtrhovník nie je povolený
+
- Chybný alebo chýbajúci protokol (mal by byÅ¥ `http://' alebo nieÄo podobné)
+
- Chýbajúci názov serveru
+
- Chybný double-escape v URL ceste
+
- Chybný znak v názve serveru; podtrhovnÃk nie je povolený
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Slovak/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Slovak/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_LIFETIME_EXP 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Squid yru¹il po¾iadavku preto¾e bola prekroèená maximálna då¾ka trvania
+Squid yruÅ¡il požiadavku pretože bola prekroÄená maximálna dĺžka trvania
spojenia.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_NO_RELAY squid-3.1.0.4/errors/Slovak/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Slovak/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_NO_RELAY 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Tento cache server nemá nastavenú ¾iadnu WAIS Relay! Kriète na svojho
-administrátora.
+Tento cache server nemá nastavenú žiadnu WAIS Relay! KriÄte na svojho
+administrátora.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Slovak/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:28.000000000 +1300
@@ -1,30 +1,30 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
-Vami po¾adovaný dokument sa nenachádza v cachi prièom bola ¹pecifikovaná
-direktíva
only-if-cached.
+Vami požadovaný dokument sa nenachádza v cachi priÄom bola Å¡pecifikovaná
+direktÃva only-if-cached.
-Vyslali ste po¾iadavku s direktívou only-if-cached na riadenie
-èinnosti cache. Po¾adovaný dokument nebol nájdený v cachi alebo
-tento dokument vy¾aduje aktualizáciu prièom toto je direktívou
-only-if-cached obmedzené.
+Vyslali ste požiadavku s direktÃvou only-if-cached na riadenie
+Äinnosti cache. Požadovaný dokument nebol nájdený v cachi alebo
+tento dokument vyžaduje aktualizáciu priÄom toto je direktÃvou
+only-if-cached obmedzené.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_READ_ERROR squid-3.1.0.4/errors/Slovak/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Slovak/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_READ_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Systém odpovedal:
+Systém odpovedal:
%E
-Vyskytla sa chyba pri prenose údajov cez sie». Opakujte prosím svoju
-po¾iadavku.
+Vyskytla sa chyba pri prenose údajov cez sieÅ¥. Opakujte prosÃm svoju
+požiadavku.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Slovak/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Slovak/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_READ_TIMEOUT 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Systém odpovedal:
+Systém odpovedal:
%E
-Vyskytol sa timeout pri èítaní zo siete. Sie» alebo server mô¾u by» mimo
-prevádzky alebo pre»a¾ené. Opakujte prosím svoju po¾iadavku.
+Vyskytol sa timeout pri ÄÃtanà zo siete. SieÅ¥ alebo server môžu byÅ¥ mimo
+prevádzky alebo preÅ¥ažené. Opakujte prosÃm svoju požiadavku.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Slovak/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Slovak/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_SHUTTING_DOWN 2009-01-23 18:37:28.000000000 +1300
@@ -1,19 +1,19 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Táto cache sa práve vypína a nemô¾e spracova» Va¹u po¾iadavku. Opakujte
-prosím svoju po¾iadavku za nejaký èas.
+Táto cache sa práve vypÃna a nemôže spracovaÅ¥ VaÅ¡u požiadavku. Opakujte
+prosÃm svoju požiadavku za nejaký Äas.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Slovak/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Slovak/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_SOCKET_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-
@@ -24,6 +24,6 @@
%E
-Squid nie je schopný vytvori¾ TCP socket pravdepodobne v dôsledku
-pre»a¾enia. Opakujte prosím svoju po¾iadavku.
+Squid nie je schopný vytvoriž TCP socket pravdepodobne v dôsledku
+preÅ¥aženia. Opakujte prosÃm svoju požiadavku.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_TOO_BIG squid-3.1.0.4/errors/Slovak/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Slovak/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_TOO_BIG 2009-01-23 18:37:28.000000000 +1300
@@ -1,6 +1,6 @@
-
+
ERROR: The requested URL could not be retrieved
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_UNSUP_REQ squid-3.1.0.4/errors/Slovak/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Slovak/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_UNSUP_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Squid nepodporuje v¹etky typy metód pri v¹etkých protokoloch. Napríklad: nie
-je mo¾né pou¾i» metódu POST pri slu¾be Gopher.
+Squid nepodporuje vÅ¡etky typy metód pri vÅ¡etkých protokoloch. NaprÃklad: nie
+je možné použiť metódu POST pri službe Gopher.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_URN_RESOLVE squid-3.1.0.4/errors/Slovak/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Slovak/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_URN_RESOLVE 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovane URN je nedostupne
CHYBA
-URL pre po¾adované URN je nedostupné
+URL pre požadované URN je nedostupné
-Pri pokuse o prístup k URN:
+Pri pokuse o prÃstup k URN:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Hej, neoèakávaj priveµa od URN na %T :)
+Hej, neoÄakávaj priveľa od URN na %T :)
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_WRITE_ERROR squid-3.1.0.4/errors/Slovak/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Slovak/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_WRITE_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Systém opovedal:
+Systém opovedal:
%E
-Vyskytla sa chyba pri zápise do siete. Opakujte prosím Va¹u po¾iadavku.
+Vyskytla sa chyba pri zápise do siete. Opakujte prosÃm VaÅ¡u požiadavku.
diff -u -r -N squid-3.1.0.3/errors/Slovak/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Slovak/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Slovak/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Slovak/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:28.000000000 +1300
@@ -1,17 +1,17 @@
-
+
CHYBA: Pozadovany dokument je nedostupny
CHYBA
-Po¾adovaný dokument je nedostupný
+Požadovaný dokument je nedostupný
-Pri pokuse o prístup k:
+Pri pokuse o prÃstup k:
%U
-do¹lo k nasledovnej chybe:
+došlo k nasledovnej chybe:
-Squid nedostal v odpovedi na Va¹u po¾iadavku ¾iadne údaje.
+Squid nedostal v odpovedi na Vašu požiadavku žiadne údaje.
diff -u -r -N squid-3.1.0.3/errors/sr/ERR_ACCESS_DENIED squid-3.1.0.4/errors/sr/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/sr/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_ACCESS_DENIED 2009-01-23 18:41:03.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/sr/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/sr/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:41:03.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:41:03.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/sr/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/sr/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_CANNOT_FORWARD 2009-01-23 18:41:03.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_CONNECT_FAIL squid-3.1.0.4/errors/sr/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/sr/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_CONNECT_FAIL 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_DNS_FAIL squid-3.1.0.4/errors/sr/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/sr/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_DNS_FAIL 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_ESI squid-3.1.0.4/errors/sr/ERR_ESI
--- squid-3.1.0.3/errors/sr/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_ESI 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/sr/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/sr/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FORWARDING_DENIED 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_DISABLED squid-3.1.0.4/errors/sr/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/sr/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_DISABLED 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_FAILURE squid-3.1.0.4/errors/sr/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/sr/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_FAILURE 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/sr/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/sr/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_FORBIDDEN 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_LISTING squid-3.1.0.4/errors/sr/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/sr/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_LISTING 2009-01-23 18:41:04.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/sr/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/sr/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/sr/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_NOT_FOUND 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/sr/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/sr/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_PUT_CREATED 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/sr/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/sr/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_PUT_ERROR 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/sr/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/sr/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_PUT_MODIFIED 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/sr/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/sr/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_FTP_UNAVAILABLE 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_ICAP_FAILURE squid-3.1.0.4/errors/sr/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/sr/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_ICAP_FAILURE 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_INVALID_REQ squid-3.1.0.4/errors/sr/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/sr/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_INVALID_REQ 2009-01-23 18:41:05.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_INVALID_RESP squid-3.1.0.4/errors/sr/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/sr/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_INVALID_RESP 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_INVALID_URL squid-3.1.0.4/errors/sr/ERR_INVALID_URL
--- squid-3.1.0.3/errors/sr/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_INVALID_URL 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_LIFETIME_EXP squid-3.1.0.4/errors/sr/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/sr/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_LIFETIME_EXP 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_NO_RELAY squid-3.1.0.4/errors/sr/ERR_NO_RELAY
--- squid-3.1.0.3/errors/sr/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_NO_RELAY 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/sr/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/sr/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_READ_ERROR squid-3.1.0.4/errors/sr/ERR_READ_ERROR
--- squid-3.1.0.3/errors/sr/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_READ_ERROR 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_READ_TIMEOUT squid-3.1.0.4/errors/sr/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/sr/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_READ_TIMEOUT 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/sr/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/sr/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:41:06.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/sr/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/sr/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_SHUTTING_DOWN 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/sr/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/sr/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_SOCKET_FAILURE 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_TOO_BIG squid-3.1.0.4/errors/sr/ERR_TOO_BIG
--- squid-3.1.0.3/errors/sr/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_TOO_BIG 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_UNSUP_REQ squid-3.1.0.4/errors/sr/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/sr/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_UNSUP_REQ 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_URN_RESOLVE squid-3.1.0.4/errors/sr/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/sr/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_URN_RESOLVE 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_WRITE_ERROR squid-3.1.0.4/errors/sr/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/sr/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_WRITE_ERROR 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/sr/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/sr/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/sr/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/sr/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:41:07.000000000 +1300
@@ -0,0 +1 @@
+ 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.3/errors/tr/ERR_ACCESS_DENIED squid-3.1.0.4/errors/tr/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/tr/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_ACCESS_DENIED 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
EriÅŸim Yasak.
Erişim kontrol mekanizması istediğiniz bilgilere ulaşmanızı yasaklıyor. İstenilen bilgilere erişim hakkınız olduğunu düşünüyorsanız, lütfen Servis Sağlayıcı Kurumla bağlantıya geçiniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/tr/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/tr/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: Cache Access Denied
ERROR
Cache EriÅŸim Yasak.
The following error was encountered while trying to retrieve the URL: %U
Cache Sunucusunu Kullanamazsınız.
Özür dilerim, istediğiniz %U adresine bu Cache Sunucusunu kullanarak ulaşamazsınız.
Lütfen Cache Yöneticisi ile bağlantıya geçin, veya şifrenizi değiştirmek için buraya tıklayın.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: Cache Manager Access Denied
ERROR
Cache Manager EriÅŸim Yasak.
The following error was encountered while trying to retrieve the URL: %U
Cache Yönetici girişi yasak.
Özür dilerim, istediğiniz %U adresine bu cache yönetici girişinden bağlanamazsınız.
Eğer sorun devam ediyor ise lütfen cache yöneticisi ile bağlantıya geçin Eğer yönetici siz iseniz Squid Yardım Sayfalarında Cache Yöneticisi giriş arayüzü ile ilgili kısımları tekrar okuyun ve Cache sunucusunun hata mesajlarını kontrol edin.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/tr/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/tr/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_CANNOT_FORWARD 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Şu anda sizi yönlendiremem.
Bu istek şu anda başka bir Cache Sunucuya veya hedef WWW Sunucuya yönlendirilemez.Bunun sebebi aşağıdakilerden herhangi biri olabilir cache yöneticisi isteklerin hedef WWW sunucuya gitmesine izin vermiyor hiç bir ana Cache Sunucuya şu anda ulaşılamıyor.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_CONNECT_FAIL squid-3.1.0.4/errors/tr/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/tr/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_CONNECT_FAIL 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Connection to %I failed.
Sistemden gelen mesaj: %E
The remote host or network may be down. Please try the request again.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_DNS_FAIL squid-3.1.0.4/errors/tr/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/tr/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_DNS_FAIL 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
%H
isimli sunucuya ait herhangi bir IP adresi bulunamadı.
DNS sunucusundan gelen cevap:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_ESI squid-3.1.0.4/errors/tr/ERR_ESI
--- squid-3.1.0.3/errors/tr/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_ESI 2009-01-23 18:41:13.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ESI Processing failed.
The ESI processor returned:
%Z
This means that the surrogate was not able to process the ESI template. Please report this error to the webmaster.
Your webmaster is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/tr/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/tr/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FORWARDING_DENIED 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Yönlendirme yasak.
Bu Cache Sunucu, yapılan ayarlardan ve tanımlanan kullanıcı hakklarından dolayı isteğinizi yönlendirememektedir. %i isimli Cache Sunucu ayarlarında bir yanlışlık olabilir.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_DISABLED squid-3.1.0.4/errors/tr/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/tr/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_DISABLED 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
FTP şu anda kapalı.
Bu cache sunucu FTP desteklemiyor.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_FAILURE squid-3.1.0.4/errors/tr/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/tr/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_FAILURE 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
An FTP protocol error occurred while trying to retrieve the URL: %U
Squid, şu FTP komutlarını gönderdi:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/tr/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/tr/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_FORBIDDEN 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
An FTP authentication failure occurred while trying to retrieve the URL: %U
Squid, şu FTP komutlarını gönderdi:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_LISTING squid-3.1.0.4/errors/tr/ERR_FTP_LISTING
--- squid-3.1.0.3/errors/tr/ERR_FTP_LISTING 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_LISTING 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ FTP Directory: %U
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/tr/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/tr/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_NOT_FOUND 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following URL could not be retrieved: %U
Squid, şu FTP komutlarını gönderdi:
%f
The server responded with:
%F
%g
This might be caused by an FTP URL with an absolute path (which does not comply with RFC 1738). If this is the cause, then the file can be found at %B.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/tr/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/tr/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_PUT_CREATED 2009-01-23 18:41:14.000000000 +1300
@@ -0,0 +1 @@
+ FTP PUT Başarılı: Dosya Yaratıldı
İşlem başarıyla tamamlandı
Dosya güncellendi.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/tr/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/tr/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_PUT_ERROR 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: FTP upload failed
ERROR
FTP PUT/upload failed
While trying to PUT the following URL: %U
Squid, şu FTP komutlarını gönderdi:
%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.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/tr/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/tr/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_PUT_MODIFIED 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ FTP PUT Başarılı: Dosya güncellendi
İşlem başarıyla tamamlandı
Dosya güncellendi.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/tr/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/tr/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_FTP_UNAVAILABLE 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The FTP server was too busy to retrieve the URL: %U
Squid, şu FTP komutlarını gönderdi:
%f
The server responded with:
%F
%g
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_ICAP_FAILURE squid-3.1.0.4/errors/tr/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/tr/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_ICAP_FAILURE 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
ICAP protocol error.
Sistemden gelen mesaj: %E
This means that some aspect of the ICAP communication failed.
Buna sebep aÅŸaÄŸidakilerden herhangi biri olabilir:
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_INVALID_REQ squid-3.1.0.4/errors/tr/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/tr/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_INVALID_REQ 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
Invalid Request error was encountered while trying to process the request:
%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).
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_INVALID_RESP squid-3.1.0.4/errors/tr/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/tr/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_INVALID_RESP 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
Invalid Response error was encountered while trying to process the request:
%R
The HTTP Response message received from the contacted server could not be understood or was otherwise malformed. Please contact the site operator.
Your cache administrator may be able to provide you with more details about the exact nature of the problem if needed.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_INVALID_URL squid-3.1.0.4/errors/tr/ERR_INVALID_URL
--- squid-3.1.0.3/errors/tr/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_INVALID_URL 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Yanlış URL.
Vermiş olduğunuz URL yanlış.
Buna sebep aÅŸaÄŸidakilerden herhangi biri olabilir:
Eksik veya yanlış protokol ismi (http://
veya benzeri olmalı).
Eksik adres.
Illegal double-escape in the URL-Path
Adreste yanlış karakterler (alt çizgi, vs. kullanılamaz).
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_LIFETIME_EXP squid-3.1.0.4/errors/tr/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/tr/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_LIFETIME_EXP 2009-01-23 18:41:15.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Bağlantı süresi doldu.
Squid, bağlantı süresi dolduğu için isteğinizi durdurdu.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_NO_RELAY squid-3.1.0.4/errors/tr/ERR_NO_RELAY
--- squid-3.1.0.3/errors/tr/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_NO_RELAY 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
WAIS Sunucu tanımlı değil
Bu Cache Sunucuda WAIS sunucu tanımlı değil. Lütfen Cache Yöneticisi ile bağlantıya geçiniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/tr/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/tr/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
İstediğiniz doğru doküman cache sunucusunda bulunamadı ve only-if-cached
(sadece Cache Sunucunda bulunuyor ise) tanımlı.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_READ_ERROR squid-3.1.0.4/errors/tr/ERR_READ_ERROR
--- squid-3.1.0.3/errors/tr/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_READ_ERROR 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Okuma Hatası
Sistemden gelen mesaj: %E
Ağdan bilgileri okuma sırasında hata oluştu. Lütfen isteğinizi tekrar giriniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_READ_TIMEOUT squid-3.1.0.4/errors/tr/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/tr/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_READ_TIMEOUT 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Okuma zamanı doldu (Read Timeout)
Sistemden gelen mesaj: %E
İstemiş olduğunuz bilgileri ağdan okuma sırasında okuma zamanı doldu. Hedef sunucu kapalı veya çok meşgul olabilir. Lütfen isteğinizi tekrar giriniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/tr/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/tr/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_SECURE_CONNECT_FAIL 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Failed to establish a secure connection to %I
Sistemden gelen mesaj: %E
This proxy and the remote host failed to negotiate a mutually acceptable security settings for handling your request. It is possible that the remote host does not support secure connections, or the proxy is not satisfied with the host security credentials.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/tr/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/tr/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_SHUTTING_DOWN 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
This cache is in the process of shutting down and can not service your request at this time. Please retry your request again soon.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/tr/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/tr/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_SOCKET_FAILURE 2009-01-23 18:41:16.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Bağlantı hatası (Socket Failure).
Sistemden gelen mesaj: %E
Squid, TCP bağlantı yaratamadı. Bunun nedeni hedef sunucunun çok fazla yüklenmiş olması olabilir. Lütfen isteğinizi tekrar giriniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_TOO_BIG squid-3.1.0.4/errors/tr/ERR_TOO_BIG
--- squid-3.1.0.3/errors/tr/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_TOO_BIG 2009-01-23 18:41:17.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
The request or reply is too large.
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.
These limits have been established by the Internet Service Provider who operates this cache. Please contact them directly if you feel this is an error.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_UNSUP_REQ squid-3.1.0.4/errors/tr/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/tr/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_UNSUP_REQ 2009-01-23 18:41:17.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Desteklenmeyen istek yöntemi ve protokol.
Squid, bazı erişim protokollerin, bazı istek yöntemlerini desteklemiyor. Örneğin Gopher isteğinizde POST yapamazsınız.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_URN_RESOLVE squid-3.1.0.4/errors/tr/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/tr/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_URN_RESOLVE 2009-01-23 18:41:17.000000000 +1300
@@ -0,0 +1 @@
+ HATA: The requested URN not be retrieved
ERROR
A URL for the requested URN could not be retrieved
The following error was encountered while trying to retrieve the URN: %U
URN çözülemedi.
%T de URN den fazla birsey beklemeyin. :)
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_WRITE_ERROR squid-3.1.0.4/errors/tr/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/tr/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_WRITE_ERROR 2009-01-23 18:41:17.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Yazma Hatası
Sistemden gelen mesaj: %E
Bilgiler ağ üzerine gönderilirken hata oluştu. Lütfen isteğinizi tekrar giriniz.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/tr/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/tr/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/tr/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/errors/tr/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:41:17.000000000 +1300
@@ -0,0 +1 @@
+ HATA: İstenilen URL'e ulaşılamadı
ERROR
The requested URL could not be retrieved
The following error was encountered while trying to retrieve the URL: %U
Sıfır Uzunlukta cevap
Squid, isteğiniz ile ilgili herhangi bir bilgi alamadı.
Your cache administrator is %w.
\ No newline at end of file
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Traditional_Chinese/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+錯誤
+欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Access Denied.
-
-¦s¨ú³Q©Úµ´
+å˜å–被拒絕
Access control configuration prevents your request from
@@ -24,8 +24,8 @@
you feel this is incorrect.
-±ý³sµ²¤§ºô¯¸ªº¦s¨ú±±¨î³]©w¥Ø«e¸T¤î¤F±zªº³s½un¨D¡A¦pªG±zı±o±o¨ì³o¼Ëªº
-°T®§¨Ã¤£¥¿½T¡A½Ð»P´£¨Ñºô¸ôªA°ÈªººÞ²zªÌÁpô¡C
+欲連çµä¹‹ç¶²ç«™çš„å˜å–控制è¨å®šç›®å‰ç¦æ¢äº†æ‚¨çš„連線è¦æ±‚，如果您覺得得到這樣的
+訊æ¯ä¸¦ä¸æ£ç¢ºï¼Œè«‹èˆ‡æ供網路æœå‹™çš„管ç†è€…è¯ç¹«ã€‚
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,31 +1,31 @@
-
-¿ù»~¡Gºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+
+錯誤：網路快å–伺æœå™¨å˜å–被拒絕
-¿ù»~
-ºô¸ô§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+錯誤
+網路快å–伺æœå™¨å˜å–被拒絕
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Cache Access Denied.
-
-§Ö¨ú¦øªA¾¹¦s¨ú³Q©Úµ´
+å¿«å–伺æœå™¨å˜å–被拒絕
-©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓºô¸ô§Ö¨ú¦øªA¾¹¶Ç¦^¤U¦C¦ì¸m¡G
+抱æ‰ï¼Œæ‚¨ä¸è¢«å…許é€éŽæˆ‘們這個網路快å–伺æœå™¨å‚³å›žä¸‹åˆ—ä½ç½®ï¼š
%U
-°£«D±z³q¹L¤F§Ú̪º¨¥÷ÅçÃÒ¡C
+除éžæ‚¨é€šéŽäº†æˆ‘們的身份驗è‰ã€‚
@@ -36,8 +36,8 @@
change your default password.
-±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î§ó·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
-Explorer 3.0¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¦b¨¥÷ÅçÃÒ¤W
-µo¥Í§xÃø¡A½Ð»P ºÞ²zªÌ Ápô¡C
-©Î¬O§ó§ï±zªº±K½X¡C
+您需è¦ä½¿ç”¨ Netscape version 2.0 或更新的版本，或是使用 Microsoft Internet
+Explorer 3.0，或是一個相容 HTTP/1.1 çš„ç€è¦½å™¨ä¾†é€²è¡Œå·¥ä½œã€‚如果您在身份驗è‰ä¸Š
+發生困難，請與 管ç†è€… è¯ç¹«ã€‚
+或是更改您的密碼。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,31 +1,31 @@
-
-¿ù»~¡G¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
+
+錯誤：使用快å–伺æœå™¨ç®¡ç†ç¨‹å¼è¢«æ‹’絕
-¿ù»~
-¨Ï¥Î§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡³Q©Úµ´
+錯誤
+使用快å–伺æœå™¨ç®¡ç†ç¨‹å¼è¢«æ‹’絕
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Cache Manager Access Denied.
-
-§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¨Ï¥Î³Q©Ú
+å¿«å–伺æœå™¨ç®¡ç†ç¨‹å¼ä½¿ç”¨è¢«æ‹’
-©êºp¡A±z¤£³Q¤¹³\³z¹L§Ú̳oÓ§Ö¨ú¦øªA¾¹ºÞ²zµ{¦¡¶Ç¦^¤U¦C¦ì¸m¡G
+抱æ‰ï¼Œæ‚¨ä¸è¢«å…許é€éŽæˆ‘們這個快å–伺æœå™¨ç®¡ç†ç¨‹å¼å‚³å›žä¸‹åˆ—ä½ç½®ï¼š
%U
-°£«D±z³q¹L§Ú̪º¨¥÷ÅçÃÒ¡C
+除éžæ‚¨é€šéŽæˆ‘們的身份驗è‰ã€‚
You need to use Netscape version 2.0 or greater, or Microsoft Internet
@@ -36,9 +36,9 @@
cache log for more detailed error messages.
-±z»Ýn¨Ï¥Î Netscape version 2.0 ©Î³Ì·sªºª©¥»¡A©Î¬O¨Ï¥Î Microsoft Internet
-Explorer¡A©Î¬O¤@Ó¬Û®e HTTP/1.1 ªºÂsÄý¾¹¨Ó¶i¦æ¤u§@¡C¦pªG±z¬O¦b¨¥÷ÅçÃÒ¤Wµo
-¥Í°ÝÃD¡A½Ð¥ý½T©w±z¦³Åv¹ï§Ö¨ú¦øªA¾¹¨Ï¥ÎºÞ²zµ{¦¡¡C
-©Î¬O»PºÞ²zªÌÁpô¡C¦pªG±z´N¬OºÞ²zªÌ¡A½Ð¸Ô²Ó¾\Ū Squid ©Òªþ¤å¥ó¤¤»P
-cache manager ¦³Ãö³¡¥÷©ÎÀˬd cache log ¥H«K±o¨ì§ó¸ÔºÉªº²Ó¸`¡C
+您需è¦ä½¿ç”¨ Netscape version 2.0 或最新的版本，或是使用 Microsoft Internet
+Explorer，或是一個相容 HTTP/1.1 çš„ç€è¦½å™¨ä¾†é€²è¡Œå·¥ä½œã€‚如果您是在身份驗è‰ä¸Šç™¼
+生å•é¡Œï¼Œè«‹å…ˆç¢ºå®šæ‚¨æœ‰æ¬Šå°å¿«å–伺æœå™¨ä½¿ç”¨ç®¡ç†ç¨‹å¼ã€‚
+或是與管ç†è€…è¯ç¹«ã€‚如果您就是管ç†è€…，請詳細閱讀 Squid 所附文件ä¸èˆ‡
+cache manager 有關部份或檢查 cache log 以便得到更詳盡的細節。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_CANNOT_FORWARD 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-¿ù»~¡F±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+錯誤；欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+錯誤
+欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Unable to forward this request at this time.
-
-¥Ø«eµLªk´À±zªººô¯¸³sµ²n¨D¶i¦æÂà¦V°Ê§@
+ç›®å‰ç„¡æ³•æ›¿æ‚¨çš„網站連çµè¦æ±‚進行轉å‘動作
@@ -30,9 +30,9 @@
-±zªº³sµ²n¨DµLªk³QÂà¦Vì©lºô¯¸¦øªA¾¹©Î¨ä¥Lªº¤W¼h§Ö¨ú¦øªA¾¹¡Aµo¥Í³oÓ°ÝÃDªº³Ì¥i¯àªºì¦]¥i¯à¬O¡G
+您的連çµè¦æ±‚無法被轉å‘原始網站伺æœå™¨æˆ–其他的上層快å–伺æœå™¨ï¼Œç™¼ç”Ÿé€™å€‹å•é¡Œçš„最å¯èƒ½çš„åŽŸå› å¯èƒ½æ˜¯ï¼š
-- ºô¸ô§Ö¨ú¦øªA¾¹ºÞ²zªÌ¤£¤¹³\¥»¦øªA¾¹³w¦æª½±µ³sµ²ì©lªººô¶¦ì¸m¡A©Î¬O
-
- ©Ò¦³¥»¦øªA¾¹³]©wªº¤W¼h¦øªA¾¹¥Ø«e³£¼È®ÉµLªk³sµ²¤W¡C
+
- 網路快å–伺æœå™¨ç®¡ç†è€…ä¸å…許本伺æœå™¨é€•è¡Œç›´æŽ¥é€£çµåŽŸå§‹çš„網é ä½ç½®ï¼Œæˆ–是
+
- 所有本伺æœå™¨è¨å®šçš„上層伺æœå™¨ç›®å‰éƒ½æš«æ™‚無法連çµä¸Šã€‚
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Traditional_Chinese/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_CONNECT_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,31 +1,31 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+錯誤
+欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Connection Failed
-
-³s½u¥¢±Ñ
+連線失敗
-¨t²Î¦^À³¤F¤U¦C¿ù»~°T®§¡G
+系統回應了下列錯誤訊æ¯ï¼š
%E
The remote host or network may be down. Please try the request again.
-±z±ý³sµ²ªººô¯¸¦øªA¾¹©Î¬Oºô¸ô¥i¯àµo¥Í¬G»Ù¡C½Ðµy«á¦A¸Õ¡C
+您欲連çµçš„網站伺æœå™¨æˆ–是網路å¯èƒ½ç™¼ç”Ÿæ•…障。請ç¨å¾Œå†è©¦ã€‚
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_DNS_FAIL squid-3.1.0.4/errors/Traditional_Chinese/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_DNS_FAIL 2009-01-23 18:37:28.000000000 +1300
@@ -1,35 +1,35 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-µLªk±N±z¿é¤Jªººô¯¸¥D¾÷¦ì¸mÂàĶ¦¨¥¿½Tªº IP ¦ì¸m¡G
+無法將您輸入的網站主機ä½ç½®è½‰è¯æˆæ£ç¢ºçš„ IP ä½ç½®ï¼š
%H
-»â°ì¦WºÙ¦øªA¾¹¦^À³¤U¦C¿ù»~°T®§¡G
+é ˜åŸŸå稱伺æœå™¨å›žæ‡‰ä¸‹åˆ—錯誤訊æ¯ï¼š
%z
-³oªí¥Ü¡G
+這表示：
The cache was not able to resolve the hostname presented in the URL.
Check if the address is correct.
- ºô¸ô§Ö¨ú¦øªA¾¹¨S¦³¿ìªk¥¿½TÂàĶ±z¿é¤Jªººô¯¸¥D¾÷¦WºÙ¡A½ÐÀˬd±z¿é¤Jªººô
- §}¡]URL¡^¬O¥¿½Tªº¡C
+ 網路快å–伺æœå™¨æ²’有辦法æ£ç¢ºè½‰è¯æ‚¨è¼¸å…¥çš„網站主機å稱，請檢查您輸入的網
+ å€ï¼ˆURL）是æ£ç¢ºçš„。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FORWARDING_DENIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Forwarding Denied.
-
-Âà°en¨D³Q©Ú
+轉é€è¦æ±‚被拒
@@ -25,6 +25,6 @@
sibling relationship. Perhaps the client at %i is a cache which has been
misconfigured.
-¥»§Ö¨ú¦øªA¾¹±NµLªk´À±zÂà¦V±zªº³s½un¨D¡A¤]³\¬O¦]¬°±z©Ò¨Ï¥Îªº§Ö¨ú¦øªA¾¹¡]%i¡^¨Ã¥¼³Q¥»§Ö¨ú¦øªA¾¹
-³]©w¬°ã³\¶i¦æ¦s¨ú¡C
+本快å–伺æœå™¨å°‡ç„¡æ³•æ›¿æ‚¨è½‰å‘您的連線è¦æ±‚ï¼Œä¹Ÿè¨±æ˜¯å› ç‚ºæ‚¨æ‰€ä½¿ç”¨çš„å¿«å–伺æœå™¨ï¼ˆ%i）並未被本快å–伺æœå™¨
+è¨å®šç‚ºå‡†è¨±é€²è¡Œå˜å–。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_DISABLED squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_DISABLED 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
FTP is Disabled
-
-¸T¤î¨Ï¥ÎÀɮ׶ǿé
+ç¦æ¢ä½¿ç”¨æª”案傳輸
This cache does not support FTP.
-¥»§Ö¨ú¦øªA¾¹¨Ã¥¼¶}©ñ¤ä´©Àɮ׶ǿéªA°È¡C
+本快å–伺æœå™¨ä¸¦æœªé–‹æ”¾æ”¯æ´æª”案傳輸æœå‹™ã€‚
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_FAILURE squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,18 +1,18 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-¦b¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®Éµo¥ÍÀɮ׶ǿé³q°T¨ó©w¿ù»~¡G
+在嘗試傳回下é¢çš„網å€ï¼ˆURL）時發生檔案傳輸通訊å”定錯誤：
%U
-PROXY ¦øªA¾¹´À±z°e¥X¤U¦CÀɮ׶ǿé©R¥O¡G
+PROXY 伺æœå™¨æ›¿æ‚¨é€å‡ºä¸‹åˆ—檔案傳輸命令：
%f
-ÀH«á¦¬¨ì³o¼Ëªº¦^À³¡G
+隨後收到這樣的回應：
%F
%g
@@ -20,7 +20,7 @@
not comply with RFC 1738). If this is the cause, then the file
can be found at %B.
-³o¥i¯à¬O¦]¬°¥]§t¤Fµ´¹ï¸ô®|ªº FTP ºô§}¡]URL¡^©Ò¾ÉPªº¡]¤£²Å¦X RFC 1738¡^¡C¦pªG¯uªº¬O¦]¬°
-³oÓì¦]¾ÉP³o¼Ëªº¿ù»~¡AÀÉ®×¥i¯à¥i¥H¦b%B³Q§ä¨ì¡C
+這å¯èƒ½æ˜¯å› 為包å«äº†çµ•å°è·¯å¾‘çš„ FTP 網å€ï¼ˆURL）所導致的（ä¸ç¬¦åˆ RFC 1738ï¼‰ã€‚å¦‚æžœçœŸçš„æ˜¯å› ç‚º
+é€™å€‹åŽŸå› å°Žè‡´é€™æ¨£çš„éŒ¯èª¤ï¼Œæª”æ¡ˆå¯èƒ½å¯ä»¥åœ¨%B被找到。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED 2009-01-23 18:37:28.000000000 +1300
@@ -1,10 +1,10 @@
-
-
Àɮ׶ǿé PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q«Ø¥ß
+
+
檔案傳輸 PUT 指令æˆåŠŸå®Œæˆï¼šæª”案已被建立
-
©Òn¨Dªº«ü¥O¦¨¥\¦a³Q§¹¦¨
-
Àɮפw³Q¦¨¥\¦a«Ø¥ß
+
所è¦æ±‚的指令æˆåŠŸåœ°è¢«å®Œæˆ
+
檔案已被æˆåŠŸåœ°å»ºç«‹
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,29 +1,29 @@
-
-
¿ù»~¡GÀɮפW¶Ç¥¢±Ñ
+
+
錯誤：檔案上傳失敗
-
¿ù»~
-
Àɮ׶ǿé¤W¶Ç¡]PUT¡^¥¢±Ñ
+
錯誤
+
檔案傳輸上傳（PUT）失敗
-·í¹Á¸Õ¤W¶Ç¡]PUT¡^¤U¦C¦ì¸m®É¡G
+當嘗試上傳（PUT）下列ä½ç½®æ™‚：
%U
-§Ö¨ú¦øªA¾¹´À±zÂà°e¥X¤U¦CÀɮ׶ǿé©R¥O¡G
+å¿«å–伺æœå™¨æ›¿æ‚¨è½‰é€å‡ºä¸‹åˆ—檔案傳輸命令：
%f
-ÀH«á¦¬¨ì³o¼Ëªº°T®§
+隨後收到這樣的訊æ¯
%F
-³oªí¥Ü¡G
+這表示：
Check path, permissions, diskspace and try again.
-½Ð±zÀˬd¤W¶Ç¸ô®|¡A¤W¶Ç¦ì¸mªºÅª¼gÅv¡A¥i¨Ï¥ÎªºªÅ¶¡¤§«á¦A¸Õ¤@¹M¡C
+請您檢查上傳路徑，上傳ä½ç½®çš„讀寫權é™ï¼Œå¯ä½¿ç”¨çš„空間之後å†è©¦ä¸€é。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED 2009-01-23 18:37:28.000000000 +1300
@@ -1,10 +1,10 @@
-
-
Àɮ׶ǿé PUT «ü¥O¦¨¥\§¹¦¨¡GÀɮפw³Q§ó·s
+
+
檔案傳輸 PUT 指令æˆåŠŸå®Œæˆï¼šæª”案已被更新
-
¦¨¥\§¹¦¨©Òn¨Dªº«ü¥O
-
Àɮפw³Q§ó·s¤F
+
æˆåŠŸå®Œæˆæ‰€è¦æ±‚的指令
+
檔案已被更新了
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_INVALID_REQ squid-3.1.0.4/errors/Traditional_Chinese/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_INVALID_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,43 +1,43 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶i¦æ±z©Òn¨Dªº¤U¦Cµ{§Ç®É¡G
+當嘗試進行您所è¦æ±‚的下列程åºæ™‚：
%R
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Invalid Request
-
-¤£¥¿½Tªºn¨D
+ä¸æ£ç¢ºçš„è¦æ±‚
Some aspect of the HTTP Request is invalid. Possible problems:
-µo¥Í¤F¤@¨Ç¤£¥¿½Tªº HTTP n¨D¡C¥i¯à¬O¤U¦Cªº°ÝÃD¡G
+發生了一些ä¸æ£ç¢ºçš„ HTTP è¦æ±‚。å¯èƒ½æ˜¯ä¸‹åˆ—çš„å•é¡Œï¼š
- Missing or unknown request method
-
n¨D¤è¦¡¿ò¥¢©Î¬O¥¼ª¾
+
è¦æ±‚æ–¹å¼éºå¤±æˆ–是未知
- Missing URL
-
ºô¯¸¦ì¸m¿ò¥¢
+
網站ä½ç½®éºå¤±
- Missing HTTP Identifier (HTTP/1.0)
-
HTTP ¼Ð·Çªº«Å§i¿ò¥¢¡]HTTP/1.0¡^
+
HTTP 標準的宣告éºå¤±ï¼ˆHTTP/1.0）
- Request is too large
-
n¨D©R¥O¹Lªø
+
è¦æ±‚命令éŽé•·
- Content-Length missing for POST or PUT requests
-
¯Ê¤Ö POST ©Î PUT n¨D
+
缺少 POST 或 PUT è¦æ±‚
- Illegal character in hostname; underscores are not allowed
-
±ý³sµ²ªº¥D¾÷¦WºÙ¥]§t¤£¦Xªkªº¦r¤¸¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\¦s¦bªº¡C
+
欲連çµçš„主機å稱包å«ä¸åˆæ³•çš„å—元；底線這個å—元是ä¸è¢«å…許å˜åœ¨çš„。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_INVALID_URL squid-3.1.0.4/errors/Traditional_Chinese/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_INVALID_URL 2009-01-23 18:37:28.000000000 +1300
@@ -1,37 +1,37 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Invalid URL
-
-¤£¥¿½Tªº¦ì¸m
+ä¸æ£ç¢ºçš„ä½ç½®
Some aspect of the requested URL is incorrect. Possible problems:
-±ý³sµ²ªº¦ì¸m¦³¤@¨Ç¤£¥¿½T¡C¥i¯à¬O¦]¬°¤U¦C°ÝÃD¡G
+欲連çµçš„ä½ç½®æœ‰ä¸€äº›ä¸æ£ç¢ºã€‚å¯èƒ½æ˜¯å› 為下列å•é¡Œï¼š
- Missing or incorrect access protocol (should be `http://'' or similar)
-
¯Ê¤Ö©Î¤£¥¿½Tªº³q°T¨ó©w«Å§i¡]À³¸Ó¬O `http://''©Î¬OÃþ¦üªº¶}ÀY¡^
+
缺少或ä¸æ£ç¢ºçš„通訊å”定宣告（應該是 `http://''或是類似的開é ）
- Missing hostname
-
¯Ê¤Ö±ý³sµ²ªº¥D¾÷¦WºÙ
+
缺少欲連çµçš„主機å稱
- Illegal double-escape in the URL-Path
-
¤£¦Xªkªººô¯¸³sµ²¸ô®|¡]¯Ê¤Ö `//''¡^
+
ä¸åˆæ³•çš„網站連çµè·¯å¾‘（缺少 `//''）
- Illegal character in hostname; underscores are not allowed
-
¤£¦Xªkªº¦r¤¸¦s¦b©ó±ý³sµ²ªº¥D¾÷¦WºÙ¤¤¡F©³½u³oÓ¦r¤¸¬O¤£³Q¤¹³\ªº
+
ä¸åˆæ³•çš„å—å…ƒå˜åœ¨æ–¼æ¬²é€£çµçš„主機å稱ä¸ï¼›åº•ç·šé€™å€‹å—元是ä¸è¢«å…許的
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Traditional_Chinese/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_LIFETIME_EXP 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Connection Lifetime Expired
-
-¶W¹L³s½uµ¥«Ý®É
+超éŽé€£ç·šç‰å¾…時é™
@@ -24,5 +24,5 @@
Squid has terminated the request because it has exceeded the maximum
connection lifetime.
-§Ö¨ú¦øªA¾¹¤w²×¤î±zªº³s½un¨D¡A¦]¬°¤w¸g¶W¹L³s½uµ¥«Ý®É¡C
+å¿«å–伺æœå™¨å·²çµ‚æ¢æ‚¨çš„連線è¦æ±‚ï¼Œå› ç‚ºå·²ç¶“è¶…éŽé€£ç·šç‰å¾…時é™ã€‚
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_NO_RELAY squid-3.1.0.4/errors/Traditional_Chinese/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_NO_RELAY 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
No Wais Relay
-
-¤£´£¨Ñ Wais¡]¼s°ì¸ê°T¦øªA¾¹¡^Âà±µ
+ä¸æä¾› Wais（廣域資訊伺æœå™¨ï¼‰è½‰æŽ¥
There is no WAIS Relay host defined for this Cache! Yell at the administrator.
-¥»§Ö¨ú¦øªA¾¹¥¼´£¨Ñ WAIS ¼s°ì¸ê°T¦øªA¾¹ªA°È¡I¦p¦³ºÃ°Ý½Ð¬¢§Ö¨ú¦øªA¾¹ºÞ²zªÌ¡C
+本快å–伺æœå™¨æœªæä¾› WAIS 廣域資訊伺æœå™¨æœå‹™ï¼å¦‚有疑å•è«‹æ´½å¿«å–伺æœå™¨ç®¡ç†è€…。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS 2009-01-23 18:37:28.000000000 +1300
@@ -1,24 +1,24 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Valid document was not found in the cache and
only-if-cached
directive was specified.
-
-±zn¨Dªº¤å¥ó¨Ã¥¼¦s¦b©ó¥»§Ö¨ú¦øªA¾¹¤W¡A¦Ó¥B±z³]©w¤F
only-if-cached
-«ü¥O¡C
+您è¦æ±‚的文件並未å˜åœ¨æ–¼æœ¬å¿«å–伺æœå™¨ä¸Šï¼Œè€Œä¸”您è¨å®šäº†only-if-cached
+指令。
@@ -28,6 +28,6 @@
directive. The document was not found in the cache,
or it required
revalidation prohibited by
only-if-cached directive.
-±z°e¥X¤F¤@Ó¥]§t
only-if-cached §Ö¨ú±±¨î«ü¥Oªº³sµ²n¨D¡C¦Ó¤å¥ó¨Ã¥¼¦s¦b§Ö¨ú¦øªA¾¹¤¤¡A
©ÎªÌ
-³oÓ³s½un¨D³Q
only-if-cached «ü¥O»{©w¬O¸T¥Îªº¡C
+您é€å‡ºäº†ä¸€å€‹åŒ…å«
only-if-cached å¿«å–控制指令的連çµè¦æ±‚。而文件並未å˜åœ¨å¿«å–伺æœå™¨ä¸ï¼Œ
或者
+這個連線è¦æ±‚被
only-if-cached 指令èªå®šæ˜¯ç¦ç”¨çš„。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_READ_ERROR squid-3.1.0.4/errors/Traditional_Chinese/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_READ_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,32 +1,32 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Read Error
-
-Ū¨ú¿ù»~
+讀å–錯誤
-¨t²Î¦^À³¡G
+系統回應：
%E
An error condition occurred while reading data from the network. Please
retry your request.
-¥¿¦b³z¹Lºô¸ôŪ¨ú¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð¦A¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+æ£åœ¨é€éŽç¶²è·¯è®€å–資料時發生了錯誤的情æ³ï¼Œè«‹å†å˜—試一é您的連çµè¦æ±‚。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Traditional_Chinese/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_READ_TIMEOUT 2009-01-23 18:37:28.000000000 +1300
@@ -1,33 +1,33 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Read Timeout
-
-¶W¹LŪ¨ú®É
+超éŽè®€å–時é™
-¨t²Î¦^À³¡G
+系統回應：
%E
A Timeout occurred while waiting to read data from the network. The network
or server may be down or congested. Please retry your request.
-·í³z¹Lºô¸ôŪ¨ú¸ê®Æ®É¡A¶W¹L¤Fµ¥«Ý®É¡C³o¥i¯à¬O¦]¬°ºô¸ô©Î¬O±ý³sµ²ªººô¯¸¦øªA¾¹µo¥Í¾Ã¶ë©Î·lÃa¡C
-½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+當é€éŽç¶²è·¯è®€å–資料時，超éŽäº†ç‰å¾…時é™ã€‚這å¯èƒ½æ˜¯å› 為網路或是欲連çµçš„網站伺æœå™¨ç™¼ç”Ÿå£…塞或æ壞。
+è«‹é‡æ–°å˜—試一é您的連çµè¦æ±‚。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_SHUTTING_DOWN 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
This cache is in the process of shutting down and can not
service your request at this time. Please retry your
request again soon.
-¥»ºô¸ô§Ö¨ú¦øªA¾¹¥Ø«e¥¿¦b¶i¦æÃö³¬µ{§Ç¡A¼È®ÉµLªk¹ï±zªº³s½un¨D´£¨ÑªA°È¡C
-½Ðµy«Ý¤ù¨è«·s¹Á¸Õ³s½u¡C
+本網路快å–伺æœå™¨ç›®å‰æ£åœ¨é€²è¡Œé—œé–‰ç¨‹åºï¼Œæš«æ™‚無法å°æ‚¨çš„連線è¦æ±‚æä¾›æœå‹™ã€‚
+è«‹ç¨å¾…片刻é‡æ–°å˜—試連線。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_SOCKET_FAILURE 2009-01-23 18:37:28.000000000 +1300
@@ -1,33 +1,33 @@
-
-¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-¿ù»~
-±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+錯誤
+欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Socket Failure
-
-Socket «Ø¥ß¥¢±Ñ
+Socket 建立失敗
-¨t²Î¦^À³¡G
+系統回應：
%E
Squid is unable to create a TCP socket, presumably due to excessive load.
Please retry your request.
-Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^µLªk«Ø¥ß TCP socket¡A¥i¯à¬O¦]¬°¹L«ªºt²ü¾ÉP³oÓ°ÝÃD¡A
-½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+Squid （網路快å–程å¼ï¼‰ç„¡æ³•å»ºç«‹ TCP socket，å¯èƒ½æ˜¯å› 為éŽé‡çš„è² è·å°Žè‡´é€™å€‹å•é¡Œï¼Œ
+è«‹é‡æ–°å˜—試一é您的連çµè¦æ±‚。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_UNSUP_REQ squid-3.1.0.4/errors/Traditional_Chinese/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_UNSUP_REQ 2009-01-23 18:37:28.000000000 +1300
@@ -1,22 +1,22 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Unsupported Request Method and Protocol
-
-©|¥¼¤ä´©ªºn¨D¤è¦¡©Î³q°T¨ó©w
+尚未支æ´çš„è¦æ±‚æ–¹å¼æˆ–通訊å”定
@@ -24,7 +24,7 @@
Squid does not support all request methods for all access protocols.
For example, you can not POST a Gopher request.
-¦]¬° Squid ¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¤ä´©©Ò¦³ªº³sµ²n¨D¤è¦¡¦b¦U¦¡³q°T¨ó©w¤W¡C
-¤ñ¦p»¡¡A§A¤£¯àn¨D¤@Ó GOPHER ªº POST ³sµ²n¨D¡C
+å› ç‚º Squid （網路快å–程å¼ï¼‰ä¸¦æœªæ”¯æ´æ‰€æœ‰çš„連çµè¦æ±‚æ–¹å¼åœ¨å„å¼é€šè¨Šå”定上。
+æ¯”å¦‚èªªï¼Œä½ ä¸èƒ½è¦æ±‚一個 GOPHER çš„ POST 連çµè¦æ±‚。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_URN_RESOLVE squid-3.1.0.4/errors/Traditional_Chinese/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_URN_RESOLVE 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
URN ¤¤ªº¤@Óºô§}¡]URL¡^µLªk³Q¶Ç¦^
+
錯誤
+
URN ä¸çš„一個網å€ï¼ˆURL）無法被傳回
-·í¦b¹Á¸Õ¶Ç¦^¤U¦C URN ¦ì¸m®É¡G
+當在嘗試傳回下列 URN ä½ç½®æ™‚：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Cannot Resolve URN
-
-µLªk¸ÑĶ URN
+ç„¡æ³•è§£è¯ URN
Hey, don't expect too much from URNs on %T :)
-©êºp¡I±z¤£¯à¹ï URNs ¦b %T ¤W´Á«Ý¤Ó¦h :)
+抱æ‰ï¼æ‚¨ä¸èƒ½å° URNs 在 %T 上期待太多 :)
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_WRITE_ERROR squid-3.1.0.4/errors/Traditional_Chinese/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_WRITE_ERROR 2009-01-23 18:37:28.000000000 +1300
@@ -1,32 +1,32 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Write Error
-
-¼g¤J¿ù»~
+寫入錯誤
-¨t²Î¦^À³¡G
+系統回應：
%E
An error condition occurred while writing to the network. Please retry your
request.
-¥¿¦b³z¹Lºô¸ô¼g¤J¸ê®Æ®Éµo¥Í¤F¿ù»~ªº±¡ªp¡A½Ð«·s¹Á¸Õ¤@¹M±zªº³sµ²n¨D¡C
+æ£åœ¨é€éŽç¶²è·¯å¯«å…¥è³‡æ–™æ™‚發生了錯誤的情æ³ï¼Œè«‹é‡æ–°å˜—試一é您的連çµè¦æ±‚。
diff -u -r -N squid-3.1.0.3/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT 2009-01-23 18:37:28.000000000 +1300
@@ -1,27 +1,27 @@
-
-
¿ù»~¡G±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
+
錯誤：欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-
¿ù»~
-
±ý³sµ²¤§ºô§}¡]URL¡^µLªk¥¿½Tªº¶Ç¦^
+
錯誤
+
欲連çµä¹‹ç¶²å€ï¼ˆURL）無法æ£ç¢ºçš„傳回
-·í¹Á¸Õ¶Ç¦^¤U±ªººô§}¡]URL¡^®É¡G
+當嘗試傳回下é¢çš„網å€ï¼ˆURL）時：
%U
-µo¥Í¤F¤U¦Cªº¿ù»~¡G
+發生了下列的錯誤：
-
Zero Sized Reply
-
-¤j¤p¬°¹sªº¸ê®Æ¦^À³
+大å°ç‚ºé›¶çš„資料回應
Squid did not receive any data for this request.
-±zªº¦¹¦¸³s½un¨D¡ASquid¡]ºô¸ô§Ö¨úµ{¦¡¡^¨Ã¥¼¦Û±ý³sµ²ªººô¯¸¦øªA¾¹±µ¦¬¨ì¥ô¦ó¸ê®Æ¡C
+您的æ¤æ¬¡é€£ç·šè¦æ±‚，Squid（網路快å–程å¼ï¼‰ä¸¦æœªè‡ªæ¬²é€£çµçš„網站伺æœå™¨æŽ¥æ”¶åˆ°ä»»ä½•è³‡æ–™ã€‚
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_ACCESS_DENIED squid-3.1.0.4/errors/Turkish/ERR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Turkish/ERR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_CACHE_ACCESS_DENIED squid-3.1.0.4/errors/Turkish/ERR_CACHE_ACCESS_DENIED
--- squid-3.1.0.3/errors/Turkish/ERR_CACHE_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_CACHE_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
HATA: Cache Sunucusu Kullanamazsýnýz
-
-
-
-
-
HATA
-
Cache Sunucusunu Kullanamazsýnýz
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
--
-
-Cache Sunucusunu Kullanamazsýnýz.
-
-
-
-
Özür dilerim, istediðiniz:
-
%U
-adresine bu Cache Sunucusunu kullanarak ulaþamazsýnýz.
-
-
-Netscape 2.0 veya üstü, Microsoft Internet Exporer 3.0 veya üstü, veya herhangi HTTP/1.1 uyumlu
-tarayýcý kullandýðýnýza emin olun. Lütfen Cache Yöneticisi ile
-baðlantýya geçin, veya þifrenizi deðiþtirmek için
-buraya týklayýn.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED squid-3.1.0.4/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
--- squid-3.1.0.3/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
HATA: Cache Yönetici giriþi yasak
-
-
-
-
-
HATA
-
Cache Yönetici giriþi yasak
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
--
-
-Cache Yönetici giriþi yasak.
-
-
-
-
Özür dilerim, istediðiniz:
-
%U
-adresine bu cache yönetici giriþinden baðlanamazsýnýz.
-
-
Netscape 2.0 veya üstü, Microsoft Internet Exporer 3.0 veya üstü,
-veya herhangi HTTP/1.1 uyumlu tarayýcý kullandýðýnýza emin olun. Eðer sorun devam
-ediyor ise lütfen cache yöneticisi ile baðlantýya geçin
-Eðer yönetici siz iseniz Squid Yardým Sayfalarýnda Cache Yöneticisi giriþ arayüzü
-ile ilgili kýsýmlarý tekrar okuyun ve Cache sunucusunun hata mesajlarýný kontrol edin.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_CANNOT_FORWARD squid-3.1.0.4/errors/Turkish/ERR_CANNOT_FORWARD
--- squid-3.1.0.3/errors/Turkish/ERR_CANNOT_FORWARD 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_CANNOT_FORWARD 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Þu anda sizi yönlendiremem.
-
-
-
-Bu istek þu anda baþka bir Cache Sunucuya veya hedef WWW Sunucuya yönlendirilemez.
-Bunun sebebi aþaðýdakilerden herhangi biri olabilir:
-
-- Cache yöneticisi isteklerin hedef WWW sunucuya gitmesine izin vermiyor.
-
- Hiç bir ana Cache Sunucuya þu anda ulaþýlamýyor.
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_CONNECT_FAIL squid-3.1.0.4/errors/Turkish/ERR_CONNECT_FAIL
--- squid-3.1.0.3/errors/Turkish/ERR_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Baðlantý kurulamadý.
-
-
-
-Sistemden gelen mesaj:
-
%E
-
-Hedef WWW sunucu ile baðlantý kurulamadý. Lütfen tekrar deneyin.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_DNS_FAIL squid-3.1.0.4/errors/Turkish/ERR_DNS_FAIL
--- squid-3.1.0.3/errors/Turkish/ERR_DNS_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_DNS_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-%H isimli sunucuya ait herhangi bir IP adresi bulunamadý.
-
-
-
-DNS sunucusundan gelen cevap:
-
-%z
-
-
- Cache Sunucusu, verdiðiniz hedef WWW sunucusunun IP adresini bulamadý.
- Adresin doðru olup olmadýðýný tekrar kontrol ediniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_ESI squid-3.1.0.4/errors/Turkish/ERR_ESI
--- squid-3.1.0.3/errors/Turkish/ERR_ESI 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_ESI 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-ESI Processing failed.
-
-
-
-The ESI processor returned:
-
-%Z
-
-
-
-This means that:
-
- The surrogate was not able to process the ESI template. Please report this error to the webmaster.
-
-
Your webmaster is %w.
-
This page is in english because a translation has not been made. If you are able to, please create a translation and contact the squid project to get it included.
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FORWARDING_DENIED squid-3.1.0.4/errors/Turkish/ERR_FORWARDING_DENIED
--- squid-3.1.0.3/errors/Turkish/ERR_FORWARDING_DENIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FORWARDING_DENIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Yönlendirme yasak.
-
-
-
-Bu Cache Sunucu, yapýlan ayarlardan ve tanýmlanan kullanýcý hakklarýndan dolayý
-isteðinizi yönlendirememektedir. %i isimli Cache Sunucu ayarlarýnda bir yanlýþlýk olabilir.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_DISABLED squid-3.1.0.4/errors/Turkish/ERR_FTP_DISABLED
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_DISABLED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_DISABLED 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-FTP þu anda kapalý.
-
-
-
-Bu cache sunucu FTP desteklemiyor.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_FAILURE squid-3.1.0.4/errors/Turkish/ERR_FTP_FAILURE
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,24 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý.
-
-
-%U
-
-adresine ulaþmaya çalýþýrken FTP hatasý oluþtu.
-
-Squid, þu FTP komutlarýný gönderdi:
-
%f
-ve þu cevabý aldý:
-
%F
-
%g
-
-Bunun nedeni, verdiðiniz FTP URL adresinin RFC 1738'e uyumlu olmamasý olabilir.
-Bu durumda istediðiniz dokümaný
- %B adresinde bulabilirsiniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_FORBIDDEN squid-3.1.0.4/errors/Turkish/ERR_FTP_FORBIDDEN
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_FORBIDDEN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_FORBIDDEN 1970-01-01 12:00:00.000000000 +1200
@@ -1,20 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-An FTP authentication failure occurred
-while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_NOT_FOUND squid-3.1.0.4/errors/Turkish/ERR_FTP_NOT_FOUND
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_NOT_FOUND 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_NOT_FOUND 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-The following URL could not be retrieved:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_CREATED squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_CREATED
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_CREATED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_CREATED 1970-01-01 12:00:00.000000000 +1200
@@ -1,9 +0,0 @@
-
-
-
-
FTP PUT Baþarýlý: Dosya Yaratýldý
-
-
-
Ýþlem baþarýyla tamamlandý.
-
Dosya güncellendi.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_ERROR squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_ERROR
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
HATA: FTP dosya yüklemesi yapýlamadý
-
-
-
-
HATA
-
FTP dosya yüklemesi yapýlamadý
-
-
-%U
-
-adresine FTP ile dosya yüklemesi sýrasýnda
-
-Squid, aþaðýdaki FTP komutlarýný gönderdi:
-
- %f
-
-ve bu cevabý aldý:
-
- %F
-
-
-Lütfen dizin ismini, yetkilerinizi ve boþ disk alanýný kontrol ederek tekrar deneyiniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_MODIFIED squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_MODIFIED
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_PUT_MODIFIED 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_PUT_MODIFIED 1970-01-01 12:00:00.000000000 +1200
@@ -1,9 +0,0 @@
-
-
-
-
FTP PUT Baþarýlý: Dosya güncellendi
-
-
-
Ýþlem baþarýyla tamamlandý.
-
Dosya güncellendi.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_FTP_UNAVAILABLE squid-3.1.0.4/errors/Turkish/ERR_FTP_UNAVAILABLE
--- squid-3.1.0.3/errors/Turkish/ERR_FTP_UNAVAILABLE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_FTP_UNAVAILABLE 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-The FTP server was too busy while trying to retrieve the URL:
-%U
-
-Squid sent the following FTP command:
-
%f
-and then received this reply
-
%F
-
%g
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_ICAP_FAILURE squid-3.1.0.4/errors/Turkish/ERR_ICAP_FAILURE
--- squid-3.1.0.3/errors/Turkish/ERR_ICAP_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_ICAP_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,33 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-ICAP protocol error.
-
-
-
-
-The system returned:
-
%E
-
-
-This means that:
-Some aspect of the ICAP communication failed. Possible problems:
-
-- ICAP server is not reachable.
-
- Illegal response from ICAP server.
-
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_INVALID_REQ squid-3.1.0.4/errors/Turkish/ERR_INVALID_REQ
--- squid-3.1.0.3/errors/Turkish/ERR_INVALID_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_INVALID_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
-Vermiþ olduðunuz HTTP isteði yanlýþ. 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).
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_INVALID_RESP squid-3.1.0.4/errors/Turkish/ERR_INVALID_RESP
--- squid-3.1.0.3/errors/Turkish/ERR_INVALID_RESP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_INVALID_RESP 1970-01-01 12:00:00.000000000 +1200
@@ -1,29 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to process the request:
-
-%R
-
-
-The following error was encountered:
-
--
-
-Invalid Response
-
-
-
-
-The HTTP Response message received from the contacted server
-could not be understood or was otherwise malformed. Please contact
-the site operator. Your cache administrator may be able to provide
-you with more details about the exact nature of the problem if needed.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_INVALID_URL squid-3.1.0.4/errors/Turkish/ERR_INVALID_URL
--- squid-3.1.0.3/errors/Turkish/ERR_INVALID_URL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_INVALID_URL 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
-Vermiþ olduðunuz URL yanlýþ. Buna sebep aþaðidakilerden herhangi biri olabilir:
-
-- Eksik veya yanlýþ protokol ismi (`http://'' veya benzeri olmalý),
-
- Eksik adres,
-
- Adreste yanlýþ karakterler (alt çizgi, vs. kullanýlamaz).
-
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_LIFETIME_EXP squid-3.1.0.4/errors/Turkish/ERR_LIFETIME_EXP
--- squid-3.1.0.3/errors/Turkish/ERR_LIFETIME_EXP 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_LIFETIME_EXP 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Baðlantý süresi doldu.
-
-
-
-Squid, baðlantý süresi dolduðu için isteðinizi durdurdu.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_NO_RELAY squid-3.1.0.4/errors/Turkish/ERR_NO_RELAY
--- squid-3.1.0.3/errors/Turkish/ERR_NO_RELAY 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_NO_RELAY 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-WAIS Sunucu tanýmlý deðil.
-
-
-
-Bu Cache Sunucuda WAIS sunucu tanýmlý deðil. Lütfen Cache Yöneticisi ile baðlantýya geçiniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_ONLY_IF_CACHED_MISS squid-3.1.0.4/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
--- squid-3.1.0.3/errors/Turkish/ERR_ONLY_IF_CACHED_MISS 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_ONLY_IF_CACHED_MISS 1970-01-01 12:00:00.000000000 +1200
@@ -1,25 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Ýstediðiniz doðru doküman cache sunucusunda bulunamadý ve
only-if-cached
-(sadece Cache Sunucunda bulunuyor ise) tanýmlý.
-
-
-
-only-if-cached kontrol mekanizmalý istekte bulundunuz. Bu doküman
-cache sunucusunda bulunamadý veya bu mekanizmanýn izin vermediði tazeleme yapýlmasý gerekiyor.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_READ_ERROR squid-3.1.0.4/errors/Turkish/ERR_READ_ERROR
--- squid-3.1.0.3/errors/Turkish/ERR_READ_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_READ_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
-Sistem aþaðýdaki mesajý verdi:
-
%E
-
-Aðdan bilgileri okuma sýrasýnda hata oluþtu. Lütfen isteðinizi tekrar giriniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_READ_TIMEOUT squid-3.1.0.4/errors/Turkish/ERR_READ_TIMEOUT
--- squid-3.1.0.3/errors/Turkish/ERR_READ_TIMEOUT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_READ_TIMEOUT 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Okuma zamaný doldu (Read Timeout).
-
-
-
-Sistem aþaðýdaki mesajý verdi:
-
%E
-
-Ýstemiþ olduðunuz bilgileri aðdan okuma sýrasýnda okuma zamaný doldu. Hedef sunucu
-kapalý veya çok meþgul olabilir. Lütfen isteðinizi tekrar giriniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_SECURE_CONNECT_FAIL squid-3.1.0.4/errors/Turkish/ERR_SECURE_CONNECT_FAIL
--- squid-3.1.0.3/errors/Turkish/ERR_SECURE_CONNECT_FAIL 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_SECURE_CONNECT_FAIL 1970-01-01 12:00:00.000000000 +1200
@@ -1,31 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-Failed to establish a secure connection to %I
-
-
-
-
-The system returned:
-
%E
-
-
-This proxy and the remote host failed to negotiate a mutually acceptable
-security settings for handling your request. It is possible that the remote
-host does not support secure connections, or the proxy is not satisfied with
-the host security credentials.
-
-
Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_SHUTTING_DOWN squid-3.1.0.4/errors/Turkish/ERR_SHUTTING_DOWN
--- squid-3.1.0.3/errors/Turkish/ERR_SHUTTING_DOWN 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_SHUTTING_DOWN 1970-01-01 12:00:00.000000000 +1200
@@ -1,19 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
-
-This cache is in the process of shutting down and can not
-service your request at this time. Please retry your
-request again soon.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_SOCKET_FAILURE squid-3.1.0.4/errors/Turkish/ERR_SOCKET_FAILURE
--- squid-3.1.0.3/errors/Turkish/ERR_SOCKET_FAILURE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_SOCKET_FAILURE 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-
-
-HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-HATA
-Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Baðlantý hatasý (Socket Failure).
-
-
-
-Sistem aþaðýdaki mesajý verdi:
-
%E
-
-Squid, TCP baðlantý yaratamadý. Bunun nedeni hedef sunucunun çok fazla yüklenmiþ olmasý olabilir.
-Lütfen isteðinizi tekrar giriniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_TOO_BIG squid-3.1.0.4/errors/Turkish/ERR_TOO_BIG
--- squid-3.1.0.3/errors/Turkish/ERR_TOO_BIG 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_TOO_BIG 1970-01-01 12:00:00.000000000 +1200
@@ -1,28 +0,0 @@
-
-
-
ERROR: The requested URL could not be retrieved
-
-
-
ERROR
-
The requested URL could not be retrieved
-
-
-While trying to retrieve the URL:
-%U
-
-The following error was encountered:
-
--
-
-The request or reply is too large.
-
-
-If you are making a POST or PUT request, then your request body
-(the thing you are trying to upload) is too large. If you are
-making a GET request, then the reply body (what you are trying
-to download) is too large. These limits have been established
-by the Internet Service Provider who operates this cache. Please
-contact them directly if you feel this is an error.
-
-
-Your cache administrator is %w.
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_UNSUP_REQ squid-3.1.0.4/errors/Turkish/ERR_UNSUP_REQ
--- squid-3.1.0.3/errors/Turkish/ERR_UNSUP_REQ 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_UNSUP_REQ 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Desteklenmeyen istek yöntemi ve protokol.
-
-
-
-Squid, bazý eriþim protokollerin, bazý istek yöntemlerini desteklemiyor. Örneðin Gopher isteðinizde POST yapamazsýnýz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_URN_RESOLVE squid-3.1.0.4/errors/Turkish/ERR_URN_RESOLVE
--- squid-3.1.0.3/errors/Turkish/ERR_URN_RESOLVE 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_URN_RESOLVE 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
-%T de URN den fazla birsey beklemeyin. :)
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_WRITE_ERROR squid-3.1.0.4/errors/Turkish/ERR_WRITE_ERROR
--- squid-3.1.0.3/errors/Turkish/ERR_WRITE_ERROR 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_WRITE_ERROR 1970-01-01 12:00:00.000000000 +1200
@@ -1,26 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
-
-Sistem, aþaðýdaki mesajý verdi:
-
%E
-
-Bilgiler að üzerine gönderilirken hata oluþtu. Lütfen isteðinizi tekrar giriniz.
-
diff -u -r -N squid-3.1.0.3/errors/Turkish/ERR_ZERO_SIZE_OBJECT squid-3.1.0.4/errors/Turkish/ERR_ZERO_SIZE_OBJECT
--- squid-3.1.0.3/errors/Turkish/ERR_ZERO_SIZE_OBJECT 2008-12-05 16:09:29.000000000 +1300
+++ squid-3.1.0.4/errors/Turkish/ERR_ZERO_SIZE_OBJECT 1970-01-01 12:00:00.000000000 +1200
@@ -1,23 +0,0 @@
-
-
-
HATA: Ýstenilen URL'e ulaþýlamadý
-
-
-
-
HATA
-
Ýstenilen URL'e ulaþýlamadý
-
-
-%U
-
-adresine ulaþýrken aþaðýdaki hata oluþtu:
-
-
--
-
-Sýfýr Uzunlukta cevap.
-
-
-
-Squid, isteðiniz ile ilgili herhangi bir bilgi alamadý.
-
diff -u -r -N squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/configure squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/configure
--- squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/configure 2008-12-05 16:10:13.000000000 +1300
+++ squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/configure 2009-01-23 18:38:15.000000000 +1300
@@ -6357,12 +6357,6 @@
esac
fi
-if test "$ac_cv_header_gssapi_h" = "no" -a "$ac_cv_header_gssapi_gssapi_h" = "no"; then
- echo "GSSAPI headers are required to compile squid_kerb_auth"
- echo "Please install gssapi headers and then re-run configure"
- exit 1
-fi
-
old_LIBS=$LIBS
{ $as_echo "$as_me:$LINENO: checking for SPNEGO support" >&5
$as_echo_n "checking for SPNEGO support... " >&6; }
diff -u -r -N squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/configure.in 2008-12-05 16:09:30.000000000 +1300
+++ squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-01-23 18:37:30.000000000 +1300
@@ -313,12 +313,6 @@
esac
fi
-if test "$ac_cv_header_gssapi_h" = "no" -a "$ac_cv_header_gssapi_gssapi_h" = "no"; then
- echo "GSSAPI headers are required to compile squid_kerb_auth"
- echo "Please install gssapi headers and then re-run configure"
- exit 1
-fi
-
old_LIBS=$LIBS
AC_CACHE_CHECK([for SPNEGO support],ac_cv_have_spnego,[
AC_TRY_RUN([
diff -u -r -N squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/squid_compat.h squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/squid_compat.h
--- squid-3.1.0.3/helpers/negotiate_auth/squid_kerb_auth/squid_compat.h 2008-12-05 16:09:30.000000000 +1300
+++ squid-3.1.0.4/helpers/negotiate_auth/squid_kerb_auth/squid_compat.h 2009-01-23 18:37:30.000000000 +1300
@@ -12,14 +12,14 @@
#include "config.h"
- /* We want the Squid type and library definitions without the package ones */
+/* We want the Squid type and library definitions without the package ones */
#undef VERSION
#undef PACKAGE
#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
#endif /* HAVE_SQUID */
#endif /* SQUID__HELPERS_NEGOTIATE_AUTH_SQUID_KERB_AUTH_SQUID_COMPAT_H */
diff -u -r -N squid-3.1.0.3/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c squid-3.1.0.4/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c
--- squid-3.1.0.3/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c 2008-12-05 16:09:30.000000000 +1300
+++ squid-3.1.0.4/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c 2009-01-23 18:37:30.000000000 +1300
@@ -316,8 +316,7 @@
return;
/* notreached */
case NTLM_CHALLENGE:
- SEND
- ("NA Got a challenge. We refuse to have our authority disputed");
+ SEND("NA Got a challenge. We refuse to have our authority disputed");
return;
/* notreached */
case NTLM_AUTHENTICATE:
@@ -415,8 +414,10 @@
(ntlm_authenticate *) decoded, plen);
return;
}
+ SEND("BH unknown internal error.");
+ return;
}
- assert(cred != NULL);
+
lc(cred); /* let's lowercase them for our convenience */
SEND2("AF %s", cred);
return;
diff -u -r -N squid-3.1.0.3/include/autoconf.h.in squid-3.1.0.4/include/autoconf.h.in
--- squid-3.1.0.3/include/autoconf.h.in 2008-12-05 16:09:45.000000000 +1300
+++ squid-3.1.0.4/include/autoconf.h.in 2009-01-23 18:37:48.000000000 +1300
@@ -284,9 +284,6 @@
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
diff -u -r -N squid-3.1.0.3/include/CbDataList.h squid-3.1.0.4/include/CbDataList.h
--- squid-3.1.0.3/include/CbDataList.h 2008-12-05 16:09:30.000000000 +1300
+++ squid-3.1.0.4/include/CbDataList.h 2009-01-23 18:37:30.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id: List.h,v 1.8 2008/02/26 21:49:33 amosjeffries Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
diff -u -r -N squid-3.1.0.3/include/IPAddress.h squid-3.1.0.4/include/IPAddress.h
--- squid-3.1.0.3/include/IPAddress.h 2008-12-05 16:09:30.000000000 +1300
+++ squid-3.1.0.4/include/IPAddress.h 1970-01-01 12:00:00.000000000 +1200
@@ -1,436 +0,0 @@
-/*
- * $Id: IPAddress.h,v 1.3 2008/02/05 22:39:42 amosjeffries Exp $
- *
- * DEBUG: section 14 IP Storage and Handling
- * AUTHOR: Amos Jeffries
- *
- * SQUID Internet Object Cache http://squid.nlanr.net/Squid/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from the
- * Internet community. Development is led by Duane Wessels of the
- * National Laboratory for Applied Network Research and funded by the
- * National Science Foundation. Squid is Copyrighted (C) 1998 by
- * the Regents of the University of California. Please see the
- * COPYRIGHT file for full details. Squid incorporates software
- * developed and/or copyrighted by other sources. Please see the
- * CREDITS file for full details.
- *
- * This IPAddress code is copyright (C) 2007 by Treehouse Networks Ltd
- * of New Zealand. It is published and Lisenced as an extension of
- * squid under the same conditions as the main squid application.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- */
-#ifndef _INC_IPADDRESS_H
-#define _INC_IPADDRESS_H
-
-#include "getaddrinfo.h"
-#include "getnameinfo.h"
-#include "inet_ntop.h"
-#include "inet_pton.h"
-
-
-#if HAVE_SYS_SOCKET_H
-#include
-#endif
-#if HAVE_NETINET_IN_H
-#include
-#endif
-#ifdef _SQUID_MSWIN_
-#include
-#endif
-#if HAVE_NETDB_H && !defined(_SQUID_NETDB_H_) /* protect NEXTSTEP */
-#define _SQUID_NETDB_H_
-#ifdef _SQUID_NEXT_
-#include
-#endif
-#include
-#endif
-
-#include
-#include
-
-
-/* FreeBSD hack:
- * This OS has at least one version that defines these as private
- * kernel macros commented as being 'non-standard'.
- * We need to use them, much nicer than the OS-provided __u*_*[]
- * UPDATE: OpenBSD 4.3 has the same.
- */
-#if USE_IPV6 && ( defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) )
-//#define s6_addr8 __u6_addr.__u6_addr8
-//#define s6_addr16 __u6_addr.__u6_addr16
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-
-/* OpenBSD also hide v6only socket option we need for comm layer. :-( */
-#if !defined(IPV6_V6ONLY) && defined(_SQUID_OPENBSD_)
-#define IPV6_V6ONLY 27 // from OpenBSD 4.3 headers. (NP: does not match non-BSD OS values)
-#endif
-
-/* Bug 2500: Solaris 10/11 require s6_addr* defines. */
-#if USE_IPV6 && defined(_SQUID_SOLARIS_)
-//#define s6_addr8 _S6_un._S6_u8
-//#define s6_addr16 _S6_un._S6_u16
-#define s6_addr32 _S6_un._S6_u32
-#endif
-
-/// Length of buffer that needs to be allocated to old a null-terminated IP-string
-// Yuck. But there are still structures that need it to be an 'integer constant'.
-#define MAX_IPSTRLEN 75
-
-/**
- * Holds and manipulates IPv4, IPv6, and Socket Addresses.
- */
-class IPAddress
-{
-
-public:
- /** @name Constructors and Destructor */
- /*@{*/
- IPAddress();
- IPAddress(const IPAddress &);
-
- /**
- * This constructor takes its own copy of the object pointed to for memory-safe usage later.
- * The caller must itself perform and ptr memory-management needed.
- *
- \deprecated Use of pointers can be nasty. Consider this a last-resort.
- * Prefer the by-reference (&) version instead.
- */
- IPAddress(IPAddress *);
-
- IPAddress(const struct in_addr &);
-
- IPAddress(const struct sockaddr_in &);
-#if USE_IPV6
-
- IPAddress(const struct in6_addr &);
-
- IPAddress(const struct sockaddr_in6 &);
-#endif
-
- IPAddress(const struct hostent &);
- IPAddress(const struct addrinfo &);
- IPAddress(const char*);
- /// Default destructor.
- ~IPAddress();
- /*@}*/
-
- /** @name Assignment Operators */
- /*@{*/
- IPAddress& operator =(const IPAddress &s);
- IPAddress& operator =(IPAddress *s);
- IPAddress& operator =(struct sockaddr_in const &s);
- IPAddress& operator =(struct sockaddr_storage const &s);
- IPAddress& operator =(struct in_addr const &s);
-#if USE_IPV6
- IPAddress& operator =(struct in6_addr const &s);
- IPAddress& operator =(struct sockaddr_in6 const &s);
-#endif
- bool operator =(const struct hostent &s);
- bool operator =(const struct addrinfo &s);
- bool operator =(const char *s);
- /*@}*/
-
- /** @name Boolean Operators */
- /*@{*/
- bool operator ==(IPAddress const &s) const;
- bool operator !=(IPAddress const &s) const;
- bool operator >=(IPAddress const &rhs) const;
- bool operator <=(IPAddress const &rhs) const;
- bool operator >(IPAddress const &rhs) const;
- bool operator <(IPAddress const &rhs) const;
-
-public:
- /* methods */
-
- /** Test whether content can be used as an IPv4 address
- \retval true if content was received as an IPv4 address
- \retval true if content was received as an IPv4-Mapped address
- \retval false if content was received as a non-mapped IPv6 native address.
- */
- bool IsIPv4() const;
-
- /** Test whether content can be used as an IPv6 address.
- \retval true if --enable-ipv6 has been compiled.
- \retval false if --disable-ipv6 has been compiled.
- \retval false if --with-ipv6-split-stack has been compiled AND content is IPv4-mapped.
- */
- bool IsIPv6() const;
-
- /** Test whether content can be used as a Socket address.
- \retval true if address AND port are both set
- \retval true if content was received as a Socket address with port
- \retval false if port in unset (zero)
- */
- bool IsSockAddr() const;
-
- /** Content-neutral test for whether the specific IP case ANY_ADDR is stored.
- * This is the default content of a new undefined IPAddress object.
- \retval true IPv4 0.0.0.0
- \retval true IPv6 ::
- \retval false anything else.
- */
- bool IsAnyAddr() const;
-
- /** Content-neutral test for whether the specific IP case NO_ADDR is stored.
- \retval true IPv4 255.255.255.255
- \retval true IPv6 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
- \retval false anything else.
- */
- bool IsNoAddr() const;
-
- /** Content-neutral test for whether the specific IP case LOCALHOST is stored.
- * This is the default content of a new undefined IPAddress object.
- \retval true IPv4 127.0.0.1
- \retval true IPv6 ::1
- \retval false anything else.
- */
- bool IsLocalhost() const;
-
- /*@}*/
-
- /** Retrieve the Port if stored.
- \retval 0 Port is unset or an error occured.
- \retval n Port associated with this address in host native -endian.
- */
- u_short GetPort() const;
-
- /** Set the Port value for an address.
- * Replaces any previously existing Port value.
- \param port Port being assigned in host native -endian.
- \retval 0 Port is unset or an error occured.
- \retval n Port associated with this address in host native -endian.
- */
- u_short SetPort(u_short port);
-
- /// Set object to contain the specific IP case ANY_ADDR (format-neutral).
- /// see IsAnyAddr() for more detail.
- void SetAnyAddr();
-
- /// Set object to contain the specific IP case NO_ADDR (format-neutral).
- /// see \link IsNoAddr() for more detail.
- void SetNoAddr();
-
- /// Set object to contain the specific IP case LOCALHOST (format-neutral).
- /// see \link IsLocalhost() for more detail.
- void SetLocalhost();
-
- /// Fast reset of the stored content to what would be after default constructor.
- void SetEmpty();
-
- /** Require an IPv4-only address for this usage.
- * Converts the object to prefer only IPv4 output.
- \retval true Content can be IPv4
- \retval false Content CANNOT be IPv4
- */
- bool SetIPv4();
-
- /**
- * Valid results IF and only IF the stored IP address is actually a network bitmask
- \retval N number of bits which are set in the bitmask stored.
- */
- int GetCIDR() const;
-
- /** Apply a mask to the stored address.
- \param mask Netmask format to be bit-mask-AND'd over the stored address.
- */
- const int ApplyMask(const IPAddress &mask);
-
- /** Apply a mask to the stored address.
- * CIDR will be converted appropriate to map the stored content.
- \param cidr CIDR Mask being applied. As an integer in host format.
- \param mtype Type of CIDR mask being applied (AF_INET or AF_INET6)
- */
- bool ApplyMask(const unsigned int cidr, int mtype = AF_UNSPEC);
-
-
- /** Return the ASCII equivalent of the address
- * Semantically equivalent to the IPv4 inet_ntoa()
- * eg. 127.0.0.1 (IPv4) or ::1 (IPv6)
- * But for memory safety it requires a buffer as input
- * instead of producing one magically.
- * If buffer is not large enough the data is truncated silently.
- \param buf Allocated buffer to write address to
- \param len byte length of buffer available for writing.
- \param force (optional) require the IPA in a specific format.
- \return pointer to buffer received.
- */
- char* NtoA(char *buf, unsigned int len, int force = AF_UNSPEC) const;
-
- /** Return the ASCII equivalent of the address:port combination
- * Provides a URL formatted version of the content.
- * If buffer is not large enough the data is truncated silently.
- * eg. 127.0.0.1:80 (IPv4) or [::1]:80 (IPv6)
- \param buf Allocated buffer to write address:port to
- \param len byte length of buffer available for writing.
- \return pointer to buffer received.
- */
- char* ToURL(char *buf, unsigned int len) const;
-
- /** Return a properly hostname formatted copy of the address
- * Provides a URL formatted version of the content.
- * If buffer is not large enough the data is truncated silently.
- * eg. 127.0.0.1 (IPv4) or [::1] (IPv6)
- \param buf Allocated buffer to write address to
- \param len byte length of buffer available for writing.
- \return pointer to buffer received.
- */
- unsigned int ToHostname(char *buf, const unsigned int len) const;
-
- /**
- * Convert the content into a Reverse-DNS string.
- * The buffer sent MUST be allocated large enough to hold the resulting string.
- * Name truncation will occur if buf does not have enough space.
- * The constant MAX_IPSTRLEN is defined to provide for sizing arrays correctly.
- \param show_format may be one of: AF_INET, AF_INET6 for the format of rDNS string wanted.
- \param buf buffer to receive the text string output.
- */
- bool GetReverseString(char buf[], int show_format = AF_UNSPEC) const;
-
- /** Test how two IP relate to each other.
- \retval 0 IP are equal
- \retval 1 IP rhs is greater (numerically) than that stored.
- \retval -1 IP rhs is less (numerically) than that stored.
- */
- int matchIPAddr(const IPAddress &rhs) const;
-
- /**
- * Get RFC 3493 addrinfo structure from the IPAddress data
- * for protocol-neutral socket operations.
- * Should be passed a NULL pointer of type struct addrinfo* it will
- * allocate memory for the structures involved. (see FreeAddrInfo to clear).
- * Defaults to a TCP streaming socket, if other values (such as UDP) are needed
- * the caller MUST override these default settings.
- * Some situations may also require an actual call to the system getaddrinfo()
- * to pull relevant OS details for the socket.
- \par
- * IPAddress allocated objects MUST be destructed by IPAddress::FreeAddrInfo
- * System getaddrinfo() allocated objects MUST be freed with system freeaddrinfo()
- \par
- * Some OS require that IPv4 addresses are pre-mapped by the client.
- * The configure option --with-ipv4-mapping=yes will enable this.
- *
- \param ai structure to be filled out.
- \param force a specific sockaddr type is needed. default: don't care.
- */
-#if IPV6_SPECIAL_V4MAPPING
- void GetAddrInfo(struct addrinfo *&ai, int force = AF_INET6) const;
-#else
- void GetAddrInfo(struct addrinfo *&ai, int force = AF_UNSPEC) const;
-#endif
-
- /**
- * Equivalent to the sysem call freeaddrinfo() but for IPAddress allocated data
- */
- void FreeAddrInfo(struct addrinfo *&ai) const;
-
- /**
- * Initializes an empty addrinfo properly for use.
- * It is intended for use in cases such as getsockopt() where the addrinfo is
- * about to be changed and the stored details may not match the new ones coming.
- \param ai addrinfo struct to be initialized as AF_UNSPEC with large address buffer
- */
- void InitAddrInfo(struct addrinfo *&ai) const;
-
- /**
- * Lookup a Host by Name. Equivalent to system call gethostbyname(char*)
- \param s The textual FQDN of the host being located.
- \retval true lookup was successful and an IPA was located.
- \retval false lookup failed or FQDN has no IP associated.
- */
- bool GetHostByName(const char *s);
-
-public:
- /* FIXME: When C => C++ conversion is done will be fully private.
- * Legacy Transition Methods.
- * These are here solely to simplify the transition
- * when moving from converted code to unconverted
- * these functions can be used to convert this object
- * and pull out the data needed by the unconverted code
- * they are intentionaly hard to use, use GetAddrInfo() instead.
- * these functiosn WILL NOT be in the final public API after transition.
- */
-
- void GetSockAddr(struct sockaddr_storage &addr, const int family) const;
-
- /// \deprecated Deprecated for public use. Use IPAddress::GetAddrInfo()
- void GetSockAddr(struct sockaddr_in &) const;
-
- /// \deprecated Deprecated for public use. Use IPAddress::GetAddrInfo()
- bool GetInAddr(struct in_addr &) const; /* false if could not convert IPv6 down to IPv4 */
-#if USE_IPV6
-
- /// \deprecated Deprecated for public use. Use IPAddress::GetAddrInfo()
- void GetSockAddr(struct sockaddr_in6 &) const;
-
- /// \deprecated Deprecated for public use. Use IPAddress::GetAddrInfo()
- void GetInAddr(struct in6_addr &) const;
-#endif
-
-private:
- /* Conversion for dual-type internals */
-
- bool GetReverseString4(char buf[], const struct in_addr &) const;
-
- void check4Mapped();
-
-#if USE_IPV6
-
- bool GetReverseString6(char buf[], const struct in6_addr &) const;
-
- void Map4to6(const struct in_addr &src, struct in6_addr &dest) const;
-
- void Map6to4(const struct in6_addr &src, struct in_addr &dest) const;
-#endif
-
- // Worker behind GetHostName and char* converters
- bool LookupHostIP(const char *s, bool nodns);
-
- /* variables */
-#if USE_IPV6
-
- struct sockaddr_in6 m_SocketAddr;
-#else
-
- struct sockaddr_in m_SocketAddr;
-#endif
-};
-
-
-inline std::ostream &
-operator << (std::ostream &os, const IPAddress &ipa)
-{
- char buf[MAX_IPSTRLEN];
- os << ipa.ToURL(buf,MAX_IPSTRLEN);
- return os;
-}
-
-// WAS _sockaddr_in_list in an earlier incarnation
-class IPAddress_list
-{
-public:
- IPAddress_list() { next = NULL; };
- ~IPAddress_list() { if (next) delete next; next = NULL; };
-
- IPAddress s;
- IPAddress_list *next;
-};
-
-
-#endif /* _INC_IPADDRESS_H */
diff -u -r -N squid-3.1.0.3/include/version.h squid-3.1.0.4/include/version.h
--- squid-3.1.0.3/include/version.h 2008-12-05 16:10:13.000000000 +1300
+++ squid-3.1.0.4/include/version.h 2009-01-23 18:38:15.000000000 +1300
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1228446566
+#define SQUID_RELEASE_TIME 1232689045
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.1.0.3/lib/IPAddress.cc squid-3.1.0.4/lib/IPAddress.cc
--- squid-3.1.0.3/lib/IPAddress.cc 2008-12-05 16:09:31.000000000 +1300
+++ squid-3.1.0.4/lib/IPAddress.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,1244 +0,0 @@
-/*
- * $Id: IPAddress.cc,v 1.4 2008/02/15 09:45:57 amosjeffries Exp $
- *
- * DEBUG: section 14 IP Storage and Handling
- * AUTHOR: Amos Jeffries
- *
- * SQUID Internet Object Cache http://squid.nlanr.net/Squid/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from the
- * Internet community. Development is led by Duane Wessels of the
- * National Laboratory for Applied Network Research and funded by the
- * National Science Foundation. Squid is Copyrighted (C) 1998 by
- * the Regents of the University of California. Please see the
- * COPYRIGHT file for full details. Squid incorporates software
- * developed and/or copyrighted by other sources. Please see the
- * CREDITS file for full details.
- *
- * This IPAddress code is copyright (C) 2007 by Treehouse Networks Ltd
- * of New Zealand. It is published and Lisenced as an extension of
- * squid under the same conditions as the main squid application.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- */
-
-#include "config.h"
-#include "IPAddress.h"
-#include "util.h"
-
-
-#if HAVE_ASSERT_H
-#include
-#endif
-#if HAVE_STDLIB_H
-#include
-#endif
-#if HAVE_STRING_H
-#include
-#endif
-#if HAVE_ARPA_INET_H
-#include /* inet_ntoa() */
-#endif
-
-#ifdef INET6
-#error "INET6 defined but has been deprecated! Try running bootstrap and configure again."
-#endif
-
-/* We want to use the debug routines when running as module of squid. */
-/* otherwise fallback to printf if those are not available. */
-#ifndef SQUID_DEBUG
-# define debugs(a,b,c) // drop.
-#else
-#warning "IPAddress built with Debugs!!"
-# include "../src/Debug.h"
-#endif
-
-#if !USE_IPV6
-// So there are some places where I will drop to using Macros too.
-// At least I can restrict them to this file so they don't corrupt the app with C code.
-# define sin6_addr sin_addr
-# define sin6_port sin_port
-# define sin6_family sin_family
-#undef s6_addr
-# 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) \
- if(!(b)){ printf("assert \"%s\" at line %d\n", a, __LINE__); \
- printf("IPAddress invalid? with IsIPv4()=%c, IsIPv6()=%c\n",(IsIPv4()?'T':'F'),(IsIPv6()?'T':'F')); \
- printf("ADDRESS:"); \
- for(unsigned int i = 0; i < sizeof(m_SocketAddr.sin6_addr); i++) { \
- printf(" %x", m_SocketAddr.sin6_addr.s6_addr[i]); \
- } printf("\n"); assert(b); \
- }
-#else
-#define IASSERT(a,b) \
- if(!(b)){ printf("assert \"%s\" at line %d\n", a, __LINE__); \
- printf("IPAddress invalid? with IsIPv4()=%c, IsIPv6()=%c\n",(IsIPv4()?'T':'F'),(IsIPv6()?'T':'F')); \
- printf("ADDRESS: %x\n", (unsigned int)m_SocketAddr.sin_addr.s_addr); \
- assert(b); \
- }
-#endif
-
-IPAddress::IPAddress()
-{
- SetEmpty();
-}
-
-IPAddress::~IPAddress()
-{
- memset(this,0,sizeof(IPAddress));
-}
-
-int
-IPAddress::GetCIDR() const
-{
- uint8_t shift,byte;
- uint8_t bit,caught;
- int len = 0;
-#if USE_IPV6
- const uint8_t *ptr= m_SocketAddr.sin6_addr.s6_addr;
-#else
- const uint8_t *ptr= (uint8_t *)&m_SocketAddr.sin_addr.s_addr;
-#endif
-
- /* Let's scan all the bits from Most Significant to Least */
- /* Until we find an "0" bit. Then, we return */
- shift=0;
-
-#if USE_IPV6
- /* return IPv4 CIDR for any Mapped address */
- /* Thus only check the mapped bit */
-
- if ( !IsIPv6() ) {
- shift = 12;
- }
-
-#endif
-
- for (;shift 128)
- return false;
-
- if (cidr > 32 && mtype == AF_INET)
- return false;
-
- clearbits = (uint8_t)( (mtype==AF_INET6?128:32) -cidr);
-
- // short-cut
- if (clearbits == 0)
- return true;
-
-#if USE_IPV6
-
- p = (uint8_t*)(&m_SocketAddr.sin6_addr) + 15;
-
-#else
-
- p = (uint8_t*)(&m_SocketAddr.sin_addr) + 3;
-
-#endif
-
- for (; clearbits>0 && p >= (uint8_t*)&m_SocketAddr.sin6_addr ; p-- ) {
- if (clearbits < 8) {
- *p &= ((0xFF << clearbits) & 0xFF);
- clearbits = 0;
- } else {
- *p &= 0x00;
- clearbits -= 8;
- }
- }
-
- return true;
-}
-
-bool IPAddress::IsSockAddr() const
-{
- return (m_SocketAddr.sin6_port != 0);
-}
-
-bool IPAddress::IsIPv4() const
-{
-#if USE_IPV6
-
- return IsAnyAddr() || IsNoAddr() ||
-#if IPV6_SPECIAL_LOCALHOST
- IsLocalhost() ||
-#endif
- ( m_SocketAddr.sin6_addr.s6_addr32[0] == htonl(0x00000000) &&
- m_SocketAddr.sin6_addr.s6_addr32[1] == htonl(0x00000000) &&
- m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0x0000FFFF)
- );
-
-#else
- return true; // enforce IPv4 in IPv4-only mode.
-#endif
-}
-
-bool IPAddress::IsIPv6() const
-{
-#if USE_IPV6
-
- return IsAnyAddr() || IsNoAddr() ||
-#if IPV6_SPECIAL_LOCALHOST
- IsLocalhost() ||
-#endif
- !( m_SocketAddr.sin6_addr.s6_addr32[0] == htonl(0x00000000) &&
- m_SocketAddr.sin6_addr.s6_addr32[1] == htonl(0x00000000) &&
- m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0x0000FFFF)
- );
-#else
- return false; // enforce IPv4 in IPv4-only mode.
-#endif
-}
-
-bool IPAddress::IsAnyAddr() const
-{
-#if USE_IPV6
- return m_SocketAddr.sin6_addr.s6_addr32[0] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[2] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[3] == 0
- ;
-#else
-
- return (INADDR_ANY == m_SocketAddr.sin_addr.s_addr);
-#endif
-}
-
-/// NOTE: Does NOT clear the Port stored. Ony the Address and Type.
-void IPAddress::SetAnyAddr()
-{
-#if USE_IPV6
- memset(&m_SocketAddr.sin6_addr, 0, sizeof(struct in6_addr) );
-#else
- memset(&m_SocketAddr.sin_addr, 0, sizeof(struct in_addr) );
-#endif
-}
-
-/// NOTE: completely empties the IPAddress structure. Address, Port, Type, everything.
-void IPAddress::SetEmpty()
-{
- memset(&m_SocketAddr, 0, sizeof(m_SocketAddr) );
-}
-
-bool IPAddress::SetIPv4()
-{
-#if USE_IPV6
-
-#if !IPV6_SPECIAL_LOCALHOST
- if ( IsLocalhost() ) {
- m_SocketAddr.sin6_addr.s6_addr32[2] = htonl(0xffff);
- m_SocketAddr.sin6_addr.s6_addr32[3] = htonl(0x7F000001);
- return true;
- }
-#endif
-
- if ( IsAnyAddr() ) {
- m_SocketAddr.sin6_addr.s6_addr32[2] = htonl(0xffff);
- return true;
- }
-
- if ( IsIPv4())
- return true;
-
- // anything non-IPv4 and non-convertable is BAD.
- return false;
-#else
- return true; // Always IPv4 in IPv4-only builds.
-#endif
-}
-
-bool IPAddress::IsLocalhost() const
-{
-#if USE_IPV6
- return ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[2] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x1)
- )
-#if !IPV6_SPECIAL_LOCALHOST
- ||
- ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
- && m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0xffff)
- && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x7F000001)
- )
-#endif
- ;
-#else
-
- return (htonl(0x7F000001) == m_SocketAddr.sin_addr.s_addr);
-#endif
-}
-
-void IPAddress::SetLocalhost()
-{
-#if USE_IPV6
- SetAnyAddr();
- m_SocketAddr.sin6_addr.s6_addr[15] = 0x1;
- m_SocketAddr.sin6_family = AF_INET6;
-
-#else
- m_SocketAddr.sin_addr.s_addr = htonl(0x7F000001);
- m_SocketAddr.sin_family = AF_INET;
-#endif
-}
-
-bool IPAddress::IsNoAddr() const
-{
- // IFF the address == 0xff..ff (all ones)
-#if USE_IPV6
- return m_SocketAddr.sin6_addr.s6_addr32[0] == 0xFFFFFFFF
- && m_SocketAddr.sin6_addr.s6_addr32[1] == 0xFFFFFFFF
- && m_SocketAddr.sin6_addr.s6_addr32[2] == 0xFFFFFFFF
- && m_SocketAddr.sin6_addr.s6_addr32[3] == 0xFFFFFFFF
- ;
-#else
-
- return 0xFFFFFFFF == m_SocketAddr.sin_addr.s_addr;
-#endif
-}
-
-void IPAddress::SetNoAddr()
-{
-#if USE_IPV6
- memset(&m_SocketAddr.sin6_addr, 0xFFFFFFFF, sizeof(struct in6_addr) );
- m_SocketAddr.sin6_family = AF_INET6;
-#else
- memset(&m_SocketAddr.sin_addr, 0xFFFFFFFF, sizeof(struct in_addr) );
- m_SocketAddr.sin_family = AF_INET;
-#endif
-}
-
-#if USE_IPV6
-
-bool IPAddress::GetReverseString6(char buf[MAX_IPSTRLEN], const struct in6_addr &dat) const
-{
- char *p = buf;
- unsigned char const *r = dat.s6_addr;
-
- /* RFC1886 says: */
- /* 4321:0:1:2:3:4:567:89ab */
- /* must be sent */
- /* b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0.2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.int. */
-
- /* Work from the binary field. Anything else may have representation changes. */
- /* The sin6_port and sin6_addr members shall be in network byte order. */
-
- /* Compile Err: 'Too many arguments for format. */
-
- for (int i = 15; i >= 0; i--, p+=4) {
- snprintf(p, 5, "%x.%x.", ((r[i])&0xf), (((r[i])>>4)&0xf) );
- }
-
- /* RFC3152 says: */
- /* ip6.int is now deprecated TLD, use ip6.arpa instead. */
- snprintf(p,10,"ip6.arpa.");
-
- return true;
-}
-
-#endif
-
-bool IPAddress::GetReverseString4(char buf[MAX_IPSTRLEN], const struct in_addr &dat) const
-{
- unsigned int i = (unsigned int) ntohl(dat.s_addr);
- snprintf(buf, 32, "%u.%u.%u.%u.in-addr.arpa.",
- i & 255,
- (i >> 8) & 255,
- (i >> 16) & 255,
- (i >> 24) & 255);
- return true;
-}
-
-bool IPAddress::GetReverseString(char buf[MAX_IPSTRLEN], int show_type) const
-{
-
- if (show_type == AF_UNSPEC) {
-#if USE_IPV6
- show_type = IsIPv6() ? AF_INET6 : AF_INET ;
-#else
- show_type = AF_INET;
-#endif
- }
-
- if (show_type == AF_INET && IsIPv4()) {
-#if USE_IPV6
-
- return GetReverseString4(buf, *(struct in_addr*)&m_SocketAddr.sin6_addr.s6_addr32[3] );
- } else if ( show_type == AF_INET6 && IsIPv6() ) {
- return GetReverseString6(buf, m_SocketAddr.sin6_addr);
-#else
- return GetReverseString4(buf, m_SocketAddr.sin_addr);
-#endif
- }
-
- debugs(14,0, "Unable to convert '" << NtoA(buf,MAX_IPSTRLEN) << "' to the rDNS type requested.");
-
- buf[0] = '\0';
-
- return false;
-}
-
-IPAddress& IPAddress::operator =(const IPAddress &s)
-{
- memcpy(this, &s, sizeof(IPAddress));
- return *this;
-};
-
-IPAddress::IPAddress(const char*s)
-{
- SetEmpty();
- operator=(s);
-}
-
-bool IPAddress::operator =(const char* s)
-{
- return LookupHostIP(s, true);
-}
-
-bool IPAddress::GetHostByName(const char* s)
-{
- return LookupHostIP(s, false);
-}
-
-bool IPAddress::LookupHostIP(const char *s, bool nodns)
-{
- int err = 0;
-
- short port = 0;
-
- struct addrinfo *res = NULL;
-
- struct addrinfo want;
-
- memset(&want, 0, sizeof(struct addrinfo));
- if (nodns) {
- want.ai_flags = AI_NUMERICHOST; // prevent actual DNS lookups!
- }
-#if !USE_IPV6
- want.ai_family = AF_INET;
-#endif
-
- if ( (err = xgetaddrinfo(s, NULL, &want, &res)) != 0) {
- debugs(14,1, HERE << "Given Bad IP '" << s << "': " << xgai_strerror(err) );
- /* free the memory xgetaddrinfo() dynamically allocated. */
- if (res) {
- xfreeaddrinfo(res);
- res = NULL;
- }
- return false;
- }
-
- /*
- * NP: =(sockaddr_*) may alter the port. we don't want that.
- * all we have been given as input was an IPA.
- */
- port = GetPort();
- operator=(*res);
- SetPort(port);
-
- /* free the memory xgetaddrinfo() dynamically allocated. */
- xfreeaddrinfo(res);
-
- res = NULL;
-
- return true;
-}
-
-IPAddress::IPAddress(struct sockaddr_in const &s)
-{
- SetEmpty();
- operator=(s);
-};
-
-IPAddress& IPAddress::operator =(struct sockaddr_in const &s)
-{
-#if USE_IPV6
- Map4to6((const in_addr)s.sin_addr, m_SocketAddr.sin6_addr);
- m_SocketAddr.sin6_port = s.sin_port;
- m_SocketAddr.sin6_family = AF_INET6;
-#else
-
- memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
-#endif
-
- /* maintain stored family values properly */
- check4Mapped();
-
- return *this;
-};
-
-IPAddress& IPAddress::operator =(const struct sockaddr_storage &s)
-{
-#if USE_IPV6
- /* some AF_* magic to tell socket types apart and what we need to do */
- if (s.ss_family == AF_INET6) {
- memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
- } else { // convert it to our storage mapping.
- struct sockaddr_in *sin = (struct sockaddr_in*)&s;
- m_SocketAddr.sin6_port = sin->sin_port;
- Map4to6( sin->sin_addr, m_SocketAddr.sin6_addr);
- }
-#else
- memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
-#endif
- return *this;
-};
-
-void IPAddress::check4Mapped()
-{
- // obsolete.
- // TODO use this NOW to set the sin6_family properly on exporting. not on import.
-}
-
-#if USE_IPV6
-IPAddress::IPAddress(struct sockaddr_in6 const &s)
-{
- SetEmpty();
- operator=(s);
-};
-
-IPAddress& IPAddress::operator =(struct sockaddr_in6 const &s)
-{
- memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in6));
-
- /* maintain address family properly */
- check4Mapped();
- return *this;
-};
-
-#endif
-
-IPAddress::IPAddress(struct in_addr const &s)
-{
- SetEmpty();
- operator=(s);
-};
-
-IPAddress& IPAddress::operator =(struct in_addr const &s)
-{
-#if USE_IPV6
- Map4to6((const in_addr)s, m_SocketAddr.sin6_addr);
- m_SocketAddr.sin6_family = AF_INET6;
-
-#else
-
- memcpy(&m_SocketAddr.sin_addr, &s, sizeof(struct in_addr));
-
-#endif
-
- /* maintain stored family type properly */
- check4Mapped();
-
- return *this;
-};
-
-#if USE_IPV6
-
-IPAddress::IPAddress(struct in6_addr const &s)
-{
- SetEmpty();
- operator=(s);
-};
-
-IPAddress& IPAddress::operator =(struct in6_addr const &s)
-{
-
- memcpy(&m_SocketAddr.sin6_addr, &s, sizeof(struct in6_addr));
- m_SocketAddr.sin6_family = AF_INET6;
-
- /* maintain address family type properly */
- check4Mapped();
-
- return *this;
-};
-
-#endif
-
-IPAddress::IPAddress(const IPAddress &s)
-{
- SetEmpty();
- operator=(s);
-}
-
-IPAddress::IPAddress(IPAddress *s)
-{
- SetEmpty();
- operator=(s);
-}
-
-IPAddress& IPAddress::operator =(IPAddress *s)
-{
- IPAddress *tmp = NULL;
- if (!s) return *this;
- tmp = dynamic_cast(s);
- if (!tmp) return *this;
- return operator=(*tmp);
-}
-
-IPAddress::IPAddress(const struct hostent &s)
-{
- SetEmpty();
- operator=(s);
-}
-
-bool IPAddress::operator =(const struct hostent &s)
-{
-
- struct in_addr* ipv4 = NULL;
-
- struct in6_addr* ipv6 = NULL;
-
- //struct hostent {
- // char *h_name; /* official name of host */
- // char **h_aliases; /* alias list */
- // int h_addrtype; /* host address type */
- // int h_length; /* length of address */
- // char **h_addr_list; /* list of addresses */
- //}
-
- switch (s.h_addrtype) {
-
- case AF_INET:
- ipv4 = (in_addr*)(s.h_addr_list[0]);
- /* this */
- operator=(*ipv4);
- break;
-
- case AF_INET6:
- ipv6 = (in6_addr*)(s.h_addr_list[0]);
-#if USE_IPV6
- /* this */
- operator=(*ipv6);
-#else
-
- debugs(14,1, HERE << "Discarded IPv6 Address. Protocol disabled.");
-
- // FIXME see if there is another address in the list that might be usable ??
- return false;
-#endif
-
- break;
-
- default:
- IASSERT("false",false);
- return false;
- }
-
- return true;
-}
-
-IPAddress::IPAddress(const struct addrinfo &s)
-{
- SetEmpty();
- operator=(s);
-}
-
-bool IPAddress::operator =(const struct addrinfo &s)
-{
-
- struct sockaddr_in* ipv4 = NULL;
-
- struct sockaddr_in6* ipv6 = NULL;
-
- //struct addrinfo {
- // int ai_flags; /* input flags */
- // int ai_family; /* protocol family for socket */
- // int ai_socktype; /* socket type */
- // int ai_protocol; /* protocol for socket */
- // socklen_t ai_addrlen; /* length of socket-address */
- // struct sockaddr *ai_addr; /* socket-address for socket */
- // char *ai_canonname; /* canonical name for service location */
- // struct addrinfo *ai_next; /* pointer to next in list */
- //}
-
- switch (s.ai_family) {
-
- case AF_INET:
- ipv4 = (sockaddr_in*)(s.ai_addr);
- /* this */
- assert(ipv4);
- operator=(*ipv4);
- break;
-
- case AF_INET6:
- ipv6 = (sockaddr_in6*)(s.ai_addr);
-#if USE_IPV6
- /* this */
- assert(ipv6);
- operator=(*ipv6);
-#else
-
- debugs(14,1, HERE << "Discarded IPv6 Address. Protocol disabled.");
-
- // see if there is another address in the list that might be usable ??
-
- if (s.ai_next)
- return operator=(*s.ai_next);
- else
- return false;
-
-#endif
- break;
-
- case AF_UNSPEC:
- default:
- // attempt to handle partially initialised addrinfo.
- // such as those where data only comes from getsockopt()
- if (s.ai_addr != NULL) {
-#if USE_IPV6
- if (s.ai_addrlen == sizeof(struct sockaddr_in6)) {
- operator=(*((struct sockaddr_in6*)s.ai_addr));
- return true;
- } else
-#endif
- if (s.ai_addrlen == sizeof(struct sockaddr_in)) {
- operator=(*((struct sockaddr_in*)s.ai_addr));
- return true;
- }
- }
- return false;
- }
-
- return true;
-}
-
-void IPAddress::GetAddrInfo(struct addrinfo *&dst, int force) const
-{
- if (dst == NULL) {
- dst = new addrinfo;
- }
-
- memset(dst, 0, sizeof(struct addrinfo));
-
- // set defaults
- dst->ai_flags = AI_NUMERICHOST;
-
- if (dst->ai_socktype == 0)
- dst->ai_socktype = SOCK_STREAM;
-
- if (dst->ai_socktype == SOCK_STREAM // implies TCP
- && dst->ai_protocol == 0)
- dst->ai_protocol = IPPROTO_TCP;
-
- if (dst->ai_socktype == SOCK_DGRAM // implies UDP
- && dst->ai_protocol == 0)
- dst->ai_protocol = IPPROTO_UDP;
-
-#if USE_IPV6
- if ( force == AF_INET6 || (force == AF_UNSPEC && IsIPv6()) ) {
- dst->ai_addr = (struct sockaddr*)new sockaddr_in6;
-
- memset(dst->ai_addr,0,sizeof(struct sockaddr_in6));
-
- GetSockAddr(*((struct sockaddr_in6*)dst->ai_addr));
-
- dst->ai_addrlen = sizeof(struct sockaddr_in6);
-
- dst->ai_family = ((struct sockaddr_in6*)dst->ai_addr)->sin6_family;
-
-#if 0
- /**
- * Enable only if you must and please report to squid-dev if you find a need for this.
- *
- * Vista may need this to cope with dual-stack (unsetting IP6_V6ONLY).
- * http://msdn.microsoft.com/en-us/library/ms738574(VS.85).aspx
- * Linux appears to only do some things when its present.
- * (93) Bad Protocol
- * FreeBSD dies horribly when using dual-stack with it set.
- * (43) Protocol not supported
- */
- dst->ai_protocol = IPPROTO_IPV6;
-#endif
-
- } else
-#endif
- if ( force == AF_INET || (force == AF_UNSPEC && IsIPv4()) ) {
-
- dst->ai_addr = (struct sockaddr*)new sockaddr_in;
-
- memset(dst->ai_addr,0,sizeof(struct sockaddr_in));
-
- GetSockAddr(*((struct sockaddr_in*)dst->ai_addr));
-
- dst->ai_addrlen = sizeof(struct sockaddr_in);
-
- dst->ai_family = ((struct sockaddr_in*)dst->ai_addr)->sin_family;
- } else {
- IASSERT("false",false);
- }
-}
-
-void IPAddress::InitAddrInfo(struct addrinfo *&ai) const
-{
- if (ai == NULL) {
- ai = new addrinfo;
- memset(ai,0,sizeof(struct addrinfo));
- }
-
- // remove any existing data.
- if (ai->ai_addr) delete ai->ai_addr;
-
- ai->ai_addr = (struct sockaddr*)new sockaddr_in6;
- memset(ai->ai_addr, 0, sizeof(struct sockaddr_in6));
-
- ai->ai_addrlen = sizeof(struct sockaddr_in6);
-
-}
-
-void IPAddress::FreeAddrInfo(struct addrinfo *&ai) const
-{
- if (ai == NULL) return;
-
- if (ai->ai_addr) delete ai->ai_addr;
-
- ai->ai_addr = NULL;
-
- ai->ai_addrlen = 0;
-
- // NP: name fields are NOT allocated at present.
- delete ai;
-
- ai = NULL;
-}
-
-int IPAddress::matchIPAddr(const IPAddress &rhs) const
-{
-#if USE_IPV6
- uint8_t *l = (uint8_t*)m_SocketAddr.sin6_addr.s6_addr;
- uint8_t *r = (uint8_t*)rhs.m_SocketAddr.sin6_addr.s6_addr;
-#else
- uint8_t *l = (uint8_t*)&m_SocketAddr.sin_addr.s_addr;
- uint8_t *r = (uint8_t*)&rhs.m_SocketAddr.sin_addr.s_addr;
-#endif
-
- // loop a byte-wise compare
- // NP: match MUST be R-to-L : L-to-R produces inconsistent gt/lt results at varying CIDR
- // expected difference on CIDR is gt/eq or lt/eq ONLY.
- for (unsigned int i = 0 ; i < sizeof(m_SocketAddr.sin6_addr) ; i++) {
-
- if (l[i] < r[i])
- return -1;
-
- if (l[i] > r[i])
- return 1;
- }
-
- return 0;
-}
-
-bool IPAddress::operator ==(const IPAddress &s) const
-{
- return (0 == matchIPAddr(s));
-}
-
-bool IPAddress::operator !=(const IPAddress &s) const
-{
- return ! ( operator==(s) );
-}
-
-bool IPAddress::operator <=(const IPAddress &rhs) const
-{
- if (IsAnyAddr() && !rhs.IsAnyAddr())
- return true;
-
- return (matchIPAddr(rhs) <= 0);
-}
-
-bool IPAddress::operator >=(const IPAddress &rhs) const
-{
- if (IsNoAddr() && !rhs.IsNoAddr())
- return true;
-
- return ( matchIPAddr(rhs) >= 0);
-}
-
-bool IPAddress::operator >(const IPAddress &rhs) const
-{
- if (IsNoAddr() && !rhs.IsNoAddr())
- return true;
-
- return ( matchIPAddr(rhs) > 0);
-}
-
-bool IPAddress::operator <(const IPAddress &rhs) const
-{
- if (IsNoAddr() && !rhs.IsNoAddr())
- return true;
-
- return ( matchIPAddr(rhs) < 0);
-}
-
-u_short IPAddress::GetPort() const
-{
- return ntohs( m_SocketAddr.sin6_port );
-}
-
-u_short IPAddress::SetPort(u_short prt)
-{
- m_SocketAddr.sin6_port = htons(prt);
-
- return prt;
-}
-
-/**
- * NtoA Given a buffer writes a readable ascii version of the IPA and/or port stored
- *
- * Buffer must be of a size large enough to hold the converted address.
- * This size is provided in the form of a global defined variable MAX_IPSTRLEN
- * Should a buffer shorter be provided the string result will be truncated
- * at the length of the available buffer.
- *
- * A copy of the buffer is also returned for simple immediate display.
- */
-char* IPAddress::NtoA(char* buf, const unsigned int blen, int force) const
-{
- // Ensure we have a buffer.
- if (buf == NULL) {
- return NULL;
- }
-
- /* some external code may have blindly memset a parent. */
- /* thats okay, our default is known */
- if ( IsAnyAddr() ) {
-#if USE_IPV6
- memcpy(buf,"::\0", xmin(3,blen));
-#else
- memcpy(buf,"0.0.0.0\0", xmin(8,blen));
-#endif
- return buf;
- }
-
- memset(buf,0,blen); // clear buffer before write
-
- /* Pure-IPv6 CANNOT be displayed in IPv4 format. */
- /* However IPv4 CAN. */
- if ( force == AF_INET && !IsIPv4() ) {
- if ( IsIPv6() ) {
- memcpy(buf, "{!IPv4}\0", xmin(8,blen));
- }
- return buf;
- }
-
-#if USE_IPV6
- if ( force == AF_INET6 || (force == AF_UNSPEC && IsIPv6()) ) {
-
- xinet_ntop(AF_INET6, &m_SocketAddr.sin6_addr, buf, blen);
-
- } else if ( force == AF_INET || (force == AF_UNSPEC && IsIPv4()) ) {
-
- struct in_addr tmp;
- GetInAddr(tmp);
- xinet_ntop(AF_INET, &tmp, buf, blen);
-#else
- if ( force == AF_UNSPEC || (force == AF_INET && IsIPv4()) ) {
- xinet_ntop(AF_INET, &m_SocketAddr.sin_addr, buf, blen);
-#endif
- } else {
- debugs(14,0,"WARNING: Corrupt IP Address details OR required to display in unknown format (" <<
- force << "). accepted={" << AF_UNSPEC << "," << AF_INET << "," << AF_INET6 << "}");
- fprintf(stderr,"WARNING: Corrupt IP Address details OR required to display in unknown format (%d). accepted={%d,%d,%d} ",
- force, AF_UNSPEC, AF_INET, AF_INET6);
- memcpy(buf,"dead:beef::\0", xmin(13,blen));
- assert(false);
- }
-
- return buf;
-}
-
-unsigned int IPAddress::ToHostname(char *buf, const unsigned int blen) const {
- char *p = buf;
-
- if (IsIPv6() && blen > 0) {
- *p = '[';
- p++;
- }
-
- /* 7 being space for [,], and port */
- if ( IsIPv6() )
- NtoA(p, blen-7, AF_INET6);
- else
- NtoA(p, blen-7, AF_INET);
-
- // find the end of the new string
- while (*p != '\0' && p < buf+blen)
- p++;
-
- if (IsIPv6() && p < (buf+blen-1) ) {
- *p = ']';
- p++;
- }
-
- /* terminate just in case. */
- *p = '\0';
-
- /* return size of buffer now used */
- return (p - buf);
-}
-
-char* IPAddress::ToURL(char* buf, unsigned int blen) const {
- char *p = buf;
-
- // Ensure we have a buffer.
-
- if (buf == NULL) {
- return NULL;
- }
-
- p += ToHostname(p, blen);
-
- if (m_SocketAddr.sin6_port > 0 && p < (buf+blen-6) ) {
- /* 6 is max length of expected ':port' (short int) */
- snprintf(p, 6,":%d", GetPort() );
- }
-
- // force a null-terminated string
- buf[blen-1] = '\0';
-
- return buf;
-}
-
-void IPAddress::GetSockAddr(struct sockaddr_storage &addr, const int family) const {
- struct sockaddr_in *sin = NULL;
-
- if ( family == AF_INET && !IsIPv4()) {
- // FIXME INET6: caller using the wrong socket type!
- debugs(14, DBG_CRITICAL, HERE << "IPAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4. from " << *this);
- assert(false);
- }
-
-#if USE_IPV6
- if ( family == AF_INET6 || (family == AF_UNSPEC && IsIPv6()) ) {
- struct sockaddr_in6 *ss6 = (struct sockaddr_in6*)&addr;
- GetSockAddr(*ss6);
- } else if ( family == AF_INET || (family == AF_UNSPEC && IsIPv4()) ) {
- sin = (struct sockaddr_in*)&addr;
- GetSockAddr(*sin);
- } else {
- IASSERT("false",false);
- }
-#else /* not USE_IPV6 */
- sin = (struct sockaddr_in*)&addr;
- GetSockAddr(*sin);
-#endif /* USE_IPV6 */
-}
-
-void IPAddress::GetSockAddr(struct sockaddr_in &buf) const {
-#if USE_IPV6
-
- if ( IsIPv4() ) {
- buf.sin_family = AF_INET;
- buf.sin_port = m_SocketAddr.sin6_port;
- Map6to4( m_SocketAddr.sin6_addr, buf.sin_addr);
- } else {
- debugs(14, DBG_CRITICAL, HERE << "IPAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4. from " << *this );
-
- memset(&buf,0xFFFFFFFF,sizeof(struct sockaddr_in));
- assert(false);
- }
-
-#else
-
- memcpy(&buf, &m_SocketAddr, sizeof(struct sockaddr_in));
-
- if (buf.sin_family == 0) {
- buf.sin_family = AF_INET;
- }
-
-#endif
-
-#if HAVE_SIN_LEN_IN_SAI
- /* not all OS have this field, BUT when they do it can be a problem if set wrong */
- buf.sin_len = sizeof(struct sockaddr_in);
-#endif
-
-}
-
-#if USE_IPV6
-
-void IPAddress::GetSockAddr(struct sockaddr_in6 &buf) const {
- memcpy(&buf, &m_SocketAddr, sizeof(struct sockaddr_in6));
- /* maintain address family. It may have changed inside us. */
- buf.sin6_family = AF_INET6;
-
-#if HAVE_SIN6_LEN_IN_SAI
- /* not all OS have this field, BUT when they do it can be a problem if set wrong */
- buf.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-}
-
-#endif
-
-#if USE_IPV6
-
-void IPAddress::Map4to6(const struct in_addr &in, struct in6_addr &out) const {
- /* check for special cases */
-
- if ( in.s_addr == 0x00000000) {
- /* ANYADDR */
-
- memset(&out, 0, sizeof(struct in6_addr));
- } else if ( in.s_addr == 0xFFFFFFFF) {
- /* NOADDR */
-
- out.s6_addr32[0] = 0xFFFFFFFF;
- out.s6_addr32[1] = 0xFFFFFFFF;
- out.s6_addr32[2] = 0xFFFFFFFF;
- out.s6_addr32[3] = 0xFFFFFFFF;
-
-#if IPV6_SPECIAL_LOCALHOST
- } else if ( in.s_addr == htonl(0x7F000001)) {
- /* LOCALHOST */
-
- memset(&out, 0, sizeof(struct in6_addr));
- out.s6_addr32[3] = htonl(0x1);
-#endif
-
- } else {
- /* general */
-
- memset(&out, 0, sizeof(struct in6_addr));
- out.s6_addr32[2] = htonl(0xFFFF);
- out.s6_addr32[3] = in.s_addr;
- }
-}
-
-void IPAddress::Map6to4(const struct in6_addr &in, struct in_addr &out) const {
- /* ANYADDR */
- /* NOADDR */
- /* general */
-
- memset(&out, 0, sizeof(struct in_addr));
- out.s_addr = in.s6_addr32[3];
-
-#if IPV6_SPECIAL_LOCALHOST
- /* LOCALHOST */
-
- if ( IsLocalhost() ) {
- out.s_addr = htonl(0x7F000001);
- }
-#endif
-
-}
-
-#endif
-
-#if USE_IPV6
-void IPAddress::GetInAddr(in6_addr &buf) const {
- memcpy(&buf, &m_SocketAddr.sin6_addr, sizeof(struct in6_addr));
-}
-
-#endif
-
-bool IPAddress::GetInAddr(struct in_addr &buf) const {
-
-#if USE_IPV6
- if ( IsIPv4() ) {
- Map6to4((const in6_addr)m_SocketAddr.sin6_addr, buf);
- return true;
- }
-#else
-
- if ( IsIPv4() ) {
- memcpy(&buf, &m_SocketAddr.sin_addr, sizeof(struct in_addr));
- return true;
- }
-#endif
-
- // default:
- // non-compatible IPv6 Pure Address
-
- debugs(14,1, HERE << "IPAddress::GetInAddr : Cannot convert non-IPv4 to IPv4. IPA=" << *this);
- memset(&buf,0xFFFFFFFF,sizeof(struct in_addr));
- assert(false);
- return false;
-}
diff -u -r -N squid-3.1.0.3/lib/Makefile.am squid-3.1.0.4/lib/Makefile.am
--- squid-3.1.0.3/lib/Makefile.am 2008-12-05 16:09:31.000000000 +1300
+++ squid-3.1.0.4/lib/Makefile.am 2009-01-23 18:37:31.000000000 +1300
@@ -13,6 +13,7 @@
DIST_SUBDIRS += libTrie
SUBDIRS += libTrie
+CLEANFILES =
install: all
install-strip: all
@@ -73,7 +74,6 @@
hash.c \
heap.c \
html_quote.c \
- IPAddress.cc \
iso3307.c \
md5.c \
radix.c \
@@ -124,13 +124,11 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
tests_testAll_SOURCES= \
tests/testArray.h \
tests/testArray.cc \
- tests/testIPAddress.h \
- tests/testIPAddress.cc \
- IPAddress.cc \
tests/testRFC1035.h \
tests/testRFC1035.cc \
tests/testMain.cc \
diff -u -r -N squid-3.1.0.3/lib/Makefile.in squid-3.1.0.4/lib/Makefile.in
--- squid-3.1.0.3/lib/Makefile.in 2008-12-05 16:09:54.000000000 +1300
+++ squid-3.1.0.4/lib/Makefile.in 2009-01-23 18:37:57.000000000 +1300
@@ -59,25 +59,23 @@
libmiscutil_a_DEPENDENCIES = libTrie/src/Trie.o libTrie/src/TrieNode.o \
@LIBOBJS@ $(am__empty)
am__libmiscutil_a_SOURCES_DIST = MemPool.cc base64.c charset.c \
- getfullhostname.c hash.c heap.c html_quote.c IPAddress.cc \
- iso3307.c md5.c radix.c rfc1035.c rfc1123.c rfc1738.c \
- rfc2617.c rfc3596.c Splay.cc strnstr.cc strsep.c strtoll.c \
- stub_memaccount.c util.c uudecode.c assert.c xusleep.c \
- Profiler.c win32lib.c
+ getfullhostname.c hash.c heap.c html_quote.c iso3307.c md5.c \
+ radix.c rfc1035.c rfc1123.c rfc1738.c rfc2617.c rfc3596.c \
+ Splay.cc strnstr.cc strsep.c strtoll.c stub_memaccount.c \
+ util.c uudecode.c assert.c xusleep.c Profiler.c win32lib.c
@NEED_OWN_STRSEP_TRUE@am__objects_1 = strsep.$(OBJEXT)
@NEED_OWN_STRTOLL_TRUE@am__objects_2 = strtoll.$(OBJEXT)
@ENABLE_XPROF_STATS_TRUE@am__objects_3 = Profiler.$(OBJEXT)
@ENABLE_WIN32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT)
am_libmiscutil_a_OBJECTS = MemPool.$(OBJEXT) base64.$(OBJEXT) \
charset.$(OBJEXT) getfullhostname.$(OBJEXT) hash.$(OBJEXT) \
- heap.$(OBJEXT) html_quote.$(OBJEXT) IPAddress.$(OBJEXT) \
- iso3307.$(OBJEXT) md5.$(OBJEXT) radix.$(OBJEXT) \
- rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) rfc1738.$(OBJEXT) \
- rfc2617.$(OBJEXT) rfc3596.$(OBJEXT) Splay.$(OBJEXT) \
- strnstr.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
- stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) \
- assert.$(OBJEXT) xusleep.$(OBJEXT) $(am__objects_3) \
- $(am__objects_4)
+ heap.$(OBJEXT) html_quote.$(OBJEXT) iso3307.$(OBJEXT) \
+ md5.$(OBJEXT) radix.$(OBJEXT) rfc1035.$(OBJEXT) \
+ rfc1123.$(OBJEXT) rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) \
+ rfc3596.$(OBJEXT) Splay.$(OBJEXT) strnstr.$(OBJEXT) \
+ $(am__objects_1) $(am__objects_2) stub_memaccount.$(OBJEXT) \
+ util.$(OBJEXT) uudecode.$(OBJEXT) assert.$(OBJEXT) \
+ xusleep.$(OBJEXT) $(am__objects_3) $(am__objects_4)
libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
libntlmauth_a_AR = $(AR) $(ARFLAGS)
libntlmauth_a_DEPENDENCIES = @LIBOBJS@
@@ -95,13 +93,11 @@
testHeaders_OBJECTS = testHeaders.$(OBJEXT)
testHeaders_LDADD = $(LDADD)
am__tests_testAll_SOURCES_DIST = tests/testArray.h tests/testArray.cc \
- tests/testIPAddress.h tests/testIPAddress.cc IPAddress.cc \
tests/testRFC1035.h tests/testRFC1035.cc tests/testMain.cc \
Profiler.c win32lib.c util.c assert.c
-am_tests_testAll_OBJECTS = testArray.$(OBJEXT) testIPAddress.$(OBJEXT) \
- IPAddress.$(OBJEXT) testRFC1035.$(OBJEXT) testMain.$(OBJEXT) \
- $(am__objects_3) $(am__objects_4) util.$(OBJEXT) \
- assert.$(OBJEXT)
+am_tests_testAll_OBJECTS = testArray.$(OBJEXT) testRFC1035.$(OBJEXT) \
+ testMain.$(OBJEXT) $(am__objects_3) $(am__objects_4) \
+ util.$(OBJEXT) assert.$(OBJEXT)
tests_testAll_OBJECTS = $(am_tests_testAll_OBJECTS)
tests_testAll_DEPENDENCIES =
am__dirstamp = $(am__leading_dot)dirstamp
@@ -375,6 +371,7 @@
@USE_LOADABLE_MODULES_TRUE@DIST_SUBDIRS = libLtdl libTrie
@USE_LOADABLE_MODULES_FALSE@SUBDIRS = libTrie
@USE_LOADABLE_MODULES_TRUE@SUBDIRS = libLtdl libTrie
+CLEANFILES = testHeaders.c
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
@ENABLE_XPROF_STATS_FALSE@XPROF_STATS_SOURCE =
@@ -418,7 +415,6 @@
hash.c \
heap.c \
html_quote.c \
- IPAddress.cc \
iso3307.c \
md5.c \
radix.c \
@@ -463,9 +459,6 @@
tests_testAll_SOURCES = \
tests/testArray.h \
tests/testArray.cc \
- tests/testIPAddress.h \
- tests/testIPAddress.cc \
- IPAddress.cc \
tests/testRFC1035.h \
tests/testRFC1035.cc \
tests/testMain.cc \
@@ -557,7 +550,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempnam.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GNUregex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IPAddress.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MemPool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Profiler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Splay.Po@am__quote@
@@ -587,7 +579,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testArray.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testHeaders.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testIPAddress.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMain.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testRFC1035.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
@@ -651,20 +642,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testArray.obj `if test -f 'tests/testArray.cc'; then $(CYGPATH_W) 'tests/testArray.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testArray.cc'; fi`
-testIPAddress.o: tests/testIPAddress.cc
-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testIPAddress.o -MD -MP -MF "$(DEPDIR)/testIPAddress.Tpo" -c -o testIPAddress.o `test -f 'tests/testIPAddress.cc' || echo '$(srcdir)/'`tests/testIPAddress.cc; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testIPAddress.Tpo" "$(DEPDIR)/testIPAddress.Po"; else rm -f "$(DEPDIR)/testIPAddress.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testIPAddress.cc' object='testIPAddress.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testIPAddress.o `test -f 'tests/testIPAddress.cc' || echo '$(srcdir)/'`tests/testIPAddress.cc
-
-testIPAddress.obj: tests/testIPAddress.cc
-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testIPAddress.obj -MD -MP -MF "$(DEPDIR)/testIPAddress.Tpo" -c -o testIPAddress.obj `if test -f 'tests/testIPAddress.cc'; then $(CYGPATH_W) 'tests/testIPAddress.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testIPAddress.cc'; fi`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testIPAddress.Tpo" "$(DEPDIR)/testIPAddress.Po"; else rm -f "$(DEPDIR)/testIPAddress.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tests/testIPAddress.cc' object='testIPAddress.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testIPAddress.obj `if test -f 'tests/testIPAddress.cc'; then $(CYGPATH_W) 'tests/testIPAddress.cc'; else $(CYGPATH_W) '$(srcdir)/tests/testIPAddress.cc'; fi`
-
testRFC1035.o: tests/testRFC1035.cc
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testRFC1035.o -MD -MP -MF "$(DEPDIR)/testRFC1035.Tpo" -c -o testRFC1035.o `test -f 'tests/testRFC1035.cc' || echo '$(srcdir)/'`tests/testRFC1035.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testRFC1035.Tpo" "$(DEPDIR)/testRFC1035.Po"; else rm -f "$(DEPDIR)/testRFC1035.Tpo"; exit 1; fi
@@ -968,6 +945,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/lib/tests/testIPAddress.cc squid-3.1.0.4/lib/tests/testIPAddress.cc
--- squid-3.1.0.3/lib/tests/testIPAddress.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/lib/tests/testIPAddress.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,751 +0,0 @@
-#include "config.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "testIPAddress.h"
-#include "IPAddress.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION( testIPAddress );
-
-
-void
-testIPAddress::testDefaults()
-{
- IPAddress anIPA;
-
- /* test stored values */
- CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
-#if USE_IPV6
- CPPUNIT_ASSERT( anIPA.IsIPv6() );
-#else
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
-#endif
-}
-
-void
-testIPAddress::testInAddrConstructor()
-{
- struct in_addr inval;
- struct in_addr outval;
-
- inval.s_addr = htonl(0xC0A8640C);
- outval.s_addr = htonl(0x00000000);
-
- IPAddress anIPA(inval);
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp(&inval, &outval, sizeof(struct in_addr)) == 0 );
-}
-
-#if USE_IPV6
-void
-testIPAddress::testInAddr6Constructor()
-{
- struct in6_addr inval;
- struct in6_addr outval = IN6ADDR_ANY_INIT;
-
- inval.s6_addr32[0] = htonl(0xC0A8640C);
- inval.s6_addr32[1] = htonl(0xFFFFFFFF);
- inval.s6_addr32[2] = htonl(0xFFFFFFFF);
- inval.s6_addr32[3] = htonl(0xFFFFFFFF);
-
- IPAddress anIPA(inval);
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( !anIPA.IsIPv4() );
- CPPUNIT_ASSERT( anIPA.IsIPv6() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &inval, &outval, sizeof(struct in6_addr)) == 0 );
-}
-#endif
-
-void
-testIPAddress::testSockAddrConstructor()
-{
- struct sockaddr_in insock;
- struct sockaddr_in outsock;
-
- memset(&insock, 0, sizeof(struct sockaddr_in));
- memset(&outsock, 0, sizeof(struct sockaddr_in));
-
- insock.sin_family = AF_INET;
- insock.sin_port = htons(80);
- insock.sin_addr.s_addr = htonl(0xC0A8640C);
-#if HAVE_SIN_LEN_IN_SAI
- insock.sin_len = sizeof(struct sockaddr_in);
-#endif
-
- IPAddress anIPA((const struct sockaddr_in)insock);
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT( anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 80 , anIPA.GetPort() );
- anIPA.GetSockAddr(outsock);
- CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in)) == 0 );
-}
-
-#if USE_IPV6
-void
-testIPAddress::testSockAddr6Constructor()
-{
- struct sockaddr_in6 insock;
- struct sockaddr_in6 outsock;
-
- memset(&insock, 0, sizeof(struct sockaddr_in6));
- memset(&outsock, 0, sizeof(struct sockaddr_in6));
-
- insock.sin6_family = AF_INET6;
- insock.sin6_port = htons(80);
- insock.sin6_addr.s6_addr32[0] = htonl(0xFFFFFFFF);
- insock.sin6_addr.s6_addr32[1] = htonl(0x00000000);
- insock.sin6_addr.s6_addr32[2] = htonl(0x0000FFFF);
- insock.sin6_addr.s6_addr32[3] = htonl(0xC0A8640C);
-#if HAVE_SIN6_LEN_IN_SAI
- insock.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-
- IPAddress anIPA((const struct sockaddr_in6)insock);
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( !anIPA.IsIPv4() );
- CPPUNIT_ASSERT( anIPA.IsIPv6() );
- CPPUNIT_ASSERT( anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 80 , anIPA.GetPort() );
- anIPA.GetSockAddr(outsock);
- CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in6)) == 0 );
-}
-#endif
-
-
-void
-testIPAddress::testCopyConstructor()
-{
- struct sockaddr_in insock;
- struct sockaddr_in outsock;
-
- memset(&insock, 0, sizeof(struct sockaddr_in));
- memset(&outsock, 0, sizeof(struct sockaddr_in));
-
- insock.sin_family = AF_INET;
- insock.sin_port = htons(80);
- insock.sin_addr.s_addr = htonl(0xC0A8640C);
-#if HAVE_SIN_LEN_IN_SAI
- insock.sin_len = sizeof(struct sockaddr_in);
-#endif
-
- IPAddress inIPA(insock);
- IPAddress outIPA(inIPA);
-
-
- /* test stored values */
- CPPUNIT_ASSERT( !outIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !outIPA.IsNoAddr() );
- CPPUNIT_ASSERT( outIPA.IsIPv4() );
- CPPUNIT_ASSERT( !outIPA.IsIPv6() );
- CPPUNIT_ASSERT( outIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 80 , outIPA.GetPort() );
- outIPA.GetSockAddr(outsock);
- CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in)) == 0 );
-}
-
-void
-testIPAddress::testHostentConstructor()
-{
- struct hostent *hp = NULL;
- struct in_addr outval;
- struct in_addr expectval;
-
- expectval.s_addr = htonl(0xC0A8640C);
-
- hp = gethostbyname("192.168.100.12");
- CPPUNIT_ASSERT( hp != NULL /* gethostbyname failure.*/ );
-
- IPAddress anIPA(*hp);
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-}
-
-void
-testIPAddress::testStringConstructor()
-{
- struct in_addr outval;
- struct in_addr expectval;
-
- expectval.s_addr = htonl(0xC0A8640C);
-
- IPAddress anIPA = "192.168.100.12";
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-
-#if USE_IPV6
- struct in6_addr expectv6;
- struct in6_addr outval6;
-
- expectv6.s6_addr32[0] = htonl(0x20000800);
- expectv6.s6_addr32[1] = htonl(0x00000000);
- expectv6.s6_addr32[2] = htonl(0x00000000);
- expectv6.s6_addr32[3] = htonl(0x00000045);
-
- IPAddress bnIPA = "2000:800::45";
-
- /* test stored values */
- CPPUNIT_ASSERT( !bnIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !bnIPA.IsNoAddr() );
- CPPUNIT_ASSERT( !bnIPA.IsIPv4() );
- CPPUNIT_ASSERT( bnIPA.IsIPv6() );
- CPPUNIT_ASSERT( !bnIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , bnIPA.GetPort() );
- bnIPA.GetInAddr(outval6);
- CPPUNIT_ASSERT( memcmp( &expectv6, &outval6, sizeof(struct in6_addr)) == 0 );
-
- /* test IPv6 as an old netmask format. This is invalid but sometimes use. */
- IPAddress cnIPA = "ffff:ffff:fff0::";
-
- expectv6.s6_addr32[0] = htonl(0xFFFFFFFF);
- expectv6.s6_addr32[1] = htonl(0xFFF00000);
- expectv6.s6_addr32[2] = htonl(0x00000000);
- expectv6.s6_addr32[3] = htonl(0x00000000);
-
- /* test stored values */
- CPPUNIT_ASSERT( !cnIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !cnIPA.IsNoAddr() );
- CPPUNIT_ASSERT( !cnIPA.IsIPv4() );
- CPPUNIT_ASSERT( cnIPA.IsIPv6() );
- CPPUNIT_ASSERT( !cnIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , cnIPA.GetPort() );
- cnIPA.GetInAddr(outval6);
- CPPUNIT_ASSERT( memcmp( &expectv6, &outval6, sizeof(struct in6_addr)) == 0 );
-#endif
-}
-
-void
-testIPAddress::testSetEmpty()
-{
- IPAddress anIPA;
- struct in_addr inval;
-
- inval.s_addr = htonl(0xC0A8640C);
-
- anIPA = inval;
-
- /* test stored values before empty */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
-
- anIPA.SetEmpty();
-
- /* test stored values after empty */
- CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
-#if USE_IPV6
- CPPUNIT_ASSERT( anIPA.IsIPv6() );
-#else
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
-#endif
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
-}
-
-void
-testIPAddress::testBooleans()
-{
- IPAddress lhsIPA;
- IPAddress rhsIPA;
- struct in_addr valLow;
- struct in_addr valHigh;
-
- valLow.s_addr = htonl(0xC0A8640C);
- valHigh.s_addr = htonl(0xC0A8640F);
-
- /* test equality */
- lhsIPA = valLow;
- rhsIPA = valLow;
- CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) == 0 );
- CPPUNIT_ASSERT( ( lhsIPA == rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA != rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA >= rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA > rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA <= rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA < rhsIPA ) );
-
- /* test inequality (less than) */
- lhsIPA = valLow;
- rhsIPA = valHigh;
- CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) < 0 );
- CPPUNIT_ASSERT( !( lhsIPA == rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA != rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA >= rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA > rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA <= rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA < rhsIPA ) );
-
- /* test inequality (greater than) */
- lhsIPA = valHigh;
- rhsIPA = valLow;
- CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) > 0 );
- CPPUNIT_ASSERT( !( lhsIPA == rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA != rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA >= rhsIPA ) );
- CPPUNIT_ASSERT( ( lhsIPA > rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA <= rhsIPA ) );
- CPPUNIT_ASSERT( !( lhsIPA < rhsIPA ) );
-
-}
-
-void
-testIPAddress::testNtoA()
-{
- struct in_addr inval;
- char buf[MAX_IPSTRLEN];
- IPAddress anIPA;
-
- anIPA.SetAnyAddr();
-
- /* test AnyAddr display values */
-#if USE_IPV6
- CPPUNIT_ASSERT( memcmp("::", anIPA.NtoA(buf,MAX_IPSTRLEN), 2) == 0 );
-#else
- CPPUNIT_ASSERT( memcmp("0.0.0.0",anIPA.NtoA(buf,MAX_IPSTRLEN), 7) == 0 );
-#endif
-
- inval.s_addr = htonl(0xC0A8640C);
- anIPA = inval;
-
- /* test IP display */
- CPPUNIT_ASSERT( memcmp("192.168.100.12",anIPA.NtoA(buf,MAX_IPSTRLEN), 14) == 0 );
-
- anIPA.SetNoAddr();
-
- /* test NoAddr display values */
-#if USE_IPV6
- CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",anIPA.NtoA(buf,MAX_IPSTRLEN), 39) == 0 );
-#else
- CPPUNIT_ASSERT( memcmp("255.255.255.255",anIPA.NtoA(buf,MAX_IPSTRLEN), 15) == 0 );
-#endif
-}
-
-void
-testIPAddress::testToURL_fromInAddr()
-{
- char buf[MAX_IPSTRLEN];
- buf[0] = '\0';
- struct in_addr inval;
-
- inval.s_addr = htonl(0xC0A8640C);
-
- IPAddress anIPA(inval);
-
- /* test values */
- anIPA.ToURL(buf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( memcmp("192.168.100.12", buf, 14) == 0 );
-
-#if USE_IPV6
-
- /* test output when constructed from in6_addr with IPv6 */
- struct in6_addr ip6val;
-
- ip6val.s6_addr32[0] = htonl(0xC0A8640C);
- ip6val.s6_addr32[1] = htonl(0xFFFFFFFF);
- ip6val.s6_addr32[2] = htonl(0xFFFFFFFF);
- ip6val.s6_addr32[3] = htonl(0xFFFFFFFF);
-
- IPAddress bnIPA(ip6val);
-
- bnIPA.ToURL(buf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( memcmp("[c0a8:640c:ffff:ffff:ffff:ffff:ffff:ffff]", buf, 41) == 0 );
-
-#endif
-}
-
-void
-testIPAddress::testToURL_fromSockAddr()
-{
- struct sockaddr_in sock;
- sock.sin_addr.s_addr = htonl(0xC0A8640C);
- sock.sin_port = htons(80);
- sock.sin_family = AF_INET;
-#if HAVE_SIN_LEN_IN_SAI
- sock.sin_len = sizeof(struct sockaddr_in);
-#endif
-
- IPAddress anIPA(sock);
- char buf[MAX_IPSTRLEN];
-
- /* test values */
- anIPA.ToURL(buf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( memcmp("192.168.100.12:80", buf, 17) == 0 );
-
-#if USE_IPV6
-
- /* test output when constructed from in6_addr with IPv6 */
- struct sockaddr_in6 ip6val;
-
- ip6val.sin6_addr.s6_addr32[0] = htonl(0xC0A8640C);
- ip6val.sin6_addr.s6_addr32[1] = htonl(0xFFFFFFFF);
- ip6val.sin6_addr.s6_addr32[2] = htonl(0xFFFFFFFF);
- ip6val.sin6_addr.s6_addr32[3] = htonl(0xFFFFFFFF);
- ip6val.sin6_port = htons(80);
- ip6val.sin6_family = AF_INET6;
-#if HAVE_SIN6_LEN_IN_SAI
- ip6val.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-
- IPAddress bnIPA(ip6val);
-
- bnIPA.ToURL(buf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( memcmp("[c0a8:640c:ffff:ffff:ffff:ffff:ffff:ffff]:80", buf, 44) == 0 );
-
-#endif
-
-}
-
-void
-testIPAddress::testGetReverseString()
-{
- char buf[MAX_IPSTRLEN];
-
- struct in_addr ipv4val;
- ipv4val.s_addr = htonl(0xC0A8640C);
-
- IPAddress v4IPA(ipv4val);
-
- /* test IPv4 output */
- v4IPA.GetReverseString(buf);
- CPPUNIT_ASSERT( memcmp("12.100.168.192.in-addr.arpa.",buf, 28) == 0 );
-
- v4IPA.GetReverseString(buf,AF_INET);
- CPPUNIT_ASSERT( memcmp("12.100.168.192.in-addr.arpa.",buf, 28) == 0 );
-
- v4IPA.GetReverseString(buf,AF_INET6);
- CPPUNIT_ASSERT( memcmp("",buf, 1) == 0 );
-
-
-#if USE_IPV6
- struct in6_addr ip6val;
-
- ip6val.s6_addr32[0] = htonl(0xC0A8640C);
- ip6val.s6_addr32[1] = htonl(0xFFFFFFFF);
- ip6val.s6_addr32[2] = htonl(0xFFFFFFFF);
- ip6val.s6_addr32[3] = htonl(0xFFFFFFFF);
-
- IPAddress v6IPA(ip6val);
-
- /* test IPv6 output */
- v6IPA.GetReverseString(buf);
- CPPUNIT_ASSERT( memcmp("f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.c.0.4.6.8.a.0.c.ip6.arpa.",buf,73) == 0 );
-
-#endif
-
-}
-
-void
-testIPAddress::testMasking()
-{
- char buf[MAX_IPSTRLEN];
- IPAddress anIPA;
- IPAddress maskIPA;
-
- /* Test Basic CIDR Routine */
- anIPA.SetAnyAddr();
- CPPUNIT_ASSERT_EQUAL( 0 ,anIPA.GetCIDR() );
-
- anIPA.SetNoAddr();
-#if USE_IPV6
- CPPUNIT_ASSERT_EQUAL( 128 , anIPA.GetCIDR() );
-#else
- CPPUNIT_ASSERT_EQUAL( 32 , anIPA.GetCIDR() );
-#endif
-
- /* Test Numeric ApplyCIDR */
- anIPA.SetNoAddr();
- CPPUNIT_ASSERT( !anIPA.ApplyMask(129) );
-#if !USE_IPV6
- CPPUNIT_ASSERT( !anIPA.ApplyMask(33) );
-#endif
- CPPUNIT_ASSERT( anIPA.ApplyMask(31) );
- CPPUNIT_ASSERT_EQUAL( 31 , anIPA.GetCIDR() );
-
- anIPA.SetNoAddr();
- anIPA.ApplyMask(31, AF_INET);
-#if USE_IPV6
- CPPUNIT_ASSERT_EQUAL( 127 , anIPA.GetCIDR() );
-#else
- CPPUNIT_ASSERT_EQUAL( 31 , anIPA.GetCIDR() );
-#endif
-
-#if USE_IPV6
- anIPA.SetNoAddr();
- anIPA.ApplyMask(80,AF_INET6);
- CPPUNIT_ASSERT_EQUAL( 80 , anIPA.GetCIDR() );
- /* BUG Check: test values by display. */
- CPPUNIT_ASSERT( anIPA.NtoA(buf,MAX_IPSTRLEN) != NULL );
- CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff::", buf, 26) == 0 );
-#endif
-
- /* Test Network Bitmask from IPAddress */
- anIPA.SetNoAddr();
- maskIPA = "255.255.240.0";
- CPPUNIT_ASSERT_EQUAL( 20 , maskIPA.GetCIDR() );
- anIPA.ApplyMask(maskIPA);
- CPPUNIT_ASSERT_EQUAL( 20 , anIPA.GetCIDR() );
-
- /* BUG Check: test values memory after masking. */
- struct in_addr btest;
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- anIPA.GetInAddr(btest);
- CPPUNIT_ASSERT_EQUAL( (uint32_t)htonl(0xFFFFF000) , btest.s_addr );
-
- /* BUG Check failing test. Masked values for display. */
- CPPUNIT_ASSERT( memcmp("255.255.240.0",anIPA.NtoA(buf,MAX_IPSTRLEN), 13) == 0 );
-
-
-#if USE_IPV6
- anIPA.SetNoAddr();
- maskIPA.SetNoAddr();
-
- /* IPv6 masks MUST be CIDR representations. */
- /* however as with IPv4 they can technically be represented as a bitmask */
- maskIPA = "ffff:ffff:fff0::";
- CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
- anIPA.ApplyMask(maskIPA);
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT_EQUAL( 44 , anIPA.GetCIDR() );
-
- anIPA.SetNoAddr();
- maskIPA.SetNoAddr();
-
- /* IPv4 masks represented in IPv6 as IPv4 bitmasks. */
- maskIPA = "::ffff:ffff:f000";
- CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
- CPPUNIT_ASSERT( maskIPA.IsIPv4() );
- CPPUNIT_ASSERT( !maskIPA.IsIPv6() );
- anIPA.ApplyMask(maskIPA);
- CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
- CPPUNIT_ASSERT( maskIPA.IsIPv4() );
- CPPUNIT_ASSERT( !maskIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( 20 , anIPA.GetCIDR() );
-#endif
-
-}
-
-void
-testIPAddress::testAddrInfo()
-{
- struct addrinfo *expect;
- struct addrinfo *ipval = NULL;
- struct addrinfo hints;
-
- memset(&hints, 0, sizeof(struct addrinfo));
-
- hints.ai_flags = AI_NUMERICHOST;
-
- IPAddress anIP = "127.0.0.1";
-
- /* assert this just to check that getaddrinfo is working properly */
- CPPUNIT_ASSERT( xgetaddrinfo("127.0.0.1", NULL, &hints, &expect ) == 0 );
-
- anIP.GetAddrInfo(ipval);
-
-#if 0
- /* display a byte-by-byte hex comparison of the addr cores */
- unsigned int *p;
- p = (unsigned int*)expect;
- printf("\nSYS-ADDRINFO: %2x %2x %2x %2x %2x %2x",
- p[0],p[1],p[2],p[3],p[4],p[5]);
-
- p = (unsigned int*)ipval;
- printf("\nSQD-ADDRINFO: %2x %2x %2x %2x %2x %2x",
- p[0],p[1],p[2],p[3],p[4],p[5] );
- printf("\n");
-#endif /*0*/
-
- // check the addrinfo object core. (BUT not the two ptrs at the tail)
- // details
- CPPUNIT_ASSERT_EQUAL( expect->ai_flags, ipval->ai_flags );
- CPPUNIT_ASSERT_EQUAL( expect->ai_family, ipval->ai_family );
- // check the sockaddr it points to.
- CPPUNIT_ASSERT_EQUAL( expect->ai_addrlen, ipval->ai_addrlen );
-
-#if 0
- p = (unsigned int*)(expect->ai_addr);
- printf("\nSYS-ADDR: (%d) %x %x %x %x %x %x %x %x ...",
- expect->ai_addrlen,
- p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
-
- p = (unsigned int*)(ipval->ai_addr);
- printf("\nSQD-ADDR: (%d) %x %x %x %x %x %x %x %x ...",
- ipval->ai_addrlen,
- p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
- printf("\n");
-#if HAVE_SS_LEN_IN_SS
- printf("\nSYS SS_LEN=%d\nSQD SS_LEN=%d\n",((struct sockaddr_storage*)expect->ai_addr)->ss_len,
- ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
-#endif
-#endif /*0*/
-
-#if USE_IPV6
-#if HAVE_SS_LEN_IN_SS
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_storage*)expect->ai_addr)->ss_len,
- ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
- CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_storage*)ipval->ai_addr)->ss_len, ipval->ai_addrlen );
-#endif
-#if HAVE_SIN6_LEN_IN_SAI
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_len,
- ((struct sockaddr_in6*)ipval->ai_addr)->sin6_len );
- CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in6*)ipval->ai_addr)->sin6_len, ipval->ai_addrlen );
-#endif
-#if HAVE_SIN_LEN_IN_SAI
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_len,
- ((struct sockaddr_in*)ipval->ai_addr)->sin_len );
- CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in*)ipval->ai_addr)->sin_len, ipval->ai_addrlen );
-#endif
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_family,
- ((struct sockaddr_in6*)ipval->ai_addr)->sin6_family );
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_port,
- ((struct sockaddr_in6*)ipval->ai_addr)->sin6_port );
-#else
-#if HAVE_SS_LEN_IN_SS
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_storage*)expect->ai_addr)->ss_len,
- ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
- CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_storage*)ipval->ai_addr)->ss_len, ipval->ai_addrlen );
-#endif
-#if HAVE_SIN_LEN_IN_SAI
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_len,
- ((struct sockaddr_in*)ipval->ai_addr)->sin_len );
- CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in*)ipval->ai_addr)->sin_len, ipval->ai_addrlen );
-#endif
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_family,
- ((struct sockaddr_in*)ipval->ai_addr)->sin_family );
- CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_port,
- ((struct sockaddr_in*)ipval->ai_addr)->sin_port );
-#endif /* USE_IPV6 */
-
- CPPUNIT_ASSERT( memcmp( expect->ai_addr, ipval->ai_addr, expect->ai_addrlen ) == 0 );
-
- xfreeaddrinfo(expect);
-}
-
-void
-testIPAddress::testBugNullingDisplay()
-{
- // Weird Bug: address set to empty during string conversion somewhere.
- // initial string gets created and returned OK.
- // but at the end of the process m_SocketAddr is left NULL'ed
-
- char ntoabuf[MAX_IPSTRLEN];
- char hostbuf[MAX_IPSTRLEN];
- char urlbuf[MAX_IPSTRLEN];
-
- struct in_addr outval;
- struct in_addr expectval;
-
- expectval.s_addr = htonl(0xC0A8640C);
-
- IPAddress anIPA = "192.168.100.12";
-
-
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-
-
- /* POKE NtoA display function to see what it is doing */
- anIPA.NtoA(ntoabuf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-
-
-
- /* POKE ToHostname display function to see what it is doing */
- anIPA.ToHostname(hostbuf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-
-
- /* POKE ToURL display function to see what it is doing */
- anIPA.ToURL(urlbuf,MAX_IPSTRLEN);
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- /* test stored values */
- CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
- CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
- CPPUNIT_ASSERT( anIPA.IsIPv4() );
- CPPUNIT_ASSERT( !anIPA.IsIPv6() );
- CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
- CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
- anIPA.GetInAddr(outval);
- CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
-
-}
diff -u -r -N squid-3.1.0.3/lib/tests/testIPAddress.h squid-3.1.0.4/lib/tests/testIPAddress.h
--- squid-3.1.0.3/lib/tests/testIPAddress.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/lib/tests/testIPAddress.h 1970-01-01 12:00:00.000000000 +1200
@@ -1,70 +0,0 @@
-#ifndef SQUID_SRC_TEST_IPADDRESS_H
-#define SQUID_SRC_TEST_IPADDRESS_H
-
-#include
-
-/*
- * test the IP storage type
- */
-
-class testIPAddress : public CPPUNIT_NS::TestFixture
-{
- CPPUNIT_TEST_SUITE( testIPAddress );
- CPPUNIT_TEST( testDefaults );
- CPPUNIT_TEST( testInAddrConstructor );
-#if USE_IPV6
- CPPUNIT_TEST( testInAddr6Constructor );
-#endif
- CPPUNIT_TEST( testSockAddrConstructor );
-#if USE_IPV6
- CPPUNIT_TEST( testSockAddr6Constructor );
-#endif
- CPPUNIT_TEST( testHostentConstructor );
- CPPUNIT_TEST( testStringConstructor );
- CPPUNIT_TEST( testCopyConstructor );
- CPPUNIT_TEST( testSetEmpty );
- CPPUNIT_TEST( testBooleans );
- CPPUNIT_TEST( testAddrInfo );
- CPPUNIT_TEST( testNtoA );
- CPPUNIT_TEST( testToURL_fromInAddr );
- CPPUNIT_TEST( testToURL_fromSockAddr );
- CPPUNIT_TEST( testGetReverseString );
- CPPUNIT_TEST( testMasking );
-
- CPPUNIT_TEST( testBugNullingDisplay );
- CPPUNIT_TEST_SUITE_END();
-
-public:
-
-protected:
- void testDefaults();
-
- void testInAddrConstructor();
-#if USE_IPV6
- void testInAddr6Constructor();
-#endif
- void testSockAddrConstructor();
-#if USE_IPV6
- void testSockAddr6Constructor();
-#endif
- void testHostentConstructor();
- void testStringConstructor();
- void testCopyConstructor();
-
- void testSetEmpty();
- void testBooleans();
-
- void testAddrInfo();
-
- void testNtoA();
- void testToURL_fromInAddr();
- void testToURL_fromSockAddr();
- void testGetReverseString();
- void testMasking();
-
- // bugs.
- void testBugNullingDisplay();
-
-};
-
-#endif /* SQUID_SRC_TEST_IPADDRESS_H */
diff -u -r -N squid-3.1.0.3/Makefile.am squid-3.1.0.4/Makefile.am
--- squid-3.1.0.3/Makefile.am 2008-12-05 16:09:27.000000000 +1300
+++ squid-3.1.0.4/Makefile.am 2009-01-23 18:37:26.000000000 +1300
@@ -1,11 +1,9 @@
## Process this file with automake to produce Makefile.in
#
-# $Id: Makefile.am,v 1.27 2006/05/11 01:36:57 hno Exp $
-#
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers test-suite tools
-SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers test-suite tools
+SUBDIRS = lib @makesnmplib@ scripts src/ip src icons errors doc helpers test-suite tools
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
diff -u -r -N squid-3.1.0.3/Makefile.in squid-3.1.0.4/Makefile.in
--- squid-3.1.0.3/Makefile.in 2008-12-05 16:09:58.000000000 +1300
+++ squid-3.1.0.4/Makefile.in 2009-01-23 18:38:01.000000000 +1300
@@ -15,8 +15,6 @@
@SET_MAKE@
#
-# $Id: Makefile.am,v 1.27 2006/05/11 01:36:57 hno Exp $
-#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -309,7 +307,7 @@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers test-suite tools
-SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers test-suite tools
+SUBDIRS = lib @makesnmplib@ scripts src/ip src icons errors doc helpers test-suite tools
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
EXTRA_DIST = \
diff -u -r -N squid-3.1.0.3/src/access_log.cc squid-3.1.0.4/src/access_log.cc
--- squid-3.1.0.3/src/access_log.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/access_log.cc 2009-01-23 18:37:36.000000000 +1300
@@ -597,13 +597,16 @@
struct tm *t;
spec = fmt->data.timespec;
- if (!spec)
- spec = "%d/%b/%Y:%H:%M:%S";
-
- if (fmt->type == LFT_TIME_LOCALTIME)
+ if (fmt->type == LFT_TIME_LOCALTIME) {
+ if (!spec)
+ spec = "%d/%b/%Y:%H:%M:%S %z";
t = localtime(&squid_curtime);
- else
+ } else {
+ if (!spec)
+ spec = "%d/%b/%Y:%H:%M:%S";
+
t = gmtime(&squid_curtime);
+ }
strftime(tmp, sizeof(tmp), spec, t);
diff -u -r -N squid-3.1.0.3/src/AccessLogEntry.h squid-3.1.0.4/src/AccessLogEntry.h
--- squid-3.1.0.3/src/AccessLogEntry.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/AccessLogEntry.h 2009-01-23 18:37:35.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id: AccessLogEntry.h,v 1.9 2008/02/26 00:15:48 rousskov Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -36,7 +33,7 @@
#include "HttpVersion.h"
#include "HttpRequestMethod.h"
#include "HierarchyLogEntry.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#include "HttpRequestMethod.h"
/* forward decls */
@@ -92,7 +89,7 @@
{;
}
- IPAddress caddr;
+ IpAddress caddr;
int64_t requestSize;
int64_t replySize;
int64_t highOffset;
diff -u -r -N squid-3.1.0.3/src/ACLARP.cc squid-3.1.0.4/src/ACLARP.cc
--- squid-3.1.0.3/src/ACLARP.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLARP.cc 2009-01-23 18:37:32.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: ACLARP.cc,v 1.29 2008/02/05 22:38:24 amosjeffries Exp $
- *
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
*
@@ -40,13 +37,13 @@
#include
#endif
#include "squid.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#ifdef _SQUID_WIN32_
struct arpreq {
- IPAddress arp_pa; /* protocol address */
+ IpAddress arp_pa; /* protocol address */
struct sockaddr arp_ha; /* hardware address */
int arp_flags; /* flags */
@@ -84,7 +81,7 @@
#endif
static void aclParseArpList(SplayNode **curlist);
static int decode_eth(const char *asc, char *eth);
-static int aclMatchArp(SplayNode **dataptr, IPAddress &c);
+static int aclMatchArp(SplayNode **dataptr, IpAddress &c);
static SplayNode::SPLAYCMP aclArpCompare;
static SplayNode::SPLAYWALKEE aclDumpArpListWalkee;
@@ -242,12 +239,12 @@
/* aclMatchArp */
/***************/
int
-aclMatchArp(SplayNode **dataptr, IPAddress &c)
+aclMatchArp(SplayNode **dataptr, IpAddress &c)
{
struct arpreq arpReq;
struct sockaddr_in *sa = NULL;
- IPAddress ipAddr = c;
+ IpAddress ipAddr = c;
#if defined(_SQUID_LINUX_)
diff -u -r -N squid-3.1.0.3/src/ACLASN.h squid-3.1.0.4/src/ACLASN.h
--- squid-3.1.0.3/src/ACLASN.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLASN.h 2009-01-23 18:37:32.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id: ACLASN.h,v 1.10 2008/02/26 21:49:34 amosjeffries Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -39,9 +36,9 @@
#include "CbDataList.h"
#include "ACLStrategised.h"
#include "ACLChecklist.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
-SQUIDCEXTERN int asnMatchIp(CbDataList *, IPAddress &);
+SQUIDCEXTERN int asnMatchIp(CbDataList *, IpAddress &);
/// \ingroup ACLAPI
SQUIDCEXTERN void asnInit(void);
@@ -50,7 +47,7 @@
SQUIDCEXTERN void asnFreeMemory(void);
/// \ingroup ACLAPI
-class ACLASN : public ACLData
+class ACLASN : public ACLData
{
public:
@@ -58,18 +55,18 @@
virtual ~ACLASN();
- virtual bool match(IPAddress);
+ virtual bool match(IpAddress);
virtual wordlist *dump();
virtual void parse();
bool empty() const;
- virtual ACLData *clone() const;
+ virtual ACLData *clone() const;
virtual void prepareForUse();
private:
static ACL::Prototype SourceRegistryProtoype;
- static ACLStrategised SourceRegistryEntry_;
+ static ACLStrategised SourceRegistryEntry_;
static ACL::Prototype DestinationRegistryProtoype;
- static ACLStrategised DestinationRegistryEntry_;
+ static ACLStrategised DestinationRegistryEntry_;
CbDataList *data;
};
diff -u -r -N squid-3.1.0.3/src/ACLBrowser.cc squid-3.1.0.4/src/ACLBrowser.cc
--- squid-3.1.0.3/src/ACLBrowser.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLBrowser.cc 2009-01-23 18:37:32.000000000 +1300
@@ -41,7 +41,6 @@
/* explicit template instantiation required for some systems */
-template class ACLStrategised;
template class ACLRequestHeaderStrategy;
ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser");
diff -u -r -N squid-3.1.0.3/src/ACLChecklist.h squid-3.1.0.4/src/ACLChecklist.h
--- squid-3.1.0.3/src/ACLChecklist.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLChecklist.h 2009-01-23 18:37:34.000000000 +1300
@@ -123,11 +123,11 @@
const acl_access *accessList;
- IPAddress src_addr;
+ IpAddress src_addr;
- IPAddress dst_addr;
+ IpAddress dst_addr;
- IPAddress my_addr;
+ IpAddress my_addr;
struct peer *dst_peer;
diff -u -r -N squid-3.1.0.3/src/ACLDestinationASN.h squid-3.1.0.4/src/ACLDestinationASN.h
--- squid-3.1.0.3/src/ACLDestinationASN.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLDestinationASN.h 2009-01-23 18:37:34.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id: ACLDestinationASN.h,v 1.4 2008/02/26 21:49:34 amosjeffries Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -37,10 +34,10 @@
#include "ACLASN.h"
#include "ACLStrategy.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/// \ingroup ACLAPI
-class ACLDestinationASNStrategy : public ACLStrategy
+class ACLDestinationASNStrategy : public ACLStrategy
{
public:
diff -u -r -N squid-3.1.0.3/src/ACLIP.cc squid-3.1.0.4/src/ACLIP.cc
--- squid-3.1.0.3/src/ACLIP.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLIP.cc 2009-01-23 18:37:34.000000000 +1300
@@ -127,7 +127,7 @@
int
aclIpAddrNetworkCompare(acl_ip_data * const &p, acl_ip_data * const &q)
{
- IPAddress A = p->addr1;
+ IpAddress A = p->addr1;
/* apply netmask */
A.ApplyMask(q->mask);
@@ -191,7 +191,7 @@
* This function should NOT be called if 'asc' is a hostname!
*/
bool
-acl_ip_data::DecodeMask(const char *asc, IPAddress &mask, int ctype)
+acl_ip_data::DecodeMask(const char *asc, IpAddress &mask, int ctype)
{
char junk;
int a1 = 0;
@@ -237,7 +237,7 @@
LOCAL_ARRAY(char, mask, 256);
acl_ip_data *r = NULL;
acl_ip_data **Q = NULL;
- IPAddress temp;
+ IpAddress temp;
char c;
unsigned int changed;
acl_ip_data *q = new acl_ip_data;
@@ -294,13 +294,13 @@
/*
* Note, must use plain xgetaddrinfo() here because at startup
* ipcache hasn't been initialized
- * TODO: offload this to one of the IPAddress lookups.
+ * TODO: offload this to one of the IpAddress lookups.
*/
debugs(28, 5, "aclIpParseIpData: Lookup Host/IP " << addr1);
struct addrinfo *hp = NULL, *x = NULL;
struct addrinfo hints;
- IPAddress *prev_addr = NULL;
+ IpAddress *prev_addr = NULL;
memset(&hints, 0, sizeof(struct addrinfo));
@@ -442,7 +442,7 @@
}
int
-ACLIP::match(IPAddress &clientip)
+ACLIP::match(IpAddress &clientip)
{
static acl_ip_data ClientAddress;
/*
@@ -462,4 +462,4 @@
acl_ip_data::acl_ip_data () :addr1(), addr2(), mask(), next (NULL) {}
-acl_ip_data::acl_ip_data (IPAddress const &anAddress1, IPAddress const &anAddress2, IPAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {}
+acl_ip_data::acl_ip_data (IpAddress const &anAddress1, IpAddress const &anAddress2, IpAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {}
diff -u -r -N squid-3.1.0.3/src/ACLIP.h squid-3.1.0.4/src/ACLIP.h
--- squid-3.1.0.3/src/ACLIP.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLIP.h 2009-01-23 18:37:34.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id$
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -37,7 +34,7 @@
#include "ACL.h"
#include "splay.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/// \ingroup ACLAPI
class acl_ip_data
@@ -50,20 +47,20 @@
acl_ip_data ();
- acl_ip_data (IPAddress const &, IPAddress const &, IPAddress const &, acl_ip_data *);
+ acl_ip_data (IpAddress const &, IpAddress const &, IpAddress const &, acl_ip_data *);
void toStr(char *buf, int len) const;
- IPAddress addr1;
+ IpAddress addr1;
- IPAddress addr2;
+ IpAddress addr2;
- IPAddress mask; /**< \todo This should perhapse be stored as a CIDR range now instead of a full IP mask. */
+ IpAddress mask; /**< \todo This should perhapse be stored as a CIDR range now instead of a full IP mask. */
acl_ip_data *next; /**< used for parsing, not for storing */
private:
- static bool DecodeMask(const char *asc, IPAddress &mask, int string_format_type);
+ static bool DecodeMask(const char *asc, IpAddress &mask, int string_format_type);
};
MEMPROXY_CLASS_INLINE(acl_ip_data);
@@ -91,7 +88,7 @@
protected:
- int match(IPAddress &);
+ int match(IpAddress &);
IPSplay *data;
private:
diff -u -r -N squid-3.1.0.3/src/ACLMaxUserIP.cc squid-3.1.0.4/src/ACLMaxUserIP.cc
--- squid-3.1.0.3/src/ACLMaxUserIP.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLMaxUserIP.cc 2009-01-23 18:37:34.000000000 +1300
@@ -117,7 +117,7 @@
int
ACLMaxUserIP::match(AuthUserRequest * auth_user_request,
- IPAddress const &src_addr)
+ IpAddress const &src_addr)
{
/*
* the logic for flush the ip list when the limit is hit vs keep
diff -u -r -N squid-3.1.0.3/src/ACLMaxUserIP.h squid-3.1.0.4/src/ACLMaxUserIP.h
--- squid-3.1.0.3/src/ACLMaxUserIP.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLMaxUserIP.h 2009-01-23 18:37:34.000000000 +1300
@@ -67,7 +67,7 @@
static Prototype RegistryProtoype;
static ACLMaxUserIP RegistryEntry_;
- int match(AuthUserRequest *, IPAddress const &);
+ int match(AuthUserRequest *, IpAddress const &);
char const *class_;
int maximum;
diff -u -r -N squid-3.1.0.3/src/ACLPeerName.cc squid-3.1.0.4/src/ACLPeerName.cc
--- squid-3.1.0.3/src/ACLPeerName.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLPeerName.cc 2009-01-23 18:37:34.000000000 +1300
@@ -11,7 +11,7 @@
ACLPeerNameStrategy::match (ACLData * &data, ACLChecklist *checklist)
{
if (checklist->dst_peer != NULL && checklist->dst_peer->name != NULL)
- return data->match(checklist->dst_peer->name);
+ return data->match(checklist->dst_peer->name);
return 0;
}
diff -u -r -N squid-3.1.0.3/src/ACLPeerName.h squid-3.1.0.4/src/ACLPeerName.h
--- squid-3.1.0.3/src/ACLPeerName.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLPeerName.h 2009-01-23 18:37:34.000000000 +1300
@@ -17,7 +17,7 @@
private:
static ACLPeerNameStrategy Instance_;
- ACLPeerNameStrategy(){}
+ ACLPeerNameStrategy() {}
ACLPeerNameStrategy&operator=(ACLPeerNameStrategy const &);
};
diff -u -r -N squid-3.1.0.3/src/ACLSourceASN.h squid-3.1.0.4/src/ACLSourceASN.h
--- squid-3.1.0.3/src/ACLSourceASN.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLSourceASN.h 2009-01-23 18:37:35.000000000 +1300
@@ -1,8 +1,4 @@
-
/*
- * $Id: ACLSourceASN.h,v 1.3 2007/12/14 23:11:45 amosjeffries Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -42,9 +38,9 @@
class ACLChecklist;
#include "ACLStrategy.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
-class ACLSourceASNStrategy : public ACLStrategy
+class ACLSourceASNStrategy : public ACLStrategy
{
public:
diff -u -r -N squid-3.1.0.3/src/ACLStrategised.cc squid-3.1.0.4/src/ACLStrategised.cc
--- squid-3.1.0.3/src/ACLStrategised.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ACLStrategised.cc 2009-01-23 18:37:35.000000000 +1300
@@ -52,5 +52,5 @@
/* ACLHTTPRepHeader + ACLHTTPReqHeader */
template class ACLStrategised;
-/* ACLMyPortName + ACLMyPeerName */
+/* ACLMyPortName + ACLMyPeerName + ACLBrowser */
template class ACLStrategised;
diff -u -r -N squid-3.1.0.3/src/adaptation/Makefile.am squid-3.1.0.4/src/adaptation/Makefile.am
--- squid-3.1.0.3/src/adaptation/Makefile.am 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/adaptation/Makefile.am 2009-01-23 18:37:36.000000000 +1300
@@ -1,5 +1,6 @@
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES =
INCLUDES = \
-I$(top_builddir)/include \
@@ -40,3 +41,4 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
diff -u -r -N squid-3.1.0.3/src/adaptation/Makefile.in squid-3.1.0.4/src/adaptation/Makefile.in
--- squid-3.1.0.3/src/adaptation/Makefile.in 2008-12-05 16:09:56.000000000 +1300
+++ squid-3.1.0.4/src/adaptation/Makefile.in 2009-01-23 18:37:59.000000000 +1300
@@ -312,6 +312,7 @@
target_alias = @target_alias@
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
INCLUDES = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
@@ -560,6 +561,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/src/asn.cc squid-3.1.0.4/src/asn.cc
--- squid-3.1.0.3/src/asn.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/asn.cc 2009-01-23 18:37:36.000000000 +1300
@@ -59,9 +59,9 @@
{
public:
uint8_t len;
- IPAddress addr;
+ IpAddress addr;
- m_ADDR() : len(sizeof(IPAddress)) {};
+ m_ADDR() : len(sizeof(IpAddress)) {};
};
/* END of definitions for radix tree entries */
@@ -126,7 +126,7 @@
/* PUBLIC */
int
-asnMatchIp(CbDataList *data, IPAddress &addr)
+asnMatchIp(CbDataList *data, IpAddress &addr)
{
struct squid_radix_node *rn;
as_info *e;
@@ -392,8 +392,8 @@
CbDataList *q = NULL;
as_info *asinfo = NULL;
- IPAddress mask;
- IPAddress addr;
+ IpAddress mask;
+ IpAddress addr;
char *t;
int bitl;
@@ -511,8 +511,8 @@
CbDataList *q;
as_info *asinfo;
char buf[MAX_IPSTRLEN];
- IPAddress addr;
- IPAddress mask;
+ IpAddress addr;
+ IpAddress mask;
assert(e);
assert(e->e_info);
@@ -540,7 +540,7 @@
bool
-ACLASN::match(IPAddress toMatch)
+ACLASN::match(IpAddress toMatch)
{
return asnMatchIp(data, toMatch);
}
@@ -583,7 +583,7 @@
}
}
-ACLData *
+ACLData *
ACLASN::clone() const
{
if (data)
@@ -594,18 +594,18 @@
/* explicit template instantiation required for some systems */
-template class ACLStrategised;
+template class ACLStrategised;
ACL::Prototype ACLASN::SourceRegistryProtoype(&ACLASN::SourceRegistryEntry_, "src_as");
-ACLStrategised ACLASN::SourceRegistryEntry_(new ACLASN, ACLSourceASNStrategy::Instance(), "src_as");
+ACLStrategised ACLASN::SourceRegistryEntry_(new ACLASN, ACLSourceASNStrategy::Instance(), "src_as");
ACL::Prototype ACLASN::DestinationRegistryProtoype(&ACLASN::DestinationRegistryEntry_, "dst_as");
-ACLStrategised ACLASN::DestinationRegistryEntry_(new ACLASN, ACLDestinationASNStrategy::Instance(), "dst_as");
+ACLStrategised ACLASN::DestinationRegistryEntry_(new ACLASN, ACLDestinationASNStrategy::Instance(), "dst_as");
int
-ACLSourceASNStrategy::match (ACLData * &data, ACLChecklist *checklist)
+ACLSourceASNStrategy::match (ACLData * &data, ACLChecklist *checklist)
{
return data->match(checklist->src_addr);
}
@@ -638,7 +638,7 @@
debugs(28, 3, "asnMatchAcl: Can't yet compare '" << "unknown" /*name*/ << "' ACL for '" << checklist->request->GetHost() << "'");
checklist->changeState (DestinationIPLookup::Instance());
} else {
- IPAddress noaddr;
+ IpAddress noaddr;
noaddr.SetNoAddr();
return data->match(noaddr);
}
diff -u -r -N squid-3.1.0.3/src/auth/digest/auth_digest.cc squid-3.1.0.4/src/auth/digest/auth_digest.cc
--- squid-3.1.0.3/src/auth/digest/auth_digest.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/auth/digest/auth_digest.cc 2009-01-23 18:37:36.000000000 +1300
@@ -645,7 +645,7 @@
} else {
const char *useragent = request->header.getStr(HDR_USER_AGENT);
- static IPAddress last_broken_addr;
+ static IpAddress last_broken_addr;
static int seen_broken_client = 0;
if (!seen_broken_client) {
diff -u -r -N squid-3.1.0.3/src/auth/Makefile.am squid-3.1.0.4/src/auth/Makefile.am
--- squid-3.1.0.3/src/auth/Makefile.am 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/auth/Makefile.am 2009-01-23 18:37:36.000000000 +1300
@@ -5,9 +5,7 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
-
-##DIST_SUBDIRS = basic digest ntlm
-##SUBDIRS = @AUTH_MODULES@
+CLEANFILES =
EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a
noinst_LIBRARIES = @AUTH_LIBS@
@@ -34,3 +32,4 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
diff -u -r -N squid-3.1.0.3/src/auth/Makefile.in squid-3.1.0.4/src/auth/Makefile.in
--- squid-3.1.0.3/src/auth/Makefile.in 2008-12-05 16:09:57.000000000 +1300
+++ squid-3.1.0.4/src/auth/Makefile.in 2009-01-23 18:37:59.000000000 +1300
@@ -334,6 +334,7 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a libnegotiate.a
noinst_LIBRARIES = @AUTH_LIBS@
libbasic_a_SOURCES = basic/auth_basic.cc basic/auth_basic.h
@@ -610,6 +611,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/src/AuthUser.cc squid-3.1.0.4/src/AuthUser.cc
--- squid-3.1.0.3/src/AuthUser.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/AuthUser.cc 2009-01-23 18:37:35.000000000 +1300
@@ -239,7 +239,7 @@
}
void
-AuthUser::removeIp(IPAddress ipaddr)
+AuthUser::removeIp(IpAddress ipaddr)
{
auth_user_ip_t *ipdata = (auth_user_ip_t *) ip_list.head;
@@ -262,7 +262,7 @@
}
void
-AuthUser::addIp(IPAddress ipaddr)
+AuthUser::addIp(IpAddress ipaddr)
{
auth_user_ip_t *ipdata = (auth_user_ip_t *) ip_list.head;
int found = 0;
diff -u -r -N squid-3.1.0.3/src/AuthUser.h squid-3.1.0.4/src/AuthUser.h
--- squid-3.1.0.3/src/AuthUser.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/AuthUser.h 2009-01-23 18:37:35.000000000 +1300
@@ -41,7 +41,7 @@
/* for auth_type_t */
#include "enums.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#include "dlink.h"
/**
@@ -85,8 +85,8 @@
_SQUID_INLINE_ char const *username() const;
_SQUID_INLINE_ void username(char const *);
void clearIp();
- void removeIp(IPAddress);
- void addIp(IPAddress);
+ void removeIp(IpAddress);
+ void addIp(IpAddress);
_SQUID_INLINE_ void addRequest(AuthUserRequest *);
void lock();
diff -u -r -N squid-3.1.0.3/src/AuthUserRequest.cc squid-3.1.0.4/src/AuthUserRequest.cc
--- squid-3.1.0.3/src/AuthUserRequest.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/AuthUserRequest.cc 2009-01-23 18:37:35.000000000 +1300
@@ -200,7 +200,7 @@
}
static void
-authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, IPAddress &ipaddr)
+authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, IpAddress &ipaddr)
{
AuthUser *auth_user = auth_user_request->user();
@@ -211,7 +211,7 @@
}
void
-authenticateAuthUserRequestRemoveIp(AuthUserRequest * auth_user_request, IPAddress const &ipaddr)
+authenticateAuthUserRequestRemoveIp(AuthUserRequest * auth_user_request, IpAddress const &ipaddr)
{
AuthUser *auth_user = auth_user_request->user();
@@ -328,7 +328,7 @@
* Caller is responsible for locking and unlocking their *auth_user_request!
*/
auth_acl_t
-AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IPAddress &src_addr)
+AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr)
{
const char *proxy_auth;
assert(headertype != 0);
@@ -503,7 +503,7 @@
auth_acl_t
-AuthUserRequest::tryToAuthenticateAndSetAuthUser(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IPAddress &src_addr)
+AuthUserRequest::tryToAuthenticateAndSetAuthUser(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr)
{
/* If we have already been called, return the cached value */
AuthUserRequest *t = authTryGetUser (auth_user_request, conn, request);
diff -u -r -N squid-3.1.0.3/src/AuthUserRequest.h squid-3.1.0.4/src/AuthUserRequest.h
--- squid-3.1.0.3/src/AuthUserRequest.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/AuthUserRequest.h 2009-01-23 18:37:35.000000000 +1300
@@ -48,7 +48,7 @@
dlink_node node;
/* IP addr this user authenticated from */
- IPAddress ipaddr;
+ IpAddress ipaddr;
time_t ip_expiretime;
};
@@ -108,7 +108,7 @@
virtual void user(AuthUser *aUser) {_auth_user=aUser;}
- static auth_acl_t tryToAuthenticateAndSetAuthUser(AuthUserRequest **, http_hdr_type, HttpRequest *, ConnStateData *, IPAddress &);
+ static auth_acl_t tryToAuthenticateAndSetAuthUser(AuthUserRequest **, http_hdr_type, HttpRequest *, ConnStateData *, IpAddress &);
static void addReplyAuthHeader(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated, int internal);
AuthUserRequest();
@@ -146,7 +146,7 @@
private:
- static auth_acl_t authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IPAddress &src_addr);
+ static auth_acl_t authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData * conn, IpAddress &src_addr);
/** return a message on the 407 error pages */
char *message;
@@ -176,7 +176,7 @@
extern void authenticateAddTrailer(HttpReply *, AuthUserRequest *, HttpRequest *, int);
/// \ingroup AuthAPI
-extern void authenticateAuthUserRequestRemoveIp(AuthUserRequest *, IPAddress const &);
+extern void authenticateAuthUserRequestRemoveIp(AuthUserRequest *, IpAddress const &);
/// \ingroup AuthAPI
extern void authenticateAuthUserRequestClearIp(AuthUserRequest *);
/// \ingroup AuthAPI
diff -u -r -N squid-3.1.0.3/src/cache_cf.cc squid-3.1.0.4/src/cache_cf.cc
--- squid-3.1.0.3/src/cache_cf.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/cache_cf.cc 2009-01-23 18:37:36.000000000 +1300
@@ -47,7 +47,7 @@
#include "Parsing.h"
#include "MemBuf.h"
#include "wordlist.h"
-#include "IPInterception.h"
+#include "ip/IpIntercept.h"
#if HAVE_GLOB_H
#include
@@ -142,11 +142,11 @@
static void free_denyinfo(acl_deny_info_list ** var);
#if USE_WCCPv2
-static void parse_IPAddress_list(IPAddress_list **);
-static void dump_IPAddress_list(StoreEntry *, const char *, const IPAddress_list *);
-static void free_IPAddress_list(IPAddress_list **);
+static void parse_IpAddress_list(IpAddress_list **);
+static void dump_IpAddress_list(StoreEntry *, const char *, const IpAddress_list *);
+static void free_IpAddress_list(IpAddress_list **);
#if CURRENTLY_UNUSED
-static int check_null_IPAddress_list(const IPAddress_list *);
+static int check_null_IpAddress_list(const IpAddress_list *);
#endif /* CURRENTLY_UNUSED */
#endif /* USE_WCCPv2 */
@@ -974,14 +974,14 @@
}
static void
-dump_address(StoreEntry * entry, const char *name, IPAddress &addr)
+dump_address(StoreEntry * entry, const char *name, IpAddress &addr)
{
char buf[MAX_IPSTRLEN];
storeAppendPrintf(entry, "%s %s\n", name, addr.NtoA(buf,MAX_IPSTRLEN) );
}
static void
-parse_address(IPAddress *addr)
+parse_address(IpAddress *addr)
{
char *token = strtok(NULL, w_space);
@@ -1001,7 +1001,7 @@
}
static void
-free_address(IPAddress *addr)
+free_address(IpAddress *addr)
{
addr->SetEmpty();
}
@@ -2750,15 +2750,15 @@
#if USE_WCCPv2
void
-parse_IPAddress_list_token(IPAddress_list ** head, char *token)
+parse_IpAddress_list_token(IpAddress_list ** head, char *token)
{
char *t;
char *host;
char *tmp;
- IPAddress ipa;
+ IpAddress ipa;
unsigned short port;
- IPAddress_list *s;
+ IpAddress_list *s;
host = NULL;
port = 0;
@@ -2804,24 +2804,24 @@
while (*head)
head = &(*head)->next;
- s = static_cast(xcalloc(1, sizeof(*s)));
+ s = static_cast(xcalloc(1, sizeof(*s)));
s->s = ipa;
*head = s;
}
static void
-parse_IPAddress_list(IPAddress_list ** head)
+parse_IpAddress_list(IpAddress_list ** head)
{
char *token;
while ((token = strtok(NULL, w_space))) {
- parse_IPAddress_list_token(head, token);
+ parse_IpAddress_list_token(head, token);
}
}
static void
-dump_IPAddress_list(StoreEntry * e, const char *n, const IPAddress_list * s)
+dump_IpAddress_list(StoreEntry * e, const char *n, const IpAddress_list * s)
{
char ntoabuf[MAX_IPSTRLEN];
@@ -2834,7 +2834,7 @@
}
static void
-free_IPAddress_list(IPAddress_list ** head)
+free_IpAddress_list(IpAddress_list ** head)
{
if (*head) delete *head;
*head = NULL;
@@ -2845,7 +2845,7 @@
* be used by icp_port and htcp_port
*/
static int
-check_null_IPAddress_list(const IPAdress_list * s)
+check_null_IpAddress_list(const IPAdress_list * s)
{
return NULL == s;
}
@@ -2966,7 +2966,7 @@
} else if (strcmp(token, "transparent") == 0 || strcmp(token, "intercept") == 0) {
s->intercepted = 1;
- IPInterceptor.StartInterception();
+ IpInterceptor.StartInterception();
/* Log information regarding the port modes under interception. */
debugs(3, DBG_IMPORTANT, "Starting Authentication on port " << s->s);
debugs(3, DBG_IMPORTANT, "Disabling Authentication on port " << s->s << " (interception enabled)");
@@ -2985,7 +2985,7 @@
self_destruct();
}
s->spoof_client_ip = 1;
- IPInterceptor.StartTransparency();
+ IpInterceptor.StartTransparency();
/* Log information regarding the port modes under transparency. */
debugs(3, DBG_IMPORTANT, "Starting IP Spoofing on port " << s->s);
debugs(3, DBG_IMPORTANT, "Disabling Authentication on port " << s->s << " (Ip spoofing enabled)");
diff -u -r -N squid-3.1.0.3/src/cf.data.depend squid-3.1.0.4/src/cf.data.depend
--- squid-3.1.0.3/src/cf.data.depend 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/cf.data.depend 2009-01-23 18:37:36.000000000 +1300
@@ -38,10 +38,11 @@
onoff
peer
peer_access cache_peer acl
+QosConfig
refreshpattern
removalpolicy
size_t
-IPAddress_list
+IpAddress_list
string
string
time_t
diff -u -r -N squid-3.1.0.3/src/cf.data.pre squid-3.1.0.4/src/cf.data.pre
--- squid-3.1.0.3/src/cf.data.pre 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/cf.data.pre 2009-01-23 18:37:36.000000000 +1300
@@ -1226,8 +1226,8 @@
tcp_outgoing_tos 0x20 good_service_net
TOS/DSCP values really only have local significance - so you should
- know what you're specifying. For more information, see RFC2474 and
- RFC3260.
+ know what you're specifying. For more information, see RFC2474,
+ RFC2475, and RFC3260.
The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or
"default" to use whatever default your host has. Note that in
@@ -1253,64 +1253,50 @@
making the request.
DOC_END
-NAME: zph_tos_local
-TYPE: int
+NAME: qos_flows
+TYPE: QosConfig
IFDEF: USE_ZPH_QOS
-DEFAULT: 0
-LOC: Config.zph_tos_local
+DEFAULT: none
+LOC: Config.zph
DOC_START
- Allows you to select a TOS/Diffserv value to mark local hits. Read above
- (tcp_outgoing_tos) for details/requirements about TOS.
- Default: 0 (disabled).
-DOC_END
+ Allows you to select a TOS/DSCP value to mark outgoing
+ connections with, based on where the reply was sourced.
-NAME: zph_tos_peer
-TYPE: int
-IFDEF: USE_ZPH_QOS
-DEFAULT: 0
-LOC: Config.zph_tos_peer
-DOC_START
- Allows you to select a TOS/Diffserv value to mark peer hits. Read above
- (tcp_outgoing_tos) for details/requirements about TOS.
- Default: 0 (disabled).
-DOC_END
+ TOS values really only have local significance - so you should
+ know what you're specifying. For more information, see RFC2474,
+ RFC2475, and RFC3260.
-NAME: zph_tos_parent
-COMMENT: on|off
-TYPE: onoff
-IFDEF: USE_ZPH_QOS
-DEFAULT: on
-LOC: Config.onoff.zph_tos_parent
-DOC_START
- Set this to off if you want only sibling hits to be marked.
- If set to on (default), parent hits are being marked too.
-DOC_END
+ The TOS/DSCP byte must be exactly that - octet value 0x00-0xFF.
+ Note that in practice often only values up to 0x3F are usable
+ as the two highest bits have been redefined for use by ECN
+ (RFC3168).
-NAME: zph_preserve_miss_tos
-COMMENT: on|off
-TYPE: onoff
-IFDEF: USE_ZPH_QOS
-DEFAULT: on
-LOC: Config.onoff.zph_preserve_miss_tos
-DOC_START
- If set to on (default), any HTTP response towards clients will
- have the TOS value of the response comming from the remote
- server masked with the value of zph_preserve_miss_tos_mask.
- For this to work correctly, you will need to patch your linux
- kernel with the TOS preserving ZPH patch.
- The kernel patch can be downloaded from http://zph.bratcheda.org
-DOC_END
+ This setting is configured by setting the source TOS values:
+
+ local-hit=0xFF Value to mark local cache hits.
+
+ sibling-hit=0xFF Value to mark hits from sibling peers.
+
+ parent-hit=0xFF Value to mark hits from parent peers.
+
+
+ NOTE: 'miss' preserve feature is only possible on Linux at this time.
+
+ For the following to work correctly, you will need to patch your
+ linux kernel with the TOS preserving ZPH patch.
+ The kernel patch can be downloaded from http://zph.bratcheda.org
+
+ disable-preserve-miss
+ If set, any HTTP response towards clients will
+ have the TOS value of the response comming from the
+ remote server masked with the value of miss-mask.
+
+ miss-mask=0xFF
+ Allows you to mask certain bits in the TOS received from the
+ remote server, before copying the value to the TOS sent
+ towards clients.
+ Default: 0xFF (TOS from server is not changed).
-NAME: zph_preserve_miss_tos_mask
-TYPE: int
-IFDEF: USE_ZPH_QOS
-DEFAULT: 255
-LOC: Config.zph_preserve_miss_tos_mask
-DOC_START
- Allows you to mask certain bits in the TOS received from the
- remote server, before copying the value to the TOS send towards
- clients.
- Default: 255 (TOS from server is not changed).
DOC_END
NAME: tcp_outgoing_address
@@ -3556,16 +3542,20 @@
NAME: half_closed_clients
TYPE: onoff
LOC: Config.onoff.half_closed_clients
-DEFAULT: on
+DEFAULT: off
DOC_START
Some clients may shutdown the sending side of their TCP
connections, while leaving their receiving sides open. Sometimes,
Squid can not tell the difference between a half-closed and a
- fully-closed TCP connection. By default, half-closed client
- connections are kept open until a read(2) or write(2) on the
- socket returns an error. Change this option to 'off' and Squid
- will immediately close client connections when read(2) returns
- "no more data to read."
+ fully-closed TCP connection.
+
+ By default, Squid will immediately close client connections when
+ read(2) returns "no more data to read."
+
+ Change this option to 'off' and Squid will keep open connections
+ until a read(2) or write(2) on the socket returns an error.
+ This may show some benefits for reverse proxies. But if not
+ it is recommended to leave OFF.
DOC_END
NAME: pconn_timeout
@@ -4038,7 +4028,7 @@
DOC_END
NAME: wccp2_router
-TYPE: IPAddress_list
+TYPE: IpAddress_list
LOC: Config.Wccp2.router
DEFAULT: none
IFDEF: USE_WCCPv2
diff -u -r -N squid-3.1.0.3/src/cf_gen.cc squid-3.1.0.4/src/cf_gen.cc
--- squid-3.1.0.3/src/cf_gen.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/cf_gen.cc 2009-01-23 18:37:36.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: cf_gen.cc,v 1.62 2007/09/17 20:21:23 hno Exp $
- *
* DEBUG: none Generate squid.conf.default and cf_parser.h
* AUTHOR: Max Okumoto
*
@@ -48,9 +45,19 @@
* administrator.
*****************************************************************************/
-#include "squid.h"
-#include "SquidTime.h"
+//#include "squid.h"
+#include "config.h"
+#include "assert.h"
+//#include "SquidTime.h"
#include "cf_gen_defines.h"
+#include "util.h"
+
+#if HAVE_STRING_H
+#include
+#endif
+#if HAVE_STRING_H
+#include
+#endif
#define MAX_LINE 1024 /* longest configuration line */
#define _PATH_PARSER "cf_parser.h"
diff -u -r -N squid-3.1.0.3/src/client_db.cc squid-3.1.0.4/src/client_db.cc
--- squid-3.1.0.3/src/client_db.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_db.cc 2009-01-23 18:37:36.000000000 +1300
@@ -42,7 +42,7 @@
static hash_table *client_table = NULL;
-static ClientInfo *clientdbAdd(const IPAddress &addr);
+static ClientInfo *clientdbAdd(const IpAddress &addr);
static FREE clientdbFreeItem;
static void clientdbStartGC(void);
static void clientdbScheduledGC(void *);
@@ -56,7 +56,7 @@
static ClientInfo *
-clientdbAdd(const IPAddress &addr)
+clientdbAdd(const IpAddress &addr)
{
ClientInfo *c;
char *buf = new char[MAX_IPSTRLEN];
@@ -94,7 +94,7 @@
}
void
-clientdbUpdate(const IPAddress &addr, log_type ltype, protocol_t p, size_t size)
+clientdbUpdate(const IpAddress &addr, log_type ltype, protocol_t p, size_t size)
{
char key[MAX_IPSTRLEN];
ClientInfo *c;
@@ -138,7 +138,7 @@
* -1. To get the current value, simply call with delta = 0.
*/
int
-clientdbEstablished(const IPAddress &addr, int delta)
+clientdbEstablished(const IpAddress &addr, int delta)
{
char key[MAX_IPSTRLEN];
ClientInfo *c;
@@ -165,7 +165,7 @@
#define CUTOFF_SECONDS 3600
int
-clientdbCutoffDenied(const IPAddress &addr)
+clientdbCutoffDenied(const IpAddress &addr)
{
char key[MAX_IPSTRLEN];
int NR;
@@ -229,10 +229,10 @@
return aLogType;
}
-
void
clientdbDump(StoreEntry * sentry)
{
+ const char *name;
ClientInfo *c;
log_type l;
int icp_total = 0;
@@ -244,7 +244,9 @@
while ((c = (ClientInfo *) hash_next(client_table))) {
storeAppendPrintf(sentry, "Address: %s\n", hashKeyStr(&c->hash));
- storeAppendPrintf(sentry, "Name: %s\n", fqdnFromAddr(c->addr));
+ if( (name = fqdncache_gethostbyaddr(c->addr, 0)) ) {
+ storeAppendPrintf(sentry, "Name: %s\n", name);
+ }
storeAppendPrintf(sentry, "Currently established connections: %d\n",
c->n_established);
storeAppendPrintf(sentry, " ICP Requests %d\n",
@@ -382,8 +384,8 @@
#if SQUID_SNMP
-IPAddress *
-client_entry(IPAddress *current)
+IpAddress *
+client_entry(IpAddress *current)
{
ClientInfo *c = NULL;
char key[MAX_IPSTRLEN];
diff -u -r -N squid-3.1.0.3/src/client_side.cc squid-3.1.0.4/src/client_side.cc
--- squid-3.1.0.3/src/client_side.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_side.cc 2009-01-23 18:37:36.000000000 +1300
@@ -20,12 +20,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -43,16 +43,16 @@
* of client_side_reply.c.
* Problem the second: resources are wasted if we delay in cleaning up.
* Problem the third we can't depend on a connection close to clean up.
- *
+ *
\par Nice thing the first:
- * Any step in the stream can callback with data
+ * Any step in the stream can callback with data
* representing an error.
* Nice thing the second: once you stop requesting reads from upstream,
* upstream can be stopped too.
*
\par Solution #1:
* Error has a callback mechanism to hand over a membuf
- * with the error content. The failing node pushes that back as the
+ * with the error content. The failing node pushes that back as the
* reply. Can this be generalised to reduce duplicate efforts?
* A: Possibly. For now, only one location uses this.
* How to deal with pre-stream errors?
@@ -65,28 +65,26 @@
\par
* requests (httpClientRequest structs) get added to the connection
* list, with the current one being chr
- *
+ *
\par
* The request is *immediately* kicked off, and data flows through
* to clientSocketRecipient.
- *
+ *
\par
* If the data that arrives at clientSocketRecipient is not for the current
* request, clientSocketRecipient simply returns, without requesting more
* data, or sending it.
*
\par
- * ClientKeepAliveNextRequest will then detect the presence of data in
- * the next ClientHttpRequest, and will send it, restablishing the
+ * ClientKeepAliveNextRequest will then detect the presence of data in
+ * the next ClientHttpRequest, and will send it, restablishing the
* data flow.
*/
-#include "config.h"
#include "squid.h"
#include "client_side.h"
#include "clientStream.h"
#include "ProtoPort.h"
-#include "IPInterception.h"
#include "AuthUserRequest.h"
#include "Store.h"
#include "comm.h"
@@ -94,6 +92,7 @@
#include "HttpReply.h"
#include "HttpRequest.h"
#include "ident.h"
+#include "ip/IpIntercept.h"
#include "MemObject.h"
#include "fde.h"
#include "client_side_request.h"
@@ -167,7 +166,7 @@
static int connKeepReadingIncompleteRequest(ConnStateData * conn);
static void connCancelIncompleteRequests(ConnStateData * conn);
-static ConnStateData *connStateCreate(const IPAddress &peer, const IPAddress &me, int fd, http_port_list *port);
+static ConnStateData *connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port);
int
@@ -473,7 +472,7 @@
aLogEntry->cache.authuser =
xstrdup(request->auth_user_request->username());
- AUTHUSERREQUESTUNLOCK(request->auth_user_request, "request via clientPrepareLogWithRequestDetails");
+ AUTHUSERREQUESTUNLOCK(request->auth_user_request, "request via clientPrepareLogWithRequestDetails");
}
}
@@ -500,7 +499,7 @@
al.cache.caddr.SetNoAddr();
- if(getConn() != NULL) al.cache.caddr = getConn()->log_addr;
+ if (getConn() != NULL) al.cache.caddr = getConn()->log_addr;
al.cache.requestSize = req_sz;
@@ -520,9 +519,9 @@
#if USE_SSL && 0
- /* This is broken. Fails if the connection has been closed. Needs
- * to snarf the ssl details some place earlier..
- */
+ /* This is broken. Fails if the connection has been closed. Needs
+ * to snarf the ssl details some place earlier..
+ */
if (getConn() != NULL)
al.cache.ssluser = sslGetUserEmail(fd_table[getConn()->fd].ssl);
@@ -534,7 +533,8 @@
checklist->reply = HTTPMSGLOCK(al.reply);
if (!Config.accessList.log || checklist->fastCheck()) {
- al.request = HTTPMSGLOCK(request);
+ if(request)
+ al.request = HTTPMSGLOCK(request);
accessLogLog(&al, checklist);
updateCounters();
@@ -622,7 +622,7 @@
}
if (pinning.fd >= 0)
- comm_close(pinning.fd);
+ comm_close(pinning.fd);
BodyProducer::swanSong();
flags.swanSang = true;
@@ -632,8 +632,8 @@
ConnStateData::isOpen() const
{
return cbdataReferenceValid(this) && // XXX: checking "this" in a method
- fd >= 0 &&
- !fd_table[fd].closing();
+ fd >= 0 &&
+ !fd_table[fd].closing();
}
ConnStateData::~ConnStateData()
@@ -829,9 +829,9 @@
if (!multipartRangeRequest()) {
size_t length = lengthToSend(bodyData.range());
noteSentBodyBytes (length);
- AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteBodyComplete",
- CommIoCbPtrFun(clientWriteBodyComplete, this));
- comm_write(fd(), bodyData.data, length, call );
+ AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteBodyComplete",
+ CommIoCbPtrFun(clientWriteBodyComplete, this));
+ comm_write(fd(), bodyData.data, length, call );
return;
}
@@ -839,11 +839,11 @@
mb.init();
packRange(bodyData, &mb);
- if (mb.contentSize()){
+ if (mb.contentSize()) {
/* write */
- AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteComplete",
- CommIoCbPtrFun(clientWriteComplete, this));
- comm_write_mbuf(fd(), &mb, call);
+ AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteComplete",
+ CommIoCbPtrFun(clientWriteComplete, this));
+ comm_write_mbuf(fd(), &mb, call);
} else
writeComplete(fd(), NULL, 0, COMM_OK);
}
@@ -1096,7 +1096,7 @@
range_err = "INCONSISTENT length"; /* a bug? */
/* hits only - upstream peer determines correct behaviour on misses, and client_side_reply determines
- * hits candidates
+ * hits candidates
*/
else if (logTypeIsATcpHit(http->logType) && http->request->header.has(HDR_IF_RANGE) && !clientIfRangeMatch(http, rep))
range_err = "If-Range match failed";
@@ -1110,7 +1110,7 @@
/* get rid of our range specs on error */
if (range_err) {
/* XXX We do this here because we need canonisation etc. However, this current
- * code will lead to incorrect store offset requests - the store will have the
+ * code will lead to incorrect store offset requests - the store will have the
* offset data, but we won't be requesting it.
* So, we can either re-request, or generate an error
*/
@@ -1131,7 +1131,7 @@
int64_t actual_clen = -1;
debugs(33, 3, "clientBuildRangeHeader: range spec count: " <<
- spec_count << " virgin clen: " << rep->content_length);
+ spec_count << " virgin clen: " << rep->content_length);
assert(spec_count > 0);
/* ETags should not be returned with Partial Content replies? */
hdr->delById(HDR_ETAG);
@@ -1227,8 +1227,8 @@
/* write */
debugs(33,7, HERE << "sendStartOfMessage schedules clientWriteComplete");
- AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteComplete",
- CommIoCbPtrFun(clientWriteComplete, this));
+ AsyncCall::Pointer call = commCbCall(33, 5, "clientWriteComplete",
+ CommIoCbPtrFun(clientWriteComplete, this));
comm_write_mbuf(fd(), mb, call);
delete mb;
@@ -1238,7 +1238,7 @@
* Write a chunk of data to a client socket. If the reply is present,
* send the reply headers down the wire too, and clean them up when
* finished.
- * Pre-condition:
+ * Pre-condition:
* The request is one backed by a connection, not an internal request.
* data context is not NULL
* There are no more entries in the stream chain.
@@ -1252,9 +1252,9 @@
assert(node != NULL);
PROF_start(clientSocketRecipient);
/* TODO: handle this rather than asserting
- * - it should only ever happen if we cause an abort and
- * the callback chain loops back to here, so we can simply return.
- * However, that itself shouldn't happen, so it stays as an assert for now.
+ * - it should only ever happen if we cause an abort and
+ * the callback chain loops back to here, so we can simply return.
+ * However, that itself shouldn't happen, so it stays as an assert for now.
*/
assert(cbdataReferenceValid(node));
assert(node->node.next == NULL);
@@ -1298,8 +1298,8 @@
/* Test preconditions */
assert(node != NULL);
/* TODO: handle this rather than asserting
- * - it should only ever happen if we cause an abort and
- * the callback chain loops back to here, so we can simply return.
+ * - it should only ever happen if we cause an abort and
+ * the callback chain loops back to here, so we can simply return.
* However, that itself shouldn't happen, so it stays as an assert for now.
*/
assert(cbdataReferenceValid(node));
@@ -1331,7 +1331,7 @@
*/
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
- TimeoutDialer(this, &ConnStateData::requestTimeout));
+ TimeoutDialer(this, &ConnStateData::requestTimeout));
commSetTimeout(fd, Config.Timeout.persistent_request, timeoutCall);
readSomeData();
@@ -1438,7 +1438,7 @@
* used by clientPackMoreRanges
*
\retval true there is still data available to pack more ranges
- \retval false
+ \retval false
*/
bool
ClientSocketContext::canPackMoreRanges() const
@@ -1478,12 +1478,12 @@
start = http->range_iter.currentSpec()->offset + http->range_iter.currentSpec()->length - http->range_iter.debt();
debugs(33, 3, "clientPackMoreRanges: in: offset: " << http->out.offset);
debugs(33, 3, "clientPackMoreRanges: out:"
- " start: " << start <<
- " spec[" << http->range_iter.pos - http->request->range->begin() << "]:" <<
- " [" << http->range_iter.currentSpec()->offset <<
- ", " << http->range_iter.currentSpec()->offset + http->range_iter.currentSpec()->length << "),"
- " len: " << http->range_iter.currentSpec()->length <<
- " debt: " << http->range_iter.debt());
+ " start: " << start <<
+ " spec[" << http->range_iter.pos - http->request->range->begin() << "]:" <<
+ " [" << http->range_iter.currentSpec()->offset <<
+ ", " << http->range_iter.currentSpec()->offset + http->range_iter.currentSpec()->length << "),"
+ " len: " << http->range_iter.currentSpec()->length <<
+ " debt: " << http->range_iter.debt());
if (http->range_iter.currentSpec()->length != -1)
assert(http->out.offset <= start); /* we did not miss it */
@@ -1505,7 +1505,7 @@
ClientSocketContext::pullData()
{
debugs(33, 5, "ClientSocketContext::pullData: FD " << fd() <<
- " attempting to pull upstream data");
+ " attempting to pull upstream data");
/* More data will be coming from the stream. */
StoreIOBuffer readBuffer;
@@ -1533,7 +1533,7 @@
if (!canPackMoreRanges()) {
debugs(33, 5, HERE << "Range request at end of returnable " <<
- "range sequence on FD " << fd());
+ "range sequence on FD " << fd());
if (http->request->flags.proxy_keepalive)
return STREAM_COMPLETE;
@@ -1546,8 +1546,8 @@
const int64_t &bytesExpected = reply->content_range->spec.length;
debugs(33, 7, HERE << "body bytes sent vs. expected: " <<
- bytesSent << " ? " << bytesExpected << " (+" <<
- reply->content_range->spec.offset << ")");
+ bytesSent << " ? " << bytesExpected << " (+" <<
+ reply->content_range->spec.offset << ")");
// did we get at least what we expected, based on range specs?
@@ -1809,7 +1809,7 @@
strlen(host);
http->uri = (char *)xcalloc(url_sz, 1);
const char *protocol = switchedToHttps ?
- "https" : conn->port->protocol;
+ "https" : conn->port->protocol;
snprintf(http->uri, url_sz, "%s://%s%s", protocol, host, url);
debugs(33, 5, "ACCEL VHOST REWRITE: '" << http->uri << "'");
} else if (conn->port->defaultsite) {
@@ -1872,7 +1872,7 @@
/**
* parseHttpRequest()
- *
+ *
* Returns
* NULL on incomplete requests
* a ClientSocketContext structure on success or failure.
@@ -2142,7 +2142,7 @@
conn->in.notYetUsed -= byteCount;
debugs(33, 5, HERE << "conn->in.notYetUsed = " << conn->in.notYetUsed);
/*
- * If there is still data that will be used,
+ * If there is still data that will be used,
* move it to the beginning.
*/
@@ -2260,10 +2260,10 @@
* If transparent or interception mode is working clone the transparent and interception flags
* from the port settings to the request.
*/
- if(IPInterceptor.InterceptActive()) {
+ if (IpInterceptor.InterceptActive()) {
request->flags.intercepted = http->flags.intercepted;
}
- if(IPInterceptor.TransparentActive()) {
+ if (IpInterceptor.TransparentActive()) {
request->flags.spoof_client_ip = conn->port->spoof_client_ip;
}
@@ -2361,7 +2361,7 @@
http->calloutContext = new ClientRequestContext(http);
http->doCallouts();
-
+
finish:
if (!notedUseOfBuffer)
connNoteUseOfBuffer(conn, http->req_sz);
@@ -2374,10 +2374,10 @@
* assertion, not to mention that we were accessing freed memory.
*/
if (http->request->flags.resetTCP() && conn->fd > -1) {
- debugs(33, 3, HERE << "Sending TCP RST on FD " << conn->fd);
- conn->flags.readMoreRequests = false;
- comm_reset_close(conn->fd);
- return;
+ debugs(33, 3, HERE << "Sending TCP RST on FD " << conn->fd);
+ conn->flags.readMoreRequests = false;
+ comm_reset_close(conn->fd);
+ return;
}
}
@@ -2541,9 +2541,9 @@
handleReadData(io.buf, io.size);
- /* The above may close the connection under our feets */
- if (!isOpen())
- return;
+ /* The above may close the connection under our feets */
+ if (!isOpen())
+ return;
} else if (io.size == 0) {
debugs(33, 5, "clientReadRequest: FD " << fd << " closed?");
@@ -2575,8 +2575,8 @@
fd_note(fd, "Reading next request");
if (! clientParseRequest(this, do_next_read)) {
- if (!isOpen())
- return;
+ if (!isOpen())
+ return;
/*
* If the client here is half closed and we failed
* to parse a request, close the connection.
@@ -2711,10 +2711,10 @@
/*
* if we don't close() here, we still need a timeout handler!
*/
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
- TimeoutDialer(this,&ConnStateData::requestTimeout));
- commSetTimeout(io.fd, 30, timeoutCall);
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
+ TimeoutDialer(this,&ConnStateData::requestTimeout));
+ commSetTimeout(io.fd, 30, timeoutCall);
/*
* Aha, but we don't want a read handler!
@@ -2766,7 +2766,7 @@
}
ConnStateData *
-connStateCreate(const IPAddress &peer, const IPAddress &me, int fd, http_port_list *port)
+connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port)
{
ConnStateData *result = new ConnStateData;
@@ -2778,10 +2778,10 @@
result->in.buf = (char *)memAllocBuf(CLIENT_REQ_BUF_SZ, &result->in.allocatedSize);
result->port = cbdataReference(port);
- if(port->intercepted || port->spoof_client_ip) {
- IPAddress client, dst;
+ if (port->intercepted || port->spoof_client_ip) {
+ IpAddress client, dst;
- if (IPInterceptor.NatLookup(fd, me, peer, client, dst) == 0) {
+ if (IpInterceptor.NatLookup(fd, me, peer, client, dst) == 0) {
result->me = client;
result->peer = dst;
result->transparent(true);
@@ -2789,8 +2789,7 @@
}
if (port->disable_pmtu_discovery != DISABLE_PMTU_OFF &&
- (result->transparent() || port->disable_pmtu_discovery == DISABLE_PMTU_ALWAYS))
- {
+ (result->transparent() || port->disable_pmtu_discovery == DISABLE_PMTU_ALWAYS)) {
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
int i = IP_PMTUDISC_DONT;
setsockopt(fd, SOL_IP, IP_MTU_DISCOVER, &i, sizeof i);
@@ -2841,16 +2840,16 @@
typedef CommCbMemFunT Dialer;
AsyncCall::Pointer call = asyncCall(33, 5, "ConnStateData::connStateClosed",
- Dialer(connState, &ConnStateData::connStateClosed));
+ Dialer(connState, &ConnStateData::connStateClosed));
comm_add_close_handler(newfd, call);
if (Config.onoff.log_fqdn)
fqdncache_gethostbyaddr(details->peer, FQDN_LOOKUP_IF_MISS);
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
- TimeoutDialer(connState,&ConnStateData::requestTimeout));
- commSetTimeout(newfd, Config.Timeout.read, timeoutCall);
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
+ TimeoutDialer(connState,&ConnStateData::requestTimeout));
+ commSetTimeout(newfd, Config.Timeout.read, timeoutCall);
#if USE_IDENT
@@ -2870,7 +2869,7 @@
#endif
if (s->tcp_keepalive.enabled) {
- commSetTcpKeepalive(newfd, s->tcp_keepalive.idle, s->tcp_keepalive.interval, s->tcp_keepalive.timeout);
+ commSetTcpKeepalive(newfd, s->tcp_keepalive.idle, s->tcp_keepalive.interval, s->tcp_keepalive.timeout);
}
connState->readSomeData();
@@ -2940,7 +2939,7 @@
if (errno == ECONNRESET)
hard = 0;
- debugs(83, hard ? 1 : 2, "clientNegotiateSSL: Error negotiating SSL connection on FD " <<
+ debugs(83, hard ? 1 : 2, "clientNegotiateSSL: Error negotiating SSL connection on FD " <<
fd << ": " << strerror(errno) << " (" << errno << ")");
comm_close(fd);
@@ -2954,9 +2953,9 @@
return;
default:
- debugs(83, 1, "clientNegotiateSSL: Error negotiating SSL connection on FD " <<
- fd << ": " << ERR_error_string(ERR_get_error(), NULL) <<
- " (" << ssl_error << "/" << ret << ")");
+ debugs(83, 1, "clientNegotiateSSL: Error negotiating SSL connection on FD " <<
+ fd << ": " << ERR_error_string(ERR_get_error(), NULL) <<
+ " (" << ssl_error << "/" << ret << ")");
comm_close(fd);
return;
}
@@ -3056,19 +3055,19 @@
debugs(33, 5, "httpsAccept: FD " << newfd << " accepted, starting SSL negotiation.");
fd_note(newfd, "client https connect");
ConnStateData *connState = connStateCreate(details->peer, details->me,
- newfd, &s->http);
+ newfd, &s->http);
typedef CommCbMemFunT Dialer;
AsyncCall::Pointer call = asyncCall(33, 5, "ConnStateData::connStateClosed",
- Dialer(connState, &ConnStateData::connStateClosed));
+ Dialer(connState, &ConnStateData::connStateClosed));
comm_add_close_handler(newfd, call);
if (Config.onoff.log_fqdn)
fqdncache_gethostbyaddr(details->peer, FQDN_LOOKUP_IF_MISS);
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
- TimeoutDialer(connState,&ConnStateData::requestTimeout));
- commSetTimeout(newfd, Config.Timeout.request, timeoutCall);
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(33, 5, "ConnStateData::requestTimeout",
+ TimeoutDialer(connState,&ConnStateData::requestTimeout));
+ commSetTimeout(newfd, Config.Timeout.request, timeoutCall);
#if USE_IDENT
@@ -3088,7 +3087,7 @@
#endif
if (s->http.tcp_keepalive.enabled) {
- commSetTcpKeepalive(newfd, s->http.tcp_keepalive.idle, s->http.tcp_keepalive.interval, s->http.tcp_keepalive.timeout);
+ commSetTcpKeepalive(newfd, s->http.tcp_keepalive.idle, s->http.tcp_keepalive.interval, s->http.tcp_keepalive.timeout);
}
commSetSelect(newfd, COMM_SELECT_READ, clientNegotiateSSL, connState, 0);
@@ -3162,7 +3161,7 @@
enter_suid();
- if(s->spoof_client_ip) {
+ if (s->spoof_client_ip) {
fd = comm_openex(SOCK_STREAM, IPPROTO_TCP, s->s, (COMM_NONBLOCKING|COMM_TRANSPARENT), 0, "HTTP Socket");
} else {
fd = comm_open(SOCK_STREAM, IPPROTO_TCP, s->s, COMM_NONBLOCKING, "HTTP Socket");
@@ -3181,7 +3180,7 @@
(s->intercepted ? " intercepted" : "") <<
(s->spoof_client_ip ? " spoofing" : "") <<
(s->sslBump ? " bumpy" : "") <<
- (s->accel ? " accelerated" : "")
+ (s->accel ? " accelerated" : "")
<< " HTTP connections at " << s->s
<< ", FD " << fd << "." );
@@ -3191,8 +3190,8 @@
#if USE_SSL
if (bumpCount && !Config.accessList.ssl_bump)
debugs(33, 1, "WARNING: http_port(s) with SslBump found, but no " <<
- std::endl << "\tssl_bump ACL configured. No requests will be " <<
- "bumped.");
+ std::endl << "\tssl_bump ACL configured. No requests will be " <<
+ "bumped.");
#endif
}
@@ -3282,8 +3281,8 @@
if (!has_vary || !entry->mem_obj->vary_headers) {
if (vary) {
/* Oops... something odd is going on here.. */
- debugs(33, 1, "varyEvaluateMatch: Oops. Not a Vary object on second attempt, '" <<
- entry->mem_obj->url << "' '" << vary << "'");
+ debugs(33, 1, "varyEvaluateMatch: Oops. Not a Vary object on second attempt, '" <<
+ entry->mem_obj->url << "' '" << vary << "'");
safe_free(request->vary_headers);
return VARY_CANCEL;
}
@@ -3325,7 +3324,7 @@
* found the requested variant. Bail out
*/
debugs(33, 1, "varyEvaluateMatch: Oops. Not a Vary match on second attempt, '" <<
- entry->mem_obj->url << "' '" << vary << "'");
+ entry->mem_obj->url << "' '" << vary << "'");
return VARY_CANCEL;
}
}
@@ -3449,42 +3448,43 @@
{
pinning.fd = -1;
if (pinning.peer) {
- cbdataReferenceDone(pinning.peer);
+ cbdataReferenceDone(pinning.peer);
}
safe_free(pinning.host);
/* NOTE: pinning.pinned should be kept. This combined with fd == -1 at the end of a request indicates that the host
* connection has gone away */
}
-void ConnStateData::pinConnection(int pinning_fd, HttpRequest *request, struct peer *peer, bool auth){
+void ConnStateData::pinConnection(int pinning_fd, HttpRequest *request, struct peer *peer, bool auth)
+{
fde *f;
char desc[FD_DESC_SZ];
if (pinning.fd == pinning_fd)
- return;
+ return;
else if (pinning.fd != -1)
- comm_close(pinning.fd);
-
- if(pinning.host)
- safe_free(pinning.host);
-
+ comm_close(pinning.fd);
+
+ if (pinning.host)
+ safe_free(pinning.host);
+
pinning.fd = pinning_fd;
pinning.host = xstrdup(request->GetHost());
pinning.port = request->port;
pinning.pinned = true;
if (pinning.peer)
- cbdataReferenceDone(pinning.peer);
+ cbdataReferenceDone(pinning.peer);
if (peer)
- pinning.peer = cbdataReference(peer);
+ pinning.peer = cbdataReference(peer);
pinning.auth = auth;
f = &fd_table[fd];
snprintf(desc, FD_DESC_SZ, "%s pinned connection for %s:%d (%d)",
- (auth || !peer) ? request->GetHost() : peer->name, f->ipaddr, (int) f->remote_port, fd);
+ (auth || !peer) ? request->GetHost() : peer->name, f->ipaddr, (int) f->remote_port, fd);
fd_note(pinning_fd, desc);
-
+
typedef CommCbMemFunT Dialer;
pinning.closeHandler = asyncCall(33, 5, "ConnStateData::clientPinnedConnectionClosed",
- Dialer(this, &ConnStateData::clientPinnedConnectionClosed));
+ Dialer(this, &ConnStateData::clientPinnedConnectionClosed));
comm_add_close_handler(pinning_fd, pinning.closeHandler);
}
@@ -3493,31 +3493,31 @@
{
bool valid = true;
if (pinning.fd < 0)
- return -1;
-
+ return -1;
+
if (pinning.auth && request && strcasecmp(pinning.host, request->GetHost()) != 0) {
- valid = false;
+ valid = false;
}
- if (request && pinning.port != request->port){
- valid = false;
+ if (request && pinning.port != request->port) {
+ valid = false;
}
- if (pinning.peer && !cbdataReferenceValid(pinning.peer)){
- valid = false;
+ if (pinning.peer && !cbdataReferenceValid(pinning.peer)) {
+ valid = false;
}
- if (peer != pinning.peer){
- valid = false;
+ if (peer != pinning.peer) {
+ valid = false;
}
- if(!valid) {
- int pinning_fd=pinning.fd;
- /* The pinning info is not safe, remove any pinning info*/
- unpinConnection();
+ if (!valid) {
+ int pinning_fd=pinning.fd;
+ /* The pinning info is not safe, remove any pinning info*/
+ unpinConnection();
- /* also close the server side socket, we should not use it for invalid/unauthenticated
- requests...
- */
- comm_close(pinning_fd);
- return -1;
+ /* also close the server side socket, we should not use it for invalid/unauthenticated
+ requests...
+ */
+ comm_close(pinning_fd);
+ return -1;
}
return pinning.fd;
@@ -3525,12 +3525,12 @@
void ConnStateData::unpinConnection()
{
- if(pinning.peer)
- cbdataReferenceDone(pinning.peer);
+ if (pinning.peer)
+ cbdataReferenceDone(pinning.peer);
- if(pinning.closeHandler != NULL) {
- comm_remove_close_handler(pinning.fd, pinning.closeHandler);
- pinning.closeHandler = NULL;
+ if (pinning.closeHandler != NULL) {
+ comm_remove_close_handler(pinning.fd, pinning.closeHandler);
+ pinning.closeHandler = NULL;
}
pinning.fd = -1;
safe_free(pinning.host);
diff -u -r -N squid-3.1.0.3/src/client_side.h squid-3.1.0.4/src/client_side.h
--- squid-3.1.0.3/src/client_side.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_side.h 2009-01-23 18:37:36.000000000 +1300
@@ -18,12 +18,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -68,17 +68,15 @@
char reqbuf[HTTP_REQBUF_SZ];
Pointer next;
- struct
- {
+ struct {
-unsigned deferred: 1; /* This is a pipelined request waiting for the current object to complete */
+ unsigned deferred:1; /* This is a pipelined request waiting for the current object to complete */
-unsigned parsed_ok: 1; /* Was this parsed correctly? */
+ unsigned parsed_ok:1; /* Was this parsed correctly? */
} flags;
bool mayUseConnection() const {return mayUseConnection_;}
- void mayUseConnection(bool aBool)
- {
+ void mayUseConnection(bool aBool) {
mayUseConnection_ = aBool;
debug (33,3)("ClientSocketContext::mayUseConnection: This %p marked %d\n",
this, aBool);
@@ -146,8 +144,7 @@
int fd;
- struct In
- {
+ struct In {
In();
~In();
char *addressToReadInto() const;
@@ -176,16 +173,15 @@
*/
ClientSocketContext::Pointer currentobject;
- IPAddress peer;
+ IpAddress peer;
- IPAddress me;
+ IpAddress me;
- IPAddress log_addr;
+ IpAddress log_addr;
char rfc931[USER_IDENT_SZ];
int nrequests;
- struct
- {
+ struct {
bool readMoreRequests;
bool swanSang; // XXX: temporary flag to check proper cleanup
} flags;
@@ -196,8 +192,8 @@
bool pinned; /* this connection was pinned */
bool auth; /* pinned for www authentication */
struct peer *peer; /* peer the connection goes via */
- AsyncCall::Pointer closeHandler; /*The close handler for pinned server side connection*/
- } pinning;
+ AsyncCall::Pointer closeHandler; /*The close handler for pinned server side connection*/
+ } pinning;
http_port_list *port;
@@ -223,7 +219,7 @@
/**
* Decorrelate the ConnStateData object from its pinned peer
*/
- void unpinConnection();
+ void unpinConnection();
/**
* Checks if there is pinning info if it is valid. It can close the server side connection
* if pinned info is not valid.
diff -u -r -N squid-3.1.0.3/src/client_side_reply.cc squid-3.1.0.4/src/client_side_reply.cc
--- squid-3.1.0.3/src/client_side_reply.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_side_reply.cc 2009-01-23 18:37:36.000000000 +1300
@@ -64,7 +64,7 @@
/* Local functions */
extern "C" CSS clientReplyStatus;
-extern ErrorState *clientBuildError(err_type, http_status, char const *, IPAddress &, HttpRequest *);
+extern ErrorState *clientBuildError(err_type, http_status, char const *, IpAddress &, HttpRequest *);
/* privates */
@@ -93,7 +93,7 @@
void
clientReplyContext::setReplyToError(
err_type err, http_status status, const HttpRequestMethod& method, char const *uri,
- IPAddress &addr, HttpRequest * failedrequest, char *unparsedrequest,
+ IpAddress &addr, HttpRequest * failedrequest, char *unparsedrequest,
AuthUserRequest * auth_user_request)
{
ErrorState *errstate =
@@ -400,8 +400,8 @@
extern "C" CSR clientGetMoreData;
extern "C" CSD clientReplyDetach;
-/*
- * clientCacheHit should only be called until the HTTP reply headers
+/**
+ * clientReplyContext::cacheHit Should only be called until the HTTP reply headers
* have been parsed. Normally this should be a single call, but
* it might take more than one. As soon as we have the headers,
* we hand off to clientSendMoreData, processExpired, or
@@ -411,12 +411,16 @@
clientReplyContext::CacheHit(void *data, StoreIOBuffer result)
{
clientReplyContext *context = (clientReplyContext *)data;
- context->cacheHit (result);
+ context->cacheHit(result);
}
+/**
+ * Process a possible cache HIT.
+ */
void
clientReplyContext::cacheHit(StoreIOBuffer result)
{
+ /** Ignore if the HIT object is being deleted. */
if (deleting)
return;
@@ -603,7 +607,7 @@
}
}
-/*
+/**
* Prepare to fetch the object as it's a cache miss of some kind.
*/
void
@@ -613,11 +617,11 @@
HttpRequest *r = http->request;
ErrorState *err = NULL;
debugs(88, 4, "clientProcessMiss: '" << RequestMethodStr(r->method) << " " << url << "'");
- /*
+
+ /**
* We might have a left-over StoreEntry from a failed cache hit
* or IMS request.
*/
-
if (http->storeEntry()) {
if (EBIT_TEST(http->storeEntry()->flags, ENTRY_SPECIAL)) {
debugs(88, 0, "clientProcessMiss: miss on a special object (" << url << ").");
@@ -628,22 +632,24 @@
removeClientStoreReference(&sc, http);
}
+ /** Check if its a PURGE request to be actioned. */
if (r->method == METHOD_PURGE) {
purgeRequest();
return;
}
+ /** Check if its an 'OTHER' request. Purge all cached entries if so and continue. */
if (r->method == METHOD_OTHER) {
- // invalidate all cache entries
purgeAllCached();
}
+ /** Check if 'only-if-cached' flag is set. Action if so. */
if (http->onlyIfCached()) {
processOnlyIfCachedMiss();
return;
}
- /*
+ /**
* Deny loops when running in accelerator/transproxy mode.
*/
if (http->flags.accel && r->flags.loopdetect) {
@@ -672,16 +678,18 @@
return;
}
+ /** Check for internal requests. Update Protocol info if so. */
if (http->flags.internal)
r->protocol = PROTO_INTERNAL;
+ /** Start forwarding to get the new object from network */
FwdState::fwdStart(http->getConn() != NULL ? http->getConn()->fd : -1,
http->storeEntry(),
r);
}
}
-/*
+/**
* client issued a request with an only-if-cached cache-control directive;
* we did not find a cached object that can be returned without
* contacting other servers;
@@ -1346,35 +1354,30 @@
#endif
/* Check whether we should send keep-alive */
- // TODO: disable proxy_keepalive only once
-
- if (reply->bodySize(request->method) < 0) {
- debugs(88, 3, "clientBuildReplyHeader: can't keep-alive, unknown body size" );
- request->flags.proxy_keepalive = 0;
- }
-
- if (fdUsageHigh()&& !request->flags.must_keepalive) {
- debugs(88, 3, "clientBuildReplyHeader: Not many unused FDs, can't keep-alive");
- request->flags.proxy_keepalive = 0;
- }
-
if (!Config.onoff.error_pconns && reply->sline.status >= 400 && !request->flags.must_keepalive) {
debugs(33, 3, "clientBuildReplyHeader: Error, don't keep-alive");
request->flags.proxy_keepalive = 0;
}
-
- if (!Config.onoff.client_pconns && !request->flags.must_keepalive)
+ else if (!Config.onoff.client_pconns && !request->flags.must_keepalive) {
+ debugs(33, 2, "clientBuildReplyHeader: Connection Keep-Alive not requested by admin or client");
request->flags.proxy_keepalive = 0;
-
- if (request->flags.proxy_keepalive && shutting_down) {
+ }
+ else if (request->flags.proxy_keepalive && shutting_down) {
debugs(88, 3, "clientBuildReplyHeader: Shutting down, don't keep-alive.");
request->flags.proxy_keepalive = 0;
}
-
- if (request->flags.connection_auth && !reply->keep_alive) {
+ else if (request->flags.connection_auth && !reply->keep_alive) {
debugs(33, 2, "clientBuildReplyHeader: Connection oriented auth but server side non-persistent");
request->flags.proxy_keepalive = 0;
}
+ else if (reply->bodySize(request->method) < 0) {
+ debugs(88, 3, "clientBuildReplyHeader: can't keep-alive, unknown body size" );
+ request->flags.proxy_keepalive = 0;
+ }
+ else if (fdUsageHigh()&& !request->flags.must_keepalive) {
+ debugs(88, 3, "clientBuildReplyHeader: Not many unused FDs, can't keep-alive");
+ request->flags.proxy_keepalive = 0;
+ }
/* Append VIA */
@@ -1439,12 +1442,17 @@
}
}
+/**
+ * Check state of the current StoreEntry object.
+ * to see if we can determine the final status of the request.
+ */
void
clientReplyContext::identifyFoundObject(StoreEntry *newEntry)
{
StoreEntry *e = newEntry;
HttpRequest *r = http->request;
+ /** \item If the entry received isNull() then we ignore it. */
if (e->isNull()) {
http->storeEntry(NULL);
} else {
@@ -1452,8 +1460,11 @@
}
e = http->storeEntry();
- /* Release IP-cache entries on reload */
+ /* Release IP-cache entries on reload */
+ /** \item If the request has no-cache flag set or some no_cache HACK in operation we
+ * 'invalidate' the cached IP entries for this request ???
+ */
if (r->flags.nocache) {
#if USE_DNSSERVERS
@@ -1492,14 +1503,15 @@
#endif
if (NULL == http->storeEntry()) {
- /* this object isn't in the cache */
- debugs(85, 3, "clientProcessRequest2: storeGet() MISS");
+ /** \item If no StoreEntry object is current assume this object isn't in the cache set MISS*/
+ debugs(85, 3, "clientProcessRequest2: StoreEntry is NULL - MISS");
http->logType = LOG_TCP_MISS;
doGetMoreData();
return;
}
if (Config.onoff.offline) {
+ /** \item If we are running in offline mode set to HIT */
debugs(85, 3, "clientProcessRequest2: offline HIT");
http->logType = LOG_TCP_HIT;
doGetMoreData();
@@ -1507,7 +1519,8 @@
}
if (http->redirect.status) {
- /* force this to be a miss */
+ /** \item If redirection status is True force this to be a MISS */
+ debugs(85, 3, "clientProcessRequest2: redirectStatus forced StoreEntry to NULL - MISS");
http->storeEntry(NULL);
http->logType = LOG_TCP_MISS;
doGetMoreData();
@@ -1619,8 +1632,7 @@
* the method as GET.
*/
http->storeEntry()->createMemObject(http->uri, http->log_uri);
- http->storeEntry()->mem_obj->method =
- http->request->method;
+ http->storeEntry()->mem_obj->method = http->request->method;
}
sc = storeClientListAdd(http->storeEntry(), this);
@@ -1635,9 +1647,9 @@
assert(http->out.size == 0);
assert(http->out.offset == 0);
#if USE_ZPH_QOS
- if (Config.zph_tos_local) {
- debugs(33, 2, "ZPH Local hit, TOS="<getConn()->fd,Config.zph_tos_local);
+ if (Config.zph.tos_local_hit) {
+ debugs(33, 2, "ZPH Local hit, TOS=" << Config.zph.tos_local_hit);
+ comm_set_tos(http->getConn()->fd, Config.zph.tos_local_hit);
}
#endif /* USE_ZPH_QOS */
tempBuffer.offset = reqofs;
@@ -1732,7 +1744,7 @@
void
clientReplyContext::sendBodyTooLargeError()
{
- IPAddress tmp_noaddr;
+ IpAddress tmp_noaddr;
tmp_noaddr.SetNoAddr(); // TODO: make a global const
ErrorState *err = clientBuildError(ERR_TOO_BIG, HTTP_FORBIDDEN, NULL,
http->getConn() != NULL ? http->getConn()->peer : tmp_noaddr,
@@ -1800,7 +1812,7 @@
if (page_id == ERR_NONE)
page_id = ERR_ACCESS_DENIED;
- IPAddress tmp_noaddr;
+ IpAddress tmp_noaddr;
tmp_noaddr.SetNoAddr();
err = clientBuildError(page_id, HTTP_FORBIDDEN, NULL,
http->getConn() != NULL ? http->getConn()->peer : tmp_noaddr,
@@ -1915,13 +1927,14 @@
if (reqofs==0 && !logTypeIsATcpHit(http->logType)) {
assert(fd >= 0); // the beginning of this method implies fd may be -1
int tos = 0;
- if (Config.zph_tos_peer &&
- (http->request->hier.code==SIBLING_HIT ||
- (Config.onoff.zph_tos_parent && http->request->hier.code==PARENT_HIT) ) ) {
- tos = Config.zph_tos_peer;
- debugs(33, 2, "ZPH: Peer hit with hier.code="<request->hier.code<<", TOS="<request->hier.code==SIBLING_HIT ) {
+ tos = Config.zph.tos_sibling_hit;
+ debugs(33, 2, "ZPH: Sibling Peer hit with hier.code=" << http->request->hier.code << ", TOS=" << tos);
+ } else if (Config.zph.tos_parent_hit && http->request->hier.code==PARENT_HIT) {
+ tos = Config.zph.tos_parent_hit;
+ debugs(33, 2, "ZPH: Parent Peer hit with hier.code=" << http->request->hier.code << ", TOS=" << tos);
+ } else if (Config.zph.preserve_miss_tos && Config.zph.preserve_miss_tos_mask) {
+ tos = fd_table[fd].upstreamTOS & Config.zph.preserve_miss_tos_mask;
debugs(33, 2, "ZPH: Preserving TOS on miss, TOS="<src_addr = src_addr;
diff -u -r -N squid-3.1.0.3/src/client_side_reply.h squid-3.1.0.4/src/client_side_reply.h
--- squid-3.1.0.3/src/client_side_reply.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_side_reply.h 2009-01-23 18:37:36.000000000 +1300
@@ -1,8 +1,4 @@
-
/*
- * $Id: client_side_reply.h,v 1.21 2008/02/08 18:31:02 rousskov Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -40,9 +36,9 @@
#include "clientStream.h"
#include "StoreClient.h"
#include "client_side_request.h"
-#include "IPAddress.h"
class ErrorState;
+class IpAddress;
/* XXX make static method */
@@ -76,7 +72,7 @@
int storeOKTransferDone() const;
int storeNotOKTransferDone() const;
- void setReplyToError(err_type, http_status, const HttpRequestMethod&, char const *, IPAddress &, HttpRequest *, char *, AuthUserRequest *);
+ void setReplyToError(err_type, http_status, const HttpRequestMethod&, char const *, IpAddress &, HttpRequest *, char *, AuthUserRequest *);
void createStoreEntry(const HttpRequestMethod& m, request_flags flags);
void removeStoreReference(store_client ** scp, StoreEntry ** ep);
void removeClientStoreReference(store_client **scp, ClientHttpRequest *http);
diff -u -r -N squid-3.1.0.3/src/client_side_request.cc squid-3.1.0.4/src/client_side_request.cc
--- squid-3.1.0.3/src/client_side_request.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/client_side_request.cc 2009-01-23 18:37:36.000000000 +1300
@@ -583,7 +583,7 @@
clientStreamNode *node = (clientStreamNode *)http->client_stream.tail->prev->data;
clientReplyContext *repContext = dynamic_cast(node->data.getRaw());
assert (repContext);
- IPAddress tmpnoaddr;
+ IpAddress tmpnoaddr;
tmpnoaddr.SetNoAddr();
repContext->setReplyToError(page_id, status,
http->request->method, NULL,
@@ -1459,7 +1459,7 @@
// The original author of the code also wanted to pass an errno to
// setReplyToError, but it seems unlikely that the errno reflects the
// true cause of the error at this point, so I did not pass it.
- IPAddress noAddr;
+ IpAddress noAddr;
noAddr.SetNoAddr();
ConnStateData * c = getConn();
repContext->setReplyToError(ERR_ICAP_FAILURE, HTTP_INTERNAL_SERVER_ERROR,
diff -u -r -N squid-3.1.0.3/src/comm.cc squid-3.1.0.4/src/comm.cc
--- squid-3.1.0.3/src/comm.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/comm.cc 2009-01-23 18:37:36.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: comm.cc,v 1.447 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 5 Socket Functions
* AUTHOR: Harvest Derived
*
@@ -21,12 +18,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -47,10 +44,10 @@
#include "pconn.h"
#include "SquidTime.h"
#include "CommCalls.h"
-#include "IPAddress.h"
-#include "IPInterception.h"
#include "DescriptorSet.h"
#include "icmp/net_db.h"
+#include "ip/IpAddress.h"
+#include "ip/IpIntercept.h"
#if defined(_SQUID_CYGWIN_)
#include
@@ -64,9 +61,9 @@
*/
typedef enum {
- IOCB_NONE,
- IOCB_READ,
- IOCB_WRITE
+ IOCB_NONE,
+ IOCB_READ,
+ IOCB_WRITE
} iocb_type;
static void commStopHalfClosedMonitor(int fd);
@@ -74,23 +71,23 @@
struct comm_io_callback_t {
- iocb_type type;
- int fd;
- AsyncCall::Pointer callback;
- char *buf;
- FREE *freefunc;
- int size;
- int offset;
- comm_err_t errcode;
- int xerrno;
+ iocb_type type;
+ int fd;
+ AsyncCall::Pointer callback;
+ char *buf;
+ FREE *freefunc;
+ int size;
+ int offset;
+ comm_err_t errcode;
+ int xerrno;
- bool active() const { return callback != NULL; }
+ bool active() const { return callback != NULL; }
};
struct _comm_fd {
- int fd;
- comm_io_callback_t readcb;
- comm_io_callback_t writecb;
+ int fd;
+ comm_io_callback_t readcb;
+ comm_io_callback_t writecb;
};
typedef struct _comm_fd comm_fd_t;
comm_fd_t *commfd_table;
@@ -99,9 +96,9 @@
bool
commio_has_callback(int fd, iocb_type type, comm_io_callback_t *ccb)
{
- assert(ccb->fd == fd);
- assert(ccb->type == type);
- return ccb->active();
+ assert(ccb->fd == fd);
+ assert(ccb->type == type);
+ return ccb->active();
}
/*
@@ -117,17 +114,17 @@
*/
static void
commio_set_callback(int fd, iocb_type type, comm_io_callback_t *ccb,
- AsyncCall::Pointer &cb, char *buf, FREE *freefunc, int size)
+ AsyncCall::Pointer &cb, char *buf, FREE *freefunc, int size)
{
- assert(!ccb->active());
- assert(ccb->type == type);
- assert(cb != NULL);
- ccb->fd = fd;
- ccb->callback = cb;
- ccb->buf = buf;
- ccb->freefunc = freefunc;
- ccb->size = size;
- ccb->offset = 0;
+ assert(!ccb->active());
+ assert(ccb->type == type);
+ assert(cb != NULL);
+ ccb->fd = fd;
+ ccb->callback = cb;
+ ccb->buf = buf;
+ ccb->freefunc = freefunc;
+ ccb->size = size;
+ ccb->offset = 0;
}
@@ -136,26 +133,26 @@
commio_finish_callback(int fd, comm_io_callback_t *ccb, comm_err_t code, int xerrno)
{
debugs(5, 3, "commio_finish_callback: called for FD " << fd << " (" <<
- code << ", " << xerrno << ")");
- assert(ccb->active());
- assert(ccb->fd == fd);
- ccb->errcode = code;
- ccb->xerrno = xerrno;
-
- comm_io_callback_t cb = *ccb;
-
- /* We've got a copy; blow away the real one */
- /* XXX duplicate code from commio_cancel_callback! */
- ccb->xerrno = 0;
- ccb->callback = NULL; // cb has it
-
- /* free data */
- if (cb.freefunc) {
- cb.freefunc(cb.buf);
- cb.buf = NULL;
- }
+ code << ", " << xerrno << ")");
+ assert(ccb->active());
+ assert(ccb->fd == fd);
+ ccb->errcode = code;
+ ccb->xerrno = xerrno;
+
+ comm_io_callback_t cb = *ccb;
+
+ /* We've got a copy; blow away the real one */
+ /* XXX duplicate code from commio_cancel_callback! */
+ ccb->xerrno = 0;
+ ccb->callback = NULL; // cb has it
+
+ /* free data */
+ if (cb.freefunc) {
+ cb.freefunc(cb.buf);
+ cb.buf = NULL;
+ }
- if (cb.callback != NULL) {
+ if (cb.callback != NULL) {
typedef CommIoCbParams Params;
Params ¶ms = GetCommParams(cb.callback);
params.fd = cb.fd;
@@ -164,7 +161,7 @@
params.flag = cb.errcode;
params.xerrno = cb.xerrno;
ScheduleCallHere(cb.callback);
- }
+ }
}
@@ -178,16 +175,16 @@
commio_cancel_callback(int fd, comm_io_callback_t *ccb)
{
debugs(5, 3, "commio_cancel_callback: called for FD " << fd);
- assert(ccb->fd == fd);
- assert(ccb->active());
+ assert(ccb->fd == fd);
+ assert(ccb->active());
- ccb->xerrno = 0;
- ccb->callback = NULL;
+ ccb->xerrno = 0;
+ ccb->callback = NULL;
}
/*
* Call the given comm callback; assumes the callback is valid.
- *
+ *
* @param ccb io completion callback
*/
void
@@ -209,10 +206,10 @@
// defaults given by client
char *host;
u_short default_port;
- IPAddress default_addr;
+ IpAddress default_addr;
// NP: CANNOT store the default addr:port together as it gets set/reset differently.
- IPAddress S;
+ IpAddress S;
AsyncCall::Pointer callback;
int fd;
@@ -270,8 +267,7 @@
COMM_CB_DERIVED,
} comm_callback_t;
-struct _fd_debug_t
-{
+struct _fd_debug_t {
char const *close_file;
int close_line;
};
@@ -285,7 +281,7 @@
static bool
isOpen(const int fd)
{
- return fd_table[fd].flags.open != 0;
+ return fd_table[fd].flags.open != 0;
}
/**
@@ -298,7 +294,7 @@
commHandleRead(int fd, void *data)
{
comm_io_callback_t *ccb = (comm_io_callback_t *) data;
-
+
assert(data == COMMIO_FD_READCB(fd));
assert(commio_has_callback(fd, IOCB_READ, ccb));
/* Attempt a read */
@@ -310,8 +306,8 @@
if (retval < 0 && !ignoreErrno(errno)) {
debugs(5, 3, "comm_read_try: scheduling COMM_ERROR");
- ccb->offset = 0;
- commio_finish_callback(fd, ccb, COMM_ERROR, errno);
+ ccb->offset = 0;
+ commio_finish_callback(fd, ccb, COMM_ERROR, errno);
return;
};
@@ -319,8 +315,8 @@
/* Note - read 0 == socket EOF, which is a valid read */
if (retval >= 0) {
fd_bytes(fd, retval, FD_READ);
- ccb->offset = retval;
- commio_finish_callback(fd, ccb, COMM_OK, errno);
+ ccb->offset = retval;
+ commio_finish_callback(fd, ccb, COMM_OK, errno);
return;
}
@@ -336,7 +332,7 @@
comm_read(int fd, char *buf, int size, IOCB *handler, void *handler_data)
{
AsyncCall::Pointer call = commCbCall(5,4, "SomeCommReadHandler",
- CommIoCbPtrFun(handler, handler_data));
+ CommIoCbPtrFun(handler, handler_data));
comm_read(fd, buf, size, call);
}
@@ -432,21 +428,21 @@
if (!isOpen(fd)) {
debugs(5, 4, "comm_read_cancel fails: FD " << fd << " closed");
return;
- }
+ }
comm_io_callback_t *cb = COMMIO_FD_READCB(fd);
// TODO: is "active" == "monitors FD"?
if (!cb->active()) {
debugs(5, 4, "comm_read_cancel fails: FD " << fd << " inactive");
return;
- }
+ }
typedef CommCbFunPtrCallT Call;
Call *call = dynamic_cast(cb->callback.getRaw());
if (!call) {
debugs(5, 4, "comm_read_cancel fails: FD " << fd << " lacks callback");
return;
- }
+ }
call->cancel("old comm_read_cancel");
@@ -468,7 +464,7 @@
comm_read_cancel(int fd, AsyncCall::Pointer &callback)
{
callback->cancel("comm_read_cancel");
-
+
if (!isOpen(fd)) {
debugs(5, 4, "comm_read_cancel fails: FD " << fd << " closed");
return;
@@ -483,7 +479,7 @@
AsyncCall::Pointer call = cb->callback;
assert(call != NULL); // XXX: should never fail (active() checks for callback==NULL)
-
+
/* Ok, we can be reasonably sure we won't lose any data here! */
assert(call == callback);
@@ -499,7 +495,7 @@
* synchronous wrapper around udp socket functions
*/
int
-comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IPAddress &from)
+comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IpAddress &from)
{
statCounter.syscalls.sock.recvfroms++;
int x = 0;
@@ -523,7 +519,7 @@
int
comm_udp_recv(int fd, void *buf, size_t len, int flags)
{
- IPAddress nul;
+ IpAddress nul;
return comm_udp_recvfrom(fd, buf, len, flags, nul);
}
@@ -550,7 +546,7 @@
u_short
comm_local_port(int fd)
{
- IPAddress temp;
+ IpAddress temp;
struct addrinfo *addr = NULL;
fde *F = &fd_table[fd];
@@ -608,7 +604,7 @@
int
comm_open(int sock_type,
int proto,
- IPAddress &addr,
+ IpAddress &addr,
int flags,
const char *note)
{
@@ -625,13 +621,13 @@
comm_set_tos(int fd, int tos)
{
#ifdef IP_TOS
- int x = setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(int));
- if (x < 0)
- debugs(50, 1, "comm_set_tos: setsockopt(IP_TOS) on FD " << fd << ": " << xstrerror());
- return x;
+ int x = setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(int));
+ if (x < 0)
+ debugs(50, 1, "comm_set_tos: setsockopt(IP_TOS) on FD " << fd << ": " << xstrerror());
+ return x;
#else
- debugs(50, 0, "WARNING: setsockopt(IP_TOS) not supported on this platform");
- return -1;
+ debugs(50, 0, "WARNING: setsockopt(IP_TOS) not supported on this platform");
+ return -1;
#endif
}
@@ -657,8 +653,7 @@
int tos = 1;
if (setsockopt(fd, SOL_IP, IP_TRANSPARENT, (char *) &tos, sizeof(int)) < 0) {
debugs(50, DBG_IMPORTANT, "comm_open: setsockopt(IP_TRANSPARENT) on FD " << fd << ": " << xstrerror());
- }
- else {
+ } else {
/* mark the socket as having transparent options */
fd_table[fd].flags.transparent = 1;
}
@@ -674,7 +669,7 @@
int
comm_openex(int sock_type,
int proto,
- IPAddress &addr,
+ IpAddress &addr,
int flags,
unsigned char TOS,
const char *note)
@@ -695,8 +690,7 @@
debugs(50, 3, "comm_openex: Attempt open socket for: " << addr );
- if ((new_socket = socket(AI->ai_family, AI->ai_socktype, AI->ai_protocol)) < 0)
- {
+ if ((new_socket = socket(AI->ai_family, AI->ai_socktype, AI->ai_protocol)) < 0) {
/* Increase the number of reserved fd's if calls to socket()
* are failing because the open file table is full. This
* limits the number of simultaneous clients */
@@ -723,7 +717,7 @@
#if IPV6_SPECIAL_SPLITSTACK
- if( addr.IsIPv6() )
+ if ( addr.IsIPv6() )
comm_set_v6only(new_socket, tos);
#endif
@@ -732,7 +726,7 @@
/* Windows Vista supports Dual-Sockets. BUT defaults them to V6ONLY. Turn it OFF. */
/* Other OS may have this administratively disabled for general use. Same deal. */
- if( addr.IsIPv6() )
+ if ( addr.IsIPv6() )
comm_set_v6only(new_socket, 0);
#endif
@@ -761,8 +755,7 @@
if ((flags & COMM_REUSEADDR))
commSetReuseAddr(new_socket);
- if (addr.GetPort() > (u_short) 0)
- {
+ if (addr.GetPort() > (u_short) 0) {
#ifdef _SQUID_MSWIN_
if (sock_type != SOCK_DGRAM)
@@ -775,12 +768,11 @@
}
/* MUST be done before binding or face OS Error: "(99) Cannot assign requested address"... */
- if((flags & COMM_TRANSPARENT)) {
+ if ((flags & COMM_TRANSPARENT)) {
comm_set_transparent(new_socket);
}
- if (!addr.IsNoAddr())
- {
+ if (!addr.IsNoAddr()) {
if (commBind(new_socket, *AI) != COMM_OK) {
comm_close(new_socket);
addr.FreeAddrInfo(AI);
@@ -792,8 +784,7 @@
addr.FreeAddrInfo(AI);
if (flags & COMM_NONBLOCKING)
- if (commSetNonBlocking(new_socket) == COMM_ERROR)
- {
+ if (commSetNonBlocking(new_socket) == COMM_ERROR) {
return -1;
PROF_stop(comm_open);
}
@@ -833,7 +824,7 @@
commConnectStart(int fd, const char *host, u_short port, AsyncCall::Pointer &cb)
{
debugs(cb->debugSection, cb->debugLevel, "commConnectStart: FD " << fd <<
- ", cb " << cb << ", " << host << ":" << port); // TODO: just print *cb
+ ", cb " << cb << ", " << host << ":" << port); // TODO: just print *cb
ConnectStateData *cs;
cs = new ConnectStateData;
@@ -855,7 +846,7 @@
{
debugs(5, 5, "commConnectStart: FD " << fd << ", data " << data << ", " << host << ":" << port);
AsyncCall::Pointer call = commCbCall(5,3,
- "SomeCommConnectHandler", CommConnectCbPtrFun(callback, data));
+ "SomeCommConnectHandler", CommConnectCbPtrFun(callback, data));
commConnectStart(fd, host, port, call);
}
@@ -946,7 +937,7 @@
ConnectStateData::commResetFD()
{
struct addrinfo *AI = NULL;
- IPAddress nul;
+ IpAddress nul;
int new_family = AF_UNSPEC;
// XXX: do we have to check this?
@@ -1007,7 +998,7 @@
*/
/* MUST be done before binding or face OS Error: "(99) Cannot assign requested address"... */
- if( F->flags.transparent ) {
+ if ( F->flags.transparent ) {
comm_set_transparent(fd);
}
@@ -1026,7 +1017,7 @@
#if IPV6_SPECIAL_SPLITSTACK
- if( F->local_addr.IsIPv6() )
+ if ( F->local_addr.IsIPv6() )
comm_set_v6only(fd, F->tos);
#endif
@@ -1160,10 +1151,10 @@
{
AsyncCall::Pointer call;
debugs(5, 3, HERE << "FD " << fd << " timeout " << timeout);
- if(handler != NULL)
- call=commCbCall(5,4, "SomeTimeoutHandler", CommTimeoutCbPtrFun(handler, data));
+ if (handler != NULL)
+ call=commCbCall(5,4, "SomeTimeoutHandler", CommTimeoutCbPtrFun(handler, data));
else
- call = NULL;
+ call = NULL;
return commSetTimeout(fd, timeout, call);
}
@@ -1181,9 +1172,9 @@
F->timeout = 0;
} else {
if (callback != NULL) {
- typedef CommTimeoutCbParams Params;
- Params ¶ms = GetCommParams(callback);
- params.fd = fd;
+ typedef CommTimeoutCbParams Params;
+ Params ¶ms = GetCommParams(callback);
+ params.fd = fd;
F->timeoutHandler = callback;
}
@@ -1195,7 +1186,7 @@
}
int
-comm_connect_addr(int sock, const IPAddress &address)
+comm_connect_addr(int sock, const IpAddress &address)
{
comm_err_t status = COMM_OK;
fde *F = &fd_table[sock];
@@ -1217,7 +1208,7 @@
* trust its handled properly.
*/
#if USE_IPV6
- if(F->sock_family == AF_INET && !address.IsIPv4()) {
+ if (F->sock_family == AF_INET && !address.IsIPv4()) {
return COMM_ERR_PROTOCOL;
}
#endif
@@ -1227,8 +1218,7 @@
/* Establish connection. */
errno = 0;
- if (!F->flags.called_connect)
- {
+ if (!F->flags.called_connect) {
F->flags.called_connect = 1;
statCounter.syscalls.sock.connects++;
@@ -1241,21 +1231,19 @@
errno = EINPROGRESS;
}
- if (x < 0)
- {
+ if (x < 0) {
debugs(5,5, "comm_connect_addr: sock=" << sock << ", addrinfo( " <<
- " flags=" << AI->ai_flags <<
- ", family=" << AI->ai_family <<
- ", socktype=" << AI->ai_socktype <<
- ", protocol=" << AI->ai_protocol <<
- ", &addr=" << AI->ai_addr <<
- ", addrlen=" << AI->ai_addrlen <<
- " )" );
+ " flags=" << AI->ai_flags <<
+ ", family=" << AI->ai_family <<
+ ", socktype=" << AI->ai_socktype <<
+ ", protocol=" << AI->ai_protocol <<
+ ", &addr=" << AI->ai_addr <<
+ ", addrlen=" << AI->ai_addrlen <<
+ " )" );
debugs(5, 9, "connect FD " << sock << ": (" << x << ") " << xstrerror());
debugs(14,9, "connecting to: " << address );
}
- } else
- {
+ } else {
#if defined(_SQUID_NEWSOS6_)
/* Makoto MATSUSHITA */
@@ -1292,18 +1280,18 @@
}
-/* Squid seems to be working fine without this code. With this code,
- * we leak memory on many connect requests because of EINPROGRESS.
- * If you find that this code is needed, please file a bug report. */
+ /* Squid seems to be working fine without this code. With this code,
+ * we leak memory on many connect requests because of EINPROGRESS.
+ * If you find that this code is needed, please file a bug report. */
#if 0
#ifdef _SQUID_LINUX_
/* 2007-11-27:
- * Linux Debian replaces our allocated AI pointer with garbage when
+ * Linux Debian replaces our allocated AI pointer with garbage when
* connect() fails. This leads to segmentation faults deallocating
* the system-allocated memory when we go to clean up our pointer.
* HACK: is to leak the memory returned since we can't deallocate.
*/
- if(errno != 0) {
+ if (errno != 0) {
AI = NULL;
}
#endif
@@ -1319,32 +1307,29 @@
status = COMM_INPROGRESS;
else
#if USE_IPV6
- if( address.IsIPv4() && F->sock_family == AF_INET6 ) {
+ if ( address.IsIPv4() && F->sock_family == AF_INET6 ) {
/* failover to trying IPv4-only link if an IPv6 one fails */
/* to catch the edge case of apps listening on IPv4-localhost */
- F->sock_family = AF_INET;
- int res = comm_connect_addr(sock, address);
+ F->sock_family = AF_INET;
+ int res = comm_connect_addr(sock, address);
- /* if that fails too, undo our temporary socktype hack so the repeat works properly. */
- if(res == COMM_ERROR)
- F->sock_family = AF_INET6;
+ /* if that fails too, undo our temporary socktype hack so the repeat works properly. */
+ if (res == COMM_ERROR)
+ F->sock_family = AF_INET6;
- return res;
- }
- else
+ return res;
+ } else
#endif
- return COMM_ERROR;
+ return COMM_ERROR;
address.NtoA(F->ipaddr, MAX_IPSTRLEN);
F->remote_port = address.GetPort(); /* remote_port is HS */
- if (status == COMM_OK)
- {
+ if (status == COMM_OK) {
debugs(5, 10, "comm_connect_addr: FD " << sock << " connected to " << address);
- } else if (status == COMM_INPROGRESS)
- {
+ } else if (status == COMM_INPROGRESS) {
debugs(5, 10, "comm_connect_addr: FD " << sock << " connection pending");
}
@@ -1368,16 +1353,13 @@
PROF_stop(comm_accept);
- if (ignoreErrno(errno))
- {
+ if (ignoreErrno(errno)) {
debugs(50, 5, "comm_old_accept: FD " << fd << ": " << xstrerror());
return COMM_NOMESSAGE;
- } else if (ENFILE == errno || EMFILE == errno)
- {
+ } else if (ENFILE == errno || EMFILE == errno) {
debugs(50, 3, "comm_old_accept: FD " << fd << ": " << xstrerror());
return COMM_ERROR;
- } else
- {
+ } else {
debugs(50, 1, "comm_old_accept: FD " << fd << ": " << xstrerror());
return COMM_ERROR;
}
@@ -1425,16 +1407,16 @@
while (F->closeHandler != NULL) {
AsyncCall::Pointer call = F->closeHandler;
- F->closeHandler = call->Next();
- call->setNext(NULL);
- // If call is not canceled schedule it for execution else ignore it
- if(!call->canceled()){
- debugs(5, 5, "commCallCloseHandlers: ch->handler=" << call);
- typedef CommCloseCbParams Params;
- Params ¶ms = GetCommParams(call);
- params.fd = fd;
- ScheduleCallHere(call);
- }
+ F->closeHandler = call->Next();
+ call->setNext(NULL);
+ // If call is not canceled schedule it for execution else ignore it
+ if (!call->canceled()) {
+ debugs(5, 5, "commCallCloseHandlers: ch->handler=" << call);
+ typedef CommCloseCbParams Params;
+ Params ¶ms = GetCommParams(call);
+ params.fd = fd;
+ ScheduleCallHere(call);
+ }
}
}
@@ -1502,7 +1484,7 @@
comm_close(fd);
}
-void
+void
comm_close_start(int fd, void *data)
{
#if USE_SSL
@@ -1515,7 +1497,7 @@
}
-void
+void
comm_close_complete(int fd, void *data)
{
#if USE_SSL
@@ -1549,7 +1531,7 @@
* + call read handlers with ERR_CLOSING
* + call closing handlers
*
- * NOTE: COMM_ERR_CLOSING will NOT be called for CommReads' sitting in a
+ * NOTE: COMM_ERR_CLOSING will NOT be called for CommReads' sitting in a
* DeferredReadManager.
*/
void
@@ -1579,7 +1561,7 @@
F->flags.close_request = 1;
AsyncCall::Pointer startCall=commCbCall(5,4, "comm_close_start",
- CommCloseCbPtrFun(comm_close_start, NULL));
+ CommCloseCbPtrFun(comm_close_start, NULL));
typedef CommCloseCbParams Params;
Params &startParams = GetCommParams(startCall);
startParams.fd = fd;
@@ -1607,13 +1589,13 @@
F->pconn.pool->count(F->pconn.uses);
comm_empty_os_read_buffers(fd);
-
+
AsyncCall::Pointer completeCall=commCbCall(5,4, "comm_close_complete",
- CommCloseCbPtrFun(comm_close_complete, NULL));
+ CommCloseCbPtrFun(comm_close_complete, NULL));
Params &completeParams = GetCommParams(completeCall);
completeParams.fd = fd;
- // must use async call to wait for all callbacks
+ // must use async call to wait for all callbacks
// scheduled before comm_close() to finish
ScheduleCallHere(completeCall);
@@ -1623,7 +1605,7 @@
/* Send a udp datagram to specified TO_ADDR. */
int
comm_udp_sendto(int fd,
- const IPAddress &to_addr,
+ const IpAddress &to_addr,
const void *buf,
int len)
{
@@ -1634,7 +1616,7 @@
statCounter.syscalls.sock.sendtos++;
debugs(50, 3, "comm_udp_sendto: Attempt to send UDP packet to " << to_addr <<
- " using FD " << fd << " using Port " << comm_local_port(fd) );
+ " using FD " << fd << " using Port " << comm_local_port(fd) );
/* BUG: something in the above macro appears to occasionally be setting AI to garbage. */
/* AYJ: 2007-08-27 : or was it because I wasn't then setting 'fd_table[fd].sock_family' to fill properly. */
@@ -1668,7 +1650,7 @@
handler << ", data=" << data);
AsyncCall::Pointer call=commCbCall(5,4, "SomeCloseHandler",
- CommCloseCbPtrFun(handler, data));
+ CommCloseCbPtrFun(handler, data));
comm_add_close_handler(fd, call);
}
@@ -1697,7 +1679,7 @@
handler << ", data=" << data);
AsyncCall::Pointer p;
- for (p = fd_table[fd].closeHandler; p != NULL; p = p->Next()){
+ for (p = fd_table[fd].closeHandler; p != NULL; p = p->Next()) {
typedef CommCbFunPtrCallT Call;
const Call *call = dynamic_cast(p.getRaw());
if (!call) // method callbacks have their own comm_remove_close_handler
@@ -1873,30 +1855,29 @@
#endif
void
-commSetTcpKeepalive(int fd, int idle, int interval, int timeout)
-{
+commSetTcpKeepalive(int fd, int idle, int interval, int timeout) {
int on = 1;
#ifdef TCP_KEEPCNT
if (timeout && interval) {
- int count = (timeout + interval - 1) / interval;
- if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(on)) < 0)
- debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
+ int count = (timeout + interval - 1) / interval;
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(on)) < 0)
+ debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
}
#endif
#ifdef TCP_KEEPIDLE
if (idle) {
- if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(on)) < 0)
- debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(on)) < 0)
+ debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
}
#endif
#ifdef TCP_KEEPINTVL
if (interval) {
- if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(on)) < 0)
- debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(on)) < 0)
+ debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
}
#endif
if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, sizeof(on)) < 0)
- debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
+ debugs(5, 1, "commSetKeepalive: FD " << fd << ": " << xstrerror());
}
void
@@ -1911,11 +1892,11 @@
commfd_table = (comm_fd_t *) xcalloc(Squid_MaxFD, sizeof(comm_fd_t));
for (int pos = 0; pos < Squid_MaxFD; pos++) {
- commfd_table[pos].fd = pos;
- commfd_table[pos].readcb.fd = pos;
- commfd_table[pos].readcb.type = IOCB_READ;
- commfd_table[pos].writecb.fd = pos;
- commfd_table[pos].writecb.type = IOCB_WRITE;
+ commfd_table[pos].fd = pos;
+ commfd_table[pos].readcb.fd = pos;
+ commfd_table[pos].readcb.type = IOCB_READ;
+ commfd_table[pos].writecb.fd = pos;
+ commfd_table[pos].writecb.type = IOCB_WRITE;
}
/* XXX account fd_table */
@@ -1937,8 +1918,8 @@
safe_free(fd_table);
safe_free(fdd_table);
if (fdc_table) {
- delete[] fdc_table;
- fdc_table = NULL;
+ delete[] fdc_table;
+ fdc_table = NULL;
}
safe_free(commfd_table);
}
@@ -2013,17 +1994,15 @@
* free_func is used to free the passed buffer when the write has completed.
*/
void
-comm_write(int fd, const char *buf, int size, IOCB * handler, void *handler_data, FREE * free_func)
-{
+comm_write(int fd, const char *buf, int size, IOCB * handler, void *handler_data, FREE * free_func) {
AsyncCall::Pointer call = commCbCall(5,5, "SomeCommWriteHander",
- CommIoCbPtrFun(handler, handler_data));
+ CommIoCbPtrFun(handler, handler_data));
comm_write(fd, buf, size, call, free_func);
}
void
-comm_write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE * free_func)
-{
+comm_write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE * free_func) {
debugs(5, 5, "comm_write: FD " << fd << ": sz " << size << ": asynCall " << callback);
/* Make sure we are open, not closing, and not writing */
@@ -2034,7 +2013,7 @@
/* Queue the write */
commio_set_callback(fd, IOCB_WRITE, ccb, callback,
- (char *)buf, free_func, size);
+ (char *)buf, free_func, size);
commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, ccb, 0);
}
@@ -2105,7 +2084,7 @@
AsyncCall::Pointer callback = F->timeoutHandler;
F->timeoutHandler = NULL;
debugs(5, 5, "commCloseAllSockets: FD " << fd << ": Calling timeout handler");
- ScheduleCallHere(callback);
+ ScheduleCallHere(callback);
} else {
debugs(5, 5, "commCloseAllSockets: FD " << fd << ": calling comm_close()");
comm_close(fd);
@@ -2139,13 +2118,13 @@
if (AlreadyTimedOut(F))
continue;
- debugs(5, 5, "checkTimeouts: FD " << fd << " Expired");
+ debugs(5, 5, "checkTimeouts: FD " << fd << " Expired");
if (F->timeoutHandler != NULL) {
debugs(5, 5, "checkTimeouts: FD " << fd << ": Call timeout handler");
callback = F->timeoutHandler;
F->timeoutHandler = NULL;
- ScheduleCallHere(callback);
+ ScheduleCallHere(callback);
} else {
debugs(5, 5, "checkTimeouts: FD " << fd << ": Forcing comm_close()");
comm_close(fd);
@@ -2171,22 +2150,22 @@
if (Config.accept_filter && strcmp(Config.accept_filter, "none") != 0) {
#ifdef SO_ACCEPTFILTER
- struct accept_filter_arg afa;
- bzero(&afa, sizeof(afa));
- debugs(5, DBG_CRITICAL, "Installing accept filter '" << Config.accept_filter << "' on FD " << sock);
- xstrncpy(afa.af_name, Config.accept_filter, sizeof(afa.af_name));
- x = setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
- if (x < 0)
- debugs(5, 0, "SO_ACCEPTFILTER '" << Config.accept_filter << "': '" << xstrerror());
+ struct accept_filter_arg afa;
+ bzero(&afa, sizeof(afa));
+ debugs(5, DBG_CRITICAL, "Installing accept filter '" << Config.accept_filter << "' on FD " << sock);
+ xstrncpy(afa.af_name, Config.accept_filter, sizeof(afa.af_name));
+ x = setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
+ if (x < 0)
+ debugs(5, 0, "SO_ACCEPTFILTER '" << Config.accept_filter << "': '" << xstrerror());
#elif defined(TCP_DEFER_ACCEPT)
- int seconds = 30;
- if (strncmp(Config.accept_filter, "data=", 5) == 0)
- seconds = atoi(Config.accept_filter + 5);
- x = setsockopt(sock, IPPROTO_TCP, TCP_DEFER_ACCEPT, &seconds, sizeof(seconds));
- if (x < 0)
- debugs(5, 0, "TCP_DEFER_ACCEPT '" << Config.accept_filter << "': '" << xstrerror());
+ int seconds = 30;
+ if (strncmp(Config.accept_filter, "data=", 5) == 0)
+ seconds = atoi(Config.accept_filter + 5);
+ x = setsockopt(sock, IPPROTO_TCP, TCP_DEFER_ACCEPT, &seconds, sizeof(seconds));
+ if (x < 0)
+ debugs(5, 0, "TCP_DEFER_ACCEPT '" << Config.accept_filter << "': '" << xstrerror());
#else
- debugs(5, 0, "accept_filter not supported on your OS");
+ debugs(5, 0, "accept_filter not supported on your OS");
#endif
}
@@ -2199,7 +2178,7 @@
assert(isOpen(fd));
AsyncCall::Pointer call = commCbCall(5,5, "SomeCommAcceptHandler",
- CommAcceptCbPtrFun(handler, handler_data));
+ CommAcceptCbPtrFun(handler, handler_data));
fdc_table[fd].subscribe(call);
}
@@ -2207,11 +2186,11 @@
comm_accept(int fd, AsyncCall::Pointer &call) {
debugs(5, 5, "comm_accept: FD " << fd << " AsyncCall: " << call);
assert(isOpen(fd));
-
+
fdc_table[fd].subscribe(call);
}
-// Called when somebody wants to be notified when our socket accepts new
+// Called when somebody wants to be notified when our socket accepts new
// connection. We do not probe the FD until there is such interest.
void
AcceptFD::subscribe(AsyncCall::Pointer &call) {
@@ -2235,7 +2214,7 @@
// When we are running out of FDs, there is often no callback.
if (!theCallback) {
debugs(5, 5, "AcceptFD::acceptOne orphaned: FD " << fd);
- // XXX: can we remove this and similar "just in case" calls and
+ // XXX: can we remove this and similar "just in case" calls and
// either listen always or listen only when there is a callback?
if (!AcceptLimiter::Instance().deferring())
commSetSelect(fd, COMM_SELECT_READ, comm_accept_try, NULL, 0);
@@ -2260,7 +2239,7 @@
if (newfd == COMM_NOMESSAGE) {
/* register interest again */
debugs(5, 5, HERE << "try later: FD " << fd <<
- " handler: " << *theCallback);
+ " handler: " << *theCallback);
commSetSelect(fd, COMM_SELECT_READ, comm_accept_try, NULL, 0);
return false;
}
@@ -2272,8 +2251,8 @@
assert(theCallback != NULL);
debugs(5, 5, "AcceptFD::acceptOne accepted: FD " << fd <<
- " newfd: " << newfd << " from: " << connDetails.peer <<
- " handler: " << *theCallback);
+ " newfd: " << newfd << " from: " << connDetails.peer <<
+ " handler: " << *theCallback);
notify(newfd, COMM_OK, 0, connDetails);
return true;
}
@@ -2284,8 +2263,7 @@
}
void
-AcceptFD::notify(int newfd, comm_err_t errcode, int xerrno, const ConnectionDetail &connDetails)
-{
+AcceptFD::notify(int newfd, comm_err_t errcode, int xerrno, const ConnectionDetail &connDetails) {
if (theCallback != NULL) {
typedef CommAcceptCbParams Params;
Params ¶ms = GetCommParams(theCallback);
@@ -2312,7 +2290,7 @@
void CommIO::Initialise() {
/* Initialize done pipe signal */
int DonePipe[2];
- if(pipe(DonePipe)) {}
+ if (pipe(DonePipe)) {}
DoneFD = DonePipe[1];
DoneReadFD = DonePipe[0];
fd_open(DoneReadFD, FD_PIPE, "async-io completetion event: main");
@@ -2392,8 +2370,8 @@
comm_accept (temp.acceptFD, temp.theFunction, temp.theData);
}
-/// Start waiting for a possibly half-closed connection to close
-// by scheduling a read callback to a monitoring handler that
+/// Start waiting for a possibly half-closed connection to close
+// by scheduling a read callback to a monitoring handler that
// will close the connection on read errors.
void
commStartHalfClosedMonitor(int fd) {
@@ -2406,8 +2384,7 @@
static
void
-commPlanHalfClosedCheck()
-{
+commPlanHalfClosedCheck() {
if (!WillCheckHalfClosed && !TheHalfClosed->empty()) {
eventAdd("commHalfClosedCheck", &commHalfClosedCheck, NULL, 1.0, 1);
WillCheckHalfClosed = true;
@@ -2427,7 +2404,7 @@
const int fd = *i;
if (!fd_table[fd].halfClosedReader) { // not reading already
AsyncCall::Pointer call = commCbCall(5,4, "commHalfClosedReader",
- CommIoCbPtrFun(&commHalfClosedReader, NULL));
+ CommIoCbPtrFun(&commHalfClosedReader, NULL));
comm_read(fd, NULL, 0, call);
fd_table[fd].halfClosedReader = call;
}
@@ -2462,7 +2439,7 @@
static void
commHalfClosedReader(int fd, char *, size_t size, comm_err_t flag, int, void *) {
// there cannot be more data coming in on half-closed connections
- assert(size == 0);
+ assert(size == 0);
assert(commHasHalfClosedMonitor(fd)); // or we would have canceled the read
fd_table[fd].halfClosedReader = NULL; // done reading, for now
@@ -2508,12 +2485,12 @@
debugs(5, 3, "Adding deferred read on FD " << aRead.theRead.fd);
CbDataList *temp = deferredReads.push_back(aRead);
- // We have to use a global function as a closer and point to temp
+ // We have to use a global function as a closer and point to temp
// instead of "this" because DeferredReadManager is not a job and
// is not even cbdata protected
AsyncCall::Pointer closer = commCbCall(5,4,
- "DeferredReadManager::CloseHandler",
- CommCloseCbPtrFun(&CloseHandler, temp));
+ "DeferredReadManager::CloseHandler",
+ CommCloseCbPtrFun(&CloseHandler, temp));
comm_add_close_handler(aRead.theRead.fd, closer);
temp->element.closer = closer; // remeber so that we can cancel
}
diff -u -r -N squid-3.1.0.3/src/comm.h squid-3.1.0.4/src/comm.h
--- squid-3.1.0.3/src/comm.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/comm.h 2009-01-23 18:37:36.000000000 +1300
@@ -6,7 +6,7 @@
#include "AsyncCall.h"
#include "StoreIOBuffer.h"
#include "Array.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#define COMMIO_FD_READCB(fd) (&commfd_table[(fd)].readcb)
#define COMMIO_FD_WRITECB(fd) (&commfd_table[(fd)].writecb)
@@ -49,20 +49,20 @@
SQUIDCEXTERN void commConnectStart(int fd, const char *, u_short, CNCB *, void *);
void commConnectStart(int fd, const char *, u_short, AsyncCall::Pointer &cb);
-SQUIDCEXTERN int comm_connect_addr(int sock, const IPAddress &addr);
+SQUIDCEXTERN int comm_connect_addr(int sock, const IpAddress &addr);
SQUIDCEXTERN void comm_init(void);
SQUIDCEXTERN void comm_exit(void);
-SQUIDCEXTERN int comm_open(int, int, IPAddress &, int, const char *note);
+SQUIDCEXTERN int comm_open(int, int, IpAddress &, int, const char *note);
-SQUIDCEXTERN int comm_openex(int, int, IPAddress &, int, unsigned char TOS, const char *);
+SQUIDCEXTERN int comm_openex(int, int, IpAddress &, int, unsigned char TOS, const char *);
SQUIDCEXTERN u_short comm_local_port(int fd);
SQUIDCEXTERN int comm_set_tos(int fd, int tos);
SQUIDCEXTERN void commSetSelect(int, unsigned int, PF *, void *, time_t);
SQUIDCEXTERN void commResetSelect(int);
-SQUIDCEXTERN int comm_udp_sendto(int sock, const IPAddress &to, const void *buf, int buflen);
+SQUIDCEXTERN int comm_udp_sendto(int sock, const IpAddress &to, const void *buf, int buflen);
extern void comm_write(int fd, const char *buf, int len, IOCB *callback, void *callback_data, FREE *func);
extern void comm_write(int fd, const char *buf, int size, AsyncCall::Pointer &callback, FREE * free_func = NULL);
SQUIDCEXTERN void comm_write_mbuf(int fd, MemBuf *mb, IOCB * handler, void *handler_data);
@@ -98,7 +98,7 @@
extern void comm_read(int fd, char *buf, int len, AsyncCall::Pointer &callback);
extern void comm_read_cancel(int fd, IOCB *callback, void *data);
extern void comm_read_cancel(int fd, AsyncCall::Pointer &callback);
-extern int comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IPAddress &from);
+extern int comm_udp_recvfrom(int fd, void *buf, size_t len, int flags, IpAddress &from);
extern int comm_udp_recv(int fd, void *buf, size_t len, int flags);
extern ssize_t comm_udp_send(int s, const void *buf, size_t len, int flags);
extern bool comm_has_incomplete_write(int);
diff -u -r -N squid-3.1.0.3/src/CompositePoolNode.h squid-3.1.0.4/src/CompositePoolNode.h
--- squid-3.1.0.3/src/CompositePoolNode.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/CompositePoolNode.h 2009-01-23 18:37:35.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: CompositePoolNode.h,v 1.10 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 77 Delay Pools
* AUTHOR: Robert Collins
* Based upon original delay pools code by
@@ -46,7 +44,7 @@
#include "DelayPools.h"
#include "DelayIdComposite.h"
#include "CommRead.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
class StoreEntry;
@@ -78,7 +76,7 @@
public:
CompositeSelectionDetails() {}
- IPAddress src_addr;
+ IpAddress src_addr;
AuthUserRequest *user;
String tag;
};
@@ -88,5 +86,5 @@
DeferredReadManager deferredReads;
};
-#endif
+#endif /* DELAY_POOLS */
#endif /* COMPOSITEPOOLNODE_H */
diff -u -r -N squid-3.1.0.3/src/ConnectionDetail.h squid-3.1.0.4/src/ConnectionDetail.h
--- squid-3.1.0.3/src/ConnectionDetail.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ConnectionDetail.h 2009-01-23 18:37:35.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: ConnectionDetail.h,v 1.4 2007/12/14 23:11:45 amosjeffries Exp $
- *
* DEBUG: section 5 Socket Functions
* AUTHOR: Robert Collins
*
@@ -37,7 +35,7 @@
#ifndef _SQUIDCONNECTIONDETAIL_H_
#define _SQUIDCONNECTIONDETAIL_H_
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
class ConnectionDetail
{
@@ -46,9 +44,9 @@
ConnectionDetail();
- IPAddress me;
+ IpAddress me;
- IPAddress peer;
+ IpAddress peer;
};
#endif
diff -u -r -N squid-3.1.0.3/src/delay_pools.cc squid-3.1.0.4/src/delay_pools.cc
--- squid-3.1.0.3/src/delay_pools.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/delay_pools.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: delay_pools.cc,v 1.51 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 77 Delay Pools
* AUTHOR: Robert Collins
* Based upon original delay pools code by
@@ -66,7 +64,7 @@
#include "DelayBucket.h"
#include "DelayUser.h"
#include "DelayTagged.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/// \ingroup DelayPoolsInternal
long DelayPools::MemoryUsed = 0;
@@ -161,7 +159,7 @@
virtual char const *label() const = 0;
- virtual unsigned int makeKey (IPAddress &src_addr) const = 0;
+ virtual unsigned int makeKey (IpAddress &src_addr) const = 0;
DelaySpec spec;
@@ -193,7 +191,7 @@
protected:
virtual char const *label() const {return "Individual";}
- virtual unsigned int makeKey (IPAddress &src_addr) const;
+ virtual unsigned int makeKey (IpAddress &src_addr) const;
};
@@ -208,7 +206,7 @@
protected:
virtual char const *label() const {return "Network";}
- virtual unsigned int makeKey (IPAddress &src_addr) const;
+ virtual unsigned int makeKey (IpAddress &src_addr) const;
};
/* don't use remote storage for these */
@@ -252,9 +250,9 @@
virtual char const *label() const {return "Individual";}
- virtual unsigned int makeKey (IPAddress &src_addr) const;
+ virtual unsigned int makeKey (IpAddress &src_addr) const;
- unsigned char makeHostKey (IPAddress &src_addr) const;
+ unsigned char makeHostKey (IpAddress &src_addr) const;
DelaySpec spec;
VectorMap buckets;
@@ -861,7 +859,7 @@
}
unsigned int
-IndividualPool::makeKey (IPAddress &src_addr) const
+IndividualPool::makeKey (IpAddress &src_addr) const
{
/* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
if ( !src_addr.IsIPv4() )
@@ -888,7 +886,7 @@
}
unsigned int
-ClassCNetPool::makeKey (IPAddress &src_addr) const
+ClassCNetPool::makeKey (IpAddress &src_addr) const
{
/* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
if ( !src_addr.IsIPv4() )
@@ -962,7 +960,7 @@
}
unsigned char
-ClassCHostPool::makeHostKey (IPAddress &src_addr) const
+ClassCHostPool::makeHostKey (IpAddress &src_addr) const
{
/* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
if ( !src_addr.IsIPv4() )
@@ -975,7 +973,7 @@
}
unsigned int
-ClassCHostPool::makeKey (IPAddress &src_addr) const
+ClassCHostPool::makeKey (IpAddress &src_addr) const
{
/* FIXME INET6 : IPv6 requires a 64-128 bit result from this function */
if ( !src_addr.IsIPv4() )
diff -u -r -N squid-3.1.0.3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc squid-3.1.0.4/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
--- squid-3.1.0.3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc 2009-01-23 18:37:35.000000000 +1300
@@ -157,7 +157,7 @@
char skey1[32];
char skey2[32];
char skey3[32];
- IPAddress localhost;
+ IpAddress localhost;
ikey = (getpid() << 10) + (instanceID << 2);
ikey &= 0x7fffffff;
diff -u -r -N squid-3.1.0.3/src/DiskIO/DiskIOModules_gen.cc squid-3.1.0.4/src/DiskIO/DiskIOModules_gen.cc
--- squid-3.1.0.3/src/DiskIO/DiskIOModules_gen.cc 2008-12-05 16:11:09.000000000 +1300
+++ squid-3.1.0.4/src/DiskIO/DiskIOModules_gen.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,11 +0,0 @@
-/* automatically generated by ./DiskIO/modules.sh Blocking
- * do not edit
- */
-#include "squid.h"
-#include "DiskIO/DiskIOModule.h"
-#include "DiskIO/Blocking/BlockingDiskIOModule.h"
-
-void DiskIOModule::PokeAllModules(void)
-{
- BlockingDiskIOModule::GetInstance();
-}
diff -u -r -N squid-3.1.0.3/src/dns_internal.cc squid-3.1.0.4/src/dns_internal.cc
--- squid-3.1.0.3/src/dns_internal.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/dns_internal.cc 2009-01-23 18:37:37.000000000 +1300
@@ -133,7 +133,7 @@
};
struct _ns {
- IPAddress S;
+ IpAddress S;
int nqueries;
int nreplies;
nsvc *vc;
@@ -176,7 +176,7 @@
static IOCB idnsReadVCHeader;
static void idnsDoSendQueryVC(nsvc *vc);
-static int idnsFromKnownNameserver(IPAddress const &from);
+static int idnsFromKnownNameserver(IpAddress const &from);
static idns_query *idnsFindQuery(unsigned short id);
static void idnsGrokReply(const char *buf, size_t sz);
static PF idnsRead;
@@ -187,7 +187,7 @@
static void
idnsAddNameserver(const char *buf)
{
- IPAddress A;
+ IpAddress A;
if (!(A = buf)) {
debugs(78, 0, "WARNING: rejecting '" << buf << "' as a name server, because it is not a numeric IP address");
@@ -744,7 +744,7 @@
nameservers[ns].vc = vc;
vc->ns = ns;
- IPAddress addr;
+ IpAddress addr;
if (!Config.Addrs.udp_outgoing.IsNoAddr())
addr = Config.Addrs.udp_outgoing;
@@ -848,7 +848,7 @@
}
static int
-idnsFromKnownNameserver(IPAddress const &from)
+idnsFromKnownNameserver(IpAddress const &from)
{
int i;
@@ -1124,7 +1124,7 @@
int max = INCOMING_DNS_MAX;
static char rbuf[SQUID_UDP_SO_RCVBUF];
int ns;
- IPAddress from;
+ IpAddress from;
debugs(78, 3, "idnsRead: starting with FD " << fd);
@@ -1135,7 +1135,7 @@
* The cause of this is still unknown, however copying the data appears
* to allow it to be passed further without this erasure.
*/
- IPAddress bugbypass;
+ IpAddress bugbypass;
while (max--) {
len = comm_udp_recvfrom(fd, rbuf, SQUID_UDP_SO_RCVBUF, 0, bugbypass);
@@ -1339,7 +1339,7 @@
if (DnsSocket < 0) {
int port;
- IPAddress addr;
+ IpAddress addr;
if (!Config.Addrs.udp_outgoing.IsNoAddr())
addr = Config.Addrs.udp_outgoing;
@@ -1520,7 +1520,7 @@
}
void
-idnsPTRLookup(const IPAddress &addr, IDNSCB * callback, void *data)
+idnsPTRLookup(const IpAddress &addr, IDNSCB * callback, void *data)
{
idns_query *q;
diff -u -r -N squid-3.1.0.3/src/dnsserver.cc squid-3.1.0.4/src/dnsserver.cc
--- squid-3.1.0.3/src/dnsserver.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/dnsserver.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: dnsserver.cc,v 1.74 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 0 DNS Resolver
* AUTHOR: Harvest Derived
*
@@ -166,7 +163,7 @@
\endverbatim
*/
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#if LIBRESOLV_DNS_TTL_HACK
/// \ingroup dnsserver
@@ -195,7 +192,7 @@
int ttl = 0;
int retry = 0;
unsigned int i = 0;
- IPAddress ipa;
+ IpAddress ipa;
char ntoabuf[MAX_IPSTRLEN];
struct addrinfo hints;
struct addrinfo *AI = NULL;
@@ -392,7 +389,7 @@
#endif
#if HAVE_RES_INIT
- IPAddress ipa;
+ IpAddress ipa;
int opt_s = 0;
#ifdef _SQUID_RES_NSADDR_LIST
diff -u -r -N squid-3.1.0.3/src/errorpage.cc squid-3.1.0.4/src/errorpage.cc
--- squid-3.1.0.3/src/errorpage.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/errorpage.cc 2009-01-23 18:37:37.000000000 +1300
@@ -21,12 +21,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -71,8 +71,7 @@
/* local types */
/// \ingroup ErrorPageInternal
-typedef struct
-{
+typedef struct {
int id;
char *page_name;
} ErrorDynamicPageInfo;
@@ -85,28 +84,27 @@
\note hard coded error messages are not appended with %S
* automagically to give you more control on the format
*/
-static const struct
-{
+static const struct {
int type; /* and page_id */
const char *text;
}
error_hard_text[] = {
- {
- ERR_SQUID_SIGNATURE,
- "\n
\n"
- "
\n"
- "\n"
- "\n"
- },
- {
- TCP_RESET,
- "reset"
- }
- };
+ {
+ ERR_SQUID_SIGNATURE,
+ "\n
\n"
+ "
\n"
+ "\n"
+ "\n"
+ },
+ {
+ TCP_RESET,
+ "reset"
+ }
+};
/// \ingroup ErrorPageInternal
static Vector ErrorDynamicPages;
@@ -189,9 +187,9 @@
error_stylesheet.reset();
// look for and load stylesheet into global MemBuf for it.
- if(Config.errorStylesheet) {
+ if (Config.errorStylesheet) {
char *temp = errorTryLoadText(Config.errorStylesheet,NULL);
- if(temp) {
+ if (temp) {
error_stylesheet.Printf("%s",temp);
safe_free(temp);
}
@@ -243,16 +241,16 @@
char *text = NULL;
/** test error_directory configured location */
- if(Config.errorDirectory)
+ if (Config.errorDirectory)
text = errorTryLoadText(page_name, Config.errorDirectory);
#if USE_ERR_LOCALES
/** test error_default_language location */
- if(!text && Config.errorDefaultLanguage) {
+ if (!text && Config.errorDefaultLanguage) {
char dir[256];
snprintf(dir,256,"%s/%s", DEFAULT_SQUID_ERROR_DIR, Config.errorDefaultLanguage);
text = errorTryLoadText(page_name, dir);
- if(!text) {
+ if (!text) {
debugs(1, DBG_CRITICAL, "Unable to load default error language files. Reset to backups.");
}
}
@@ -282,7 +280,7 @@
MemBuf textbuf;
// maybe received compound parts, maybe an absolute page_name and no dir
- if(dir)
+ if (dir)
snprintf(path, sizeof(path), "%s/%s", dir, page_name);
else
snprintf(path, sizeof(path), "%s", page_name);
@@ -291,14 +289,14 @@
if (fd < 0) {
/* with dynamic locale negotiation we may see some failures before a success. */
- if(!silent)
+ if (!silent)
debugs(4, DBG_CRITICAL, HERE << "'" << path << "': " << xstrerror());
return NULL;
}
textbuf.init();
- while((len = FD_READ_METHOD(fd, buf, sizeof(buf))) > 0) {
+ while ((len = FD_READ_METHOD(fd, buf, sizeof(buf))) > 0) {
textbuf.append(buf, len);
}
@@ -506,7 +504,7 @@
AUTHUSERREQUESTUNLOCK(err->auth_user_request, "errstate");
safe_free(err->err_msg);
#if USE_ERR_LOCALES
- if(err->err_language != Config.errorDefaultLanguage)
+ if (err->err_language != Config.errorDefaultLanguage)
#endif
safe_free(err->err_language);
cbdataFree(err);
@@ -885,22 +883,21 @@
* We have even better reasons though:
* see http://wiki.squid-cache.org/KnowledgeBase/VaryNotCaching
*/
- if(!Config.errorDirectory) {
+ if (!Config.errorDirectory) {
/* We 'negotiated' this ONLY from the Accept-Language. */
rep->header.delById(HDR_VARY);
rep->header.putStr(HDR_VARY, "Accept-Language");
}
/* add the Content-Language header according to RFC section 14.12 */
- if(err_language) {
+ if (err_language) {
rep->header.putStr(HDR_CONTENT_LANGUAGE, err_language);
- }
- else
+ } else
#endif /* USE_ERROR_LOCALES */
{
/* default templates are in English */
/* language is known unless error_directory override used */
- if(!Config.errorDirectory)
+ if (!Config.errorDirectory)
rep->header.putStr(HDR_CONTENT_LANGUAGE, "en");
}
@@ -929,7 +926,7 @@
/** error_directory option in squid.conf overrides translations.
* Otherwise locate the Accept-Language header
*/
- if(!Config.errorDirectory && request && request->header.getList(HDR_ACCEPT_LANGUAGE, &hdr) ) {
+ if (!Config.errorDirectory && request && request->header.getList(HDR_ACCEPT_LANGUAGE, &hdr) ) {
const char *buf = hdr.buf(); // raw header string for parsing
int pos = 0; // current parsing position in header string
@@ -944,16 +941,16 @@
debugs(4, 6, HERE << "Testing Header: '" << hdr << "'");
- while( pos < hdr.size() ) {
+ while ( pos < hdr.size() ) {
-/*
- * Header value format:
- * - sequence of whitespace delimited tags
- * - each tag may suffix with ';'.* which we can ignore.
- * - IFF a tag contains only two characters we can wildcard ANY translations matching: '-'? .*
- * with preference given to an exact match.
- */
- while(pos < hdr.size() && buf[pos] != ';' && buf[pos] != ',' && !xisspace(buf[pos]) && dt < (dir+256) ) {
+ /*
+ * Header value format:
+ * - sequence of whitespace delimited tags
+ * - each tag may suffix with ';'.* which we can ignore.
+ * - IFF a tag contains only two characters we can wildcard ANY translations matching: '-'? .*
+ * with preference given to an exact match.
+ */
+ while (pos < hdr.size() && buf[pos] != ';' && buf[pos] != ',' && !xisspace(buf[pos]) && dt < (dir+256) ) {
*dt++ = xtolower(buf[pos++]);
}
*dt++ = '\0'; // nul-terminated the filename content string before system use.
@@ -961,22 +958,21 @@
debugs(4, 9, HERE << "STATE: dt='" << dt << "', reset='" << reset << "', reset[1]='" << reset[1] << "', pos=" << pos << ", buf='" << &buf[pos] << "'");
/* if we found anything we might use, try it. */
- if(*reset != '\0') {
+ if (*reset != '\0') {
debugs(4, 6, HERE << "Found language '" << reset << "', testing for available template in: '" << dir << "'");
m = errorTryLoadText( err_type_str[page_id], dir, false);
- if(m) {
+ if (m) {
/* store the language we found for the Content-Language reply header */
err_language = xstrdup(reset);
break;
- }
- else if(Config.errorLogMissingLanguages) {
+ } else if (Config.errorLogMissingLanguages) {
debugs(4, DBG_IMPORTANT, "WARNING: Error Pages Missing Language: " << reset);
}
#if HAVE_GLOB
- if( (dt - reset) == 2) {
+ if ( (dt - reset) == 2) {
/* TODO glob the error directory for sub-dirs matching: '-*' */
/* use first result. */
debugs(4,2, HERE << "wildcard fallback errors not coded yet.");
@@ -987,8 +983,8 @@
dt = reset; // reset for next tag testing. we replace the failed name instead of cloning.
// IFF we terminated the tag on ';' we need to skip the 'q=' bit to the next ',' or end.
- while(pos < hdr.size() && buf[pos] != ',') pos++;
- if(buf[pos] == ',') pos++;
+ while (pos < hdr.size() && buf[pos] != ',') pos++;
+ if (buf[pos] == ',') pos++;
}
}
#endif /* USE_ERR_LOCALES */
@@ -997,10 +993,10 @@
* If client-specific error templates are not enabled or available.
* fall back to the old style squid.conf settings.
*/
- if(!m) {
+ if (!m) {
m = error_text[page_id];
#if USE_ERR_LOCALES
- if(!Config.errorDirectory)
+ if (!Config.errorDirectory)
err_language = Config.errorDefaultLanguage;
#endif
debugs(4, 2, HERE << "No existing error page language negotiated for " << errorPageName(page_id) << ". Using default error file.");
diff -u -r -N squid-3.1.0.3/src/errorpage.h squid-3.1.0.4/src/errorpage.h
--- squid-3.1.0.3/src/errorpage.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/errorpage.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: errorpage.h,v 1.6 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 4 Error Generation
* AUTHOR: Duane Wessels
*
@@ -38,7 +36,7 @@
#include "squid.h"
#include "cbdata.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/**
\defgroup ErrorPageAPI Error Pages API
@@ -125,7 +123,7 @@
char *dnsserver_msg;
time_t ttl;
- IPAddress src_addr;
+ IpAddress src_addr;
char *redirect_url;
ERCB *callback;
void *callback_data;
diff -u -r -N squid-3.1.0.3/src/ESI.cc squid-3.1.0.4/src/ESI.cc
--- squid-3.1.0.3/src/ESI.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/ESI.cc 2009-01-23 18:37:35.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: ESI.cc,v 1.30 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 86 ESI processing
* AUTHOR: Robert Collins
*
@@ -59,7 +56,7 @@
#include "ESIExpression.h"
#include "HttpRequest.h"
#include "MemBuf.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/* quick reference on behaviour here.
* The ESI specification 1.0 requires the ESI processor to be able to
@@ -1435,7 +1432,7 @@
/* don't touch incoming, it's a pointer into buffered anyway */
}
-extern ErrorState *clientBuildError (err_type, http_status, char const *, IPAddress &, HttpRequest *);
+extern ErrorState *clientBuildError (err_type, http_status, char const *, IpAddress &, HttpRequest *);
/* This can ONLY be used before we have sent *any* data to the client */
diff -u -r -N squid-3.1.0.3/src/external_acl.cc squid-3.1.0.4/src/external_acl.cc
--- squid-3.1.0.3/src/external_acl.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/external_acl.cc 2009-01-23 18:37:37.000000000 +1300
@@ -128,7 +128,7 @@
QUOTE_METHOD_URL
} quote;
- IPAddress local_addr;
+ IpAddress local_addr;
};
struct _external_acl_format {
diff -u -r -N squid-3.1.0.3/src/fde.h squid-3.1.0.4/src/fde.h
--- squid-3.1.0.3/src/fde.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/fde.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,8 +1,4 @@
-
/*
- * $Id: fde.h,v 1.15 2008/02/12 23:22:13 rousskov Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -19,12 +15,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -35,7 +31,7 @@
#define SQUID_FDE_H
#include "comm.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
class PconnPool;
@@ -44,7 +40,7 @@
public:
fde() { clear(); };
-
+
/// True if comm_close for this fd has been called
bool closing() { return flags.close_request; }
@@ -59,26 +55,25 @@
unsigned int type;
u_short remote_port;
- IPAddress local_addr;
+ IpAddress local_addr;
unsigned char tos;
int sock_family;
char ipaddr[MAX_IPSTRLEN]; /* dotted decimal address of peer */
char desc[FD_DESC_SZ];
- struct
- {
- unsigned int open:1;
- unsigned int close_request:1; // file_ or comm_close has been called
- unsigned int write_daemon:1;
- unsigned int socket_eof:1;
- unsigned int nolinger:1;
- unsigned int nonblocking:1;
- unsigned int ipc:1;
- unsigned int called_connect:1;
- unsigned int nodelay:1;
- unsigned int close_on_exec:1;
- unsigned int read_pending:1;
- unsigned int write_pending:1;
+ struct {
+ unsigned int open:1;
+ unsigned int close_request:1; // file_ or comm_close has been called
+ unsigned int write_daemon:1;
+ unsigned int socket_eof:1;
+ unsigned int nolinger:1;
+ unsigned int nonblocking:1;
+ unsigned int ipc:1;
+ unsigned int called_connect:1;
+ unsigned int nodelay:1;
+ unsigned int close_on_exec:1;
+ unsigned int read_pending:1;
+ unsigned int write_pending:1;
unsigned int transparent:1;
} flags;
@@ -109,7 +104,7 @@
SSL *ssl;
#endif
#ifdef _SQUID_MSWIN_
- struct {
+ struct {
long handle;
} win32;
#endif
@@ -125,9 +120,9 @@
halfClosedReader = NULL;
// XXX: the following memset may corrupt or leak new or changed members
memset(this, 0, sizeof(fde));
- local_addr.SetEmpty(); // IPAddress likes to be setup nicely.
+ local_addr.SetEmpty(); // IpAddress likes to be setup nicely.
}
-
+
};
#endif /* SQUID_FDE_H */
diff -u -r -N squid-3.1.0.3/src/forward.cc squid-3.1.0.4/src/forward.cc
--- squid-3.1.0.3/src/forward.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/forward.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: forward.cc,v 1.175 2008/02/11 22:26:39 rousskov Exp $
- *
* DEBUG: section 17 Request Forwarding
* AUTHOR: Duane Wessels
*
@@ -49,7 +46,7 @@
#include "SquidTime.h"
#include "Store.h"
#include "icmp/net_db.h"
-#include "IPInterception.h"
+#include "ip/IpIntercept.h"
static PSC fwdStartCompleteWrapper;
static PF fwdServerClosedWrapper;
@@ -269,7 +266,6 @@
* then we need the client source protocol, address and port */
if (request->flags.spoof_client_ip) {
fwd->src = request->client_addr;
- // AYJ: do we need to pass on the transparent flag also?
}
fwd->start(fwd);
@@ -336,11 +332,8 @@
startComplete(servers);
} else {
debugs(17, 3, "fwdComplete: server FD " << server_fd << " not re-forwarding status " << entry->getReply()->sline.status);
- if (entry->isEmpty() && !err)
- {
- EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
- entry->complete();
- }
+ EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
+ entry->complete();
if (server_fd < 0)
completed();
@@ -772,29 +765,21 @@
FwdServer *fs = servers;
const char *host;
unsigned short port;
- const char *domain = NULL;
int ctimeout;
int ftimeout = Config.Timeout.forward - (squid_curtime - start_t);
- IPAddress outgoing;
+ IpAddress outgoing;
unsigned short tos;
- IPAddress client_addr;
+ IpAddress client_addr;
assert(fs);
assert(server_fd == -1);
debugs(17, 3, "fwdConnectStart: " << url);
if (fs->_peer) {
- host = fs->_peer->host;
- port = fs->_peer->http_port;
ctimeout = fs->_peer->connect_timeout > 0 ? fs->_peer->connect_timeout
: Config.Timeout.peer_connect;
-
- if (fs->_peer->options.originserver)
- domain = request->GetHost();
} else {
- host = request->GetHost();
- port = request->port;
ctimeout = Config.Timeout.connect;
}
@@ -836,7 +821,16 @@
return;
}
- fd = fwdPconnPool->pop(host, port, domain, client_addr, checkRetriable());
+ if(fs->_peer) {
+ host = fs->_peer->host;
+ port = fs->_peer->http_port;
+ fd = fwdPconnPool->pop(fs->_peer->name, fs->_peer->http_port, request->GetHost(), client_addr, checkRetriable());
+ }
+ else {
+ host = request->GetHost();
+ port = request->port;
+ fd = fwdPconnPool->pop(host, port, NULL, client_addr, checkRetriable());
+ }
if (fd >= 0) {
debugs(17, 3, "fwdConnectStart: reusing pconn FD " << fd);
server_fd = fd;
@@ -908,7 +902,7 @@
if (!fs->_peer && request->flags.spoof_client_ip) {
// try to set the outgoing address using TPROXY v2
// if it fails we abort any further TPROXY actions on this connection
- if (IPInterceptor.SetTproxy2OutgoingAddr(int fd, const IPAddress &src) == -1) {
+ if (IpInterceptor.SetTproxy2OutgoingAddr(int fd, const IpAddress &src) == -1) {
request->flags.spoof_client_ip = 0;
}
}
@@ -966,7 +960,9 @@
netdbPingSite(request->GetHost());
-#if USE_ZPH_QOS
+#if USE_ZPH_QOS && defined(_SQUID_LINUX_)
+ /* Bug 2537: This part of ZPH only applies to patched Linux kernels. */
+
/* Retrieves remote server TOS value, and stores it as part of the
* original client request FD object. It is later used to forward
* remote server's TOS in the response to the client in case of a MISS.
@@ -1178,11 +1174,24 @@
/* NOTREACHED */
}
+/**
+ * Decide where details need to be gathered to correctly describe a persistent connection.
+ * What is needed:
+ * \item host name of server at other end of this link (either peer or requested host)
+ * \item port to which we connected the other end of this link (for peer or request)
+ * \item domain for which the connection is supposed to be used
+ * \item address of the client for which we made the connection
+ */
void
-
-FwdState::pconnPush(int fd, const char *host, int port, const char *domain, IPAddress &client_addr)
+FwdState::pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, IpAddress &client_addr)
{
- fwdPconnPool->push(fd, host, port, domain, client_addr);
+ if (_peer) {
+ fwdPconnPool->push(fd, _peer->name, _peer->http_port, domain, client_addr);
+ } else {
+ /* small performance improvement, using NULL for domain instead of listing it twice */
+ /* although this will leave a gap open for url-rewritten domains to share a link */
+ fwdPconnPool->push(fd, req->GetHost(), req->port, NULL, client_addr);
+ }
}
void
@@ -1291,12 +1300,12 @@
memFree(fs, MEM_FWD_SERVER);
}
-static IPAddress
+static IpAddress
aclMapAddr(acl_address * head, ACLChecklist * ch)
{
acl_address *l;
- IPAddress addr;
+ IpAddress addr;
for (l = head; l; l = l->next) {
if (ch->matchAclListFast(l->aclList))
@@ -1324,7 +1333,7 @@
return 0;
}
-IPAddress
+IpAddress
getOutgoingAddr(HttpRequest * request, struct peer *dst_peer)
{
ACLChecklist ch;
diff -u -r -N squid-3.1.0.3/src/forward.h squid-3.1.0.4/src/forward.h
--- squid-3.1.0.3/src/forward.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/forward.h 2009-01-23 18:37:37.000000000 +1300
@@ -4,9 +4,10 @@
/* forward decls */
class ErrorState;
+class HttpRequest;
#include "comm.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
class FwdServer
{
@@ -43,7 +44,7 @@
bool checkRetry();
bool checkRetriable();
void dispatch();
- void pconnPush(int fd, const char *host, int port, const char *domain, IPAddress &client_addr);
+ void pconnPush(int fd, const peer *_peer, const HttpRequest *req, const char *domain, IpAddress &client_addr);
bool dontRetry() { return flags.dont_retry; }
@@ -99,7 +100,7 @@
unsigned int forward_completed:1;
} flags;
- IPAddress src; /* Client address for this connection. Needed for transparent operations. */
+ IpAddress src; /* Client address for this connection. Needed for transparent operations. */
};
#endif
diff -u -r -N squid-3.1.0.3/src/fqdncache.cc squid-3.1.0.4/src/fqdncache.cc
--- squid-3.1.0.3/src/fqdncache.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/fqdncache.cc 2009-01-23 18:37:37.000000000 +1300
@@ -516,7 +516,7 @@
* and does not affect the FQDN cache.
*/
void
-fqdncache_nbgethostbyaddr(IPAddress &addr, FQDNH * handler, void *handlerData)
+fqdncache_nbgethostbyaddr(IpAddress &addr, FQDNH * handler, void *handlerData)
{
fqdncache_entry *f = NULL;
char name[MAX_IPSTRLEN];
@@ -634,7 +634,7 @@
*
*/
const char *
-fqdncache_gethostbyaddr(IPAddress &addr, int flags)
+fqdncache_gethostbyaddr(IpAddress &addr, int flags)
{
char name[MAX_IPSTRLEN];
fqdncache_entry *f = NULL;
@@ -736,7 +736,7 @@
/// \ingroup FQDNCacheAPI
const char *
-fqdnFromAddr(IPAddress &addr)
+fqdnFromAddr(IpAddress &addr)
{
const char *n;
static char buf[MAX_IPSTRLEN];
diff -u -r -N squid-3.1.0.3/src/fs/Makefile.am squid-3.1.0.4/src/fs/Makefile.am
--- squid-3.1.0.3/src/fs/Makefile.am 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/fs/Makefile.am 2009-01-23 18:37:37.000000000 +1300
@@ -6,8 +6,7 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
-
-##DIST_SUBDIRS = coss ufs
+CLEANFILES =
EXTRA_LIBRARIES = libcoss.a libufs.a
noinst_LIBRARIES = @STORE_LIBS@
@@ -46,6 +45,7 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
## targets below to emulate distributed makefiles
coss/all: libcoss.a
diff -u -r -N squid-3.1.0.3/src/fs/Makefile.in squid-3.1.0.4/src/fs/Makefile.in
--- squid-3.1.0.3/src/fs/Makefile.in 2008-12-05 16:09:57.000000000 +1300
+++ squid-3.1.0.4/src/fs/Makefile.in 2009-01-23 18:38:00.000000000 +1300
@@ -325,6 +325,7 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
EXTRA_LIBRARIES = libcoss.a libufs.a
noinst_LIBRARIES = @STORE_LIBS@
libcoss_a_SOURCES = \
@@ -594,6 +595,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/src/ftp.cc squid-3.1.0.4/src/ftp.cc
--- squid-3.1.0.3/src/ftp.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ftp.cc 2009-01-23 18:37:37.000000000 +1300
@@ -20,12 +20,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -92,8 +92,7 @@
} ftp_state_t;
/// \ingroup ServerProtocolFTPInternal
-struct _ftp_flags
-{
+struct _ftp_flags {
bool isdir;
bool pasv_supported;
bool epsv_all_sent;
@@ -124,7 +123,8 @@
/// common code for FTP control and data channels
// does not own the channel descriptor, which is managed by FtpStateData
-class FtpChannel {
+class FtpChannel
+{
public:
FtpChannel(): fd(-1) {}
@@ -179,8 +179,7 @@
// \todo: optimize ctrl and data structs member order, to minimize size
/// FTP control channel info; the channel is opened once per transaction
- struct CtrlChannel: public FtpChannel
- {
+ struct CtrlChannel: public FtpChannel {
char *buf;
size_t size;
size_t offset;
@@ -191,8 +190,7 @@
} ctrl;
/// FTP data channel info; the channel may be opened/closed a few times
- struct DataChannel: public FtpChannel
- {
+ struct DataChannel: public FtpChannel {
MemBuf *readBuf;
char *host;
u_short port;
@@ -282,8 +280,7 @@
}
/// \ingroup ServerProtocolFTPInternal
-typedef struct
-{
+typedef struct {
char type;
int64_t size;
char *date;
@@ -389,34 +386,33 @@
************************************************/
/// \ingroup ServerProtocolFTPInternal
-FTPSM *FTP_SM_FUNCS[] =
- {
- ftpReadWelcome, /* BEGIN */
- ftpReadUser, /* SENT_USER */
- ftpReadPass, /* SENT_PASS */
- ftpReadType, /* SENT_TYPE */
- ftpReadMdtm, /* SENT_MDTM */
- ftpReadSize, /* SENT_SIZE */
- ftpReadEPRT, /* SENT_EPRT */
- ftpReadPORT, /* SENT_PORT */
- ftpReadEPSV, /* SENT_EPSV_ALL */
- ftpReadEPSV, /* SENT_EPSV_1 */
- ftpReadEPSV, /* SENT_EPSV_2 */
- ftpReadPasv, /* SENT_PASV */
- ftpReadCwd, /* SENT_CWD */
- ftpReadList, /* SENT_LIST */
- ftpReadList, /* SENT_NLST */
- ftpReadRest, /* SENT_REST */
- ftpReadRetr, /* SENT_RETR */
- ftpReadStor, /* SENT_STOR */
- ftpReadQuit, /* SENT_QUIT */
- ftpReadTransferDone, /* READING_DATA (RETR,LIST,NLST) */
- ftpWriteTransferDone, /* WRITING_DATA (STOR) */
- ftpReadMkdir /* SENT_MKDIR */
- };
+FTPSM *FTP_SM_FUNCS[] = {
+ ftpReadWelcome, /* BEGIN */
+ ftpReadUser, /* SENT_USER */
+ ftpReadPass, /* SENT_PASS */
+ ftpReadType, /* SENT_TYPE */
+ ftpReadMdtm, /* SENT_MDTM */
+ ftpReadSize, /* SENT_SIZE */
+ ftpReadEPRT, /* SENT_EPRT */
+ ftpReadPORT, /* SENT_PORT */
+ ftpReadEPSV, /* SENT_EPSV_ALL */
+ ftpReadEPSV, /* SENT_EPSV_1 */
+ ftpReadEPSV, /* SENT_EPSV_2 */
+ ftpReadPasv, /* SENT_PASV */
+ ftpReadCwd, /* SENT_CWD */
+ ftpReadList, /* SENT_LIST */
+ ftpReadList, /* SENT_NLST */
+ ftpReadRest, /* SENT_REST */
+ ftpReadRetr, /* SENT_RETR */
+ ftpReadStor, /* SENT_STOR */
+ ftpReadQuit, /* SENT_QUIT */
+ ftpReadTransferDone, /* READING_DATA (RETR,LIST,NLST) */
+ ftpWriteTransferDone, /* WRITING_DATA (STOR) */
+ ftpReadMkdir /* SENT_MKDIR */
+};
/// handler called by Comm when FTP control channel is closed unexpectedly
-void
+void
FtpStateData::ctrlClosed(const CommCloseCbParams &io)
{
ctrl.clear();
@@ -424,7 +420,7 @@
}
/// handler called by Comm when FTP data channel is closed unexpectedly
-void
+void
FtpStateData::dataClosed(const CommCloseCbParams &io)
{
data.clear();
@@ -453,7 +449,7 @@
typedef CommCbMemFunT Dialer;
AsyncCall::Pointer closer = asyncCall(9, 5, "FtpStateData::ctrlClosed",
- Dialer(this, &FtpStateData::ctrlClosed));
+ Dialer(this, &FtpStateData::ctrlClosed));
ctrl.opened(theFwdState->server_fd, closer);
if (request->method == METHOD_PUT)
@@ -473,7 +469,7 @@
if (ctrl.fd >= 0) {
debugs(9, DBG_IMPORTANT, HERE << "Internal bug: FtpStateData left " <<
- "control FD " << ctrl.fd << " open");
+ "control FD " << ctrl.fd << " open");
}
if (ctrl.buf) {
@@ -483,7 +479,7 @@
if (data.readBuf) {
if (!data.readBuf->isNull())
- data.readBuf->clean();
+ data.readBuf->clean();
delete data.readBuf;
}
@@ -675,11 +671,10 @@
}
/// \ingroup ServerProtocolFTPInternal
-static const char *Month[] =
- {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
+static const char *Month[] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
/// \ingroup ServerProtocolFTPInternal
static int
@@ -726,8 +721,7 @@
static regex_t scan_ftp_dostime;
static regex_t scan_ftp_dosdate;
- if (!scan_ftp_initialized)
- {
+ if (!scan_ftp_initialized) {
scan_ftp_initialized = 1;
regcomp(&scan_ftp_integer, "^[0123456789]+$", REG_EXTENDED | REG_NOSUB);
regcomp(&scan_ftp_time, "^[0123456789:]+$", REG_EXTENDED | REG_NOSUB);
@@ -749,8 +743,7 @@
xbuf = xstrdup(buf);
- if (flags.tried_nlst)
- {
+ if (flags.tried_nlst) {
/* Machine readable format, one name per line */
p->name = xbuf;
p->type = '\0';
@@ -763,8 +756,7 @@
xfree(xbuf);
/* locate the Month field */
- for (i = 3; i < n_tokens - 2; i++)
- {
+ for (i = 3; i < n_tokens - 2; i++) {
char *size = tokens[i - 1];
char *month = tokens[i];
char *day = tokens[i + 1];
@@ -824,8 +816,7 @@
/* try it as a DOS listing, 04-05-70 09:33PM ... */
if (n_tokens > 3 &&
regexec(&scan_ftp_dosdate, tokens[0], 0, NULL, 0) == 0 &&
- regexec(&scan_ftp_dostime, tokens[1], 0, NULL, 0) == 0)
- {
+ regexec(&scan_ftp_dostime, tokens[1], 0, NULL, 0) == 0) {
if (!strcasecmp(tokens[2], "")) {
p->type = 'd';
} else {
@@ -861,8 +852,7 @@
}
/* Try EPLF format; carson@lehman.com */
- if (buf[0] == '+')
- {
+ if (buf[0] == '+') {
ct = buf + 1;
p->type = 0;
@@ -1233,7 +1223,8 @@
}
int
-FtpStateData::dataDescriptor() const {
+FtpStateData::dataDescriptor() const
+{
return data.fd;
}
@@ -1279,15 +1270,15 @@
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(this,&FtpStateData::ftpTimeout));
+ TimeoutDialer(this,&FtpStateData::ftpTimeout));
commSetTimeout(data.fd, Config.Timeout.read, timeoutCall);
debugs(9,5,HERE << "queueing read on FD " << data.fd);
typedef CommCbMemFunT Dialer;
entry->delayAwareRead(data.fd, data.readBuf->space(), read_sz,
- asyncCall(9, 5, "FtpStateData::dataRead",
- Dialer(this, &FtpStateData::dataRead)));
+ asyncCall(9, 5, "FtpStateData::dataRead",
+ Dialer(this, &FtpStateData::dataRead)));
}
void
@@ -1347,13 +1338,13 @@
}
if (io.flag != COMM_OK || io.size < 0) {
- debugs(50, ignoreErrno(io.xerrno) ? 3 : DBG_IMPORTANT,
- "ftpDataRead: read error: " << xstrerr(io.xerrno));
+ debugs(50, ignoreErrno(io.xerrno) ? 3 : DBG_IMPORTANT,
+ "ftpDataRead: read error: " << xstrerr(io.xerrno));
if (ignoreErrno(io.xerrno)) {
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(this,&FtpStateData::ftpTimeout));
+ TimeoutDialer(this,&FtpStateData::ftpTimeout));
commSetTimeout(io.fd, Config.Timeout.read, timeoutCall);
maybeReadVirginBody();
@@ -1369,16 +1360,16 @@
}
} else if (io.size == 0) {
debugs(9,3, HERE << "Calling dataComplete() because io.size == 0");
- /*
- * DPW 2007-04-23
- * Dangerous curves ahead. This call to dataComplete was
- * calling scheduleReadControlReply, handleControlReply,
- * and then ftpReadTransferDone. If ftpReadTransferDone
- * gets unexpected status code, it closes down the control
- * socket and our FtpStateData object gets destroyed. As
- * a workaround we no longer set the 'buffered_ok' flag in
- * the scheduleReadControlReply call.
- */
+ /*
+ * DPW 2007-04-23
+ * Dangerous curves ahead. This call to dataComplete was
+ * calling scheduleReadControlReply, handleControlReply,
+ * and then ftpReadTransferDone. If ftpReadTransferDone
+ * gets unexpected status code, it closes down the control
+ * socket and our FtpStateData object gets destroyed. As
+ * a workaround we no longer set the 'buffered_ok' flag in
+ * the scheduleReadControlReply call.
+ */
dataComplete();
}
@@ -1399,10 +1390,10 @@
appendSuccessHeader();
if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
- /*
- * probably was aborted because content length exceeds one
- * of the maximum size limits.
- */
+ /*
+ * probably was aborted because content length exceeds one
+ * of the maximum size limits.
+ */
abortTransaction("entry aborted after calling appendSuccessHeader()");
return;
}
@@ -1421,12 +1412,12 @@
if (flags.isdir) {
parseListing();
- } else
- if (const int csize = data.readBuf->contentSize()) {
- writeReplyBody(data.readBuf->content(), csize);
- debugs(9, 5, HERE << "consuming " << csize << " bytes of readBuf");
- data.readBuf->consume(csize);
- }
+ } else
+ if (const int csize = data.readBuf->contentSize()) {
+ writeReplyBody(data.readBuf->content(), csize);
+ debugs(9, 5, HERE << "consuming " << csize << " bytes of readBuf");
+ data.readBuf->consume(csize);
+ }
entry->flush();
@@ -1644,11 +1635,11 @@
typedef CommCbMemFunT Dialer;
AsyncCall::Pointer call = asyncCall(9, 5, "FtpStateData::ftpWriteCommandCallback",
- Dialer(this, &FtpStateData::ftpWriteCommandCallback));
+ Dialer(this, &FtpStateData::ftpWriteCommandCallback));
comm_write(ctrl.fd,
ctrl.last_command,
strlen(ctrl.last_command),
- call);
+ call);
scheduleReadControlReply(0);
}
@@ -1780,23 +1771,23 @@
handleControlReply();
} else {
/* XXX What about Config.Timeout.read? */
- typedef CommCbMemFunT Dialer;
- AsyncCall::Pointer reader=asyncCall(9, 5, "FtpStateData::ftpReadControlReply",
- Dialer(this, &FtpStateData::ftpReadControlReply));
- comm_read(ctrl.fd, ctrl.buf + ctrl.offset, ctrl.size - ctrl.offset, reader);
+ typedef CommCbMemFunT Dialer;
+ AsyncCall::Pointer reader=asyncCall(9, 5, "FtpStateData::ftpReadControlReply",
+ Dialer(this, &FtpStateData::ftpReadControlReply));
+ comm_read(ctrl.fd, ctrl.buf + ctrl.offset, ctrl.size - ctrl.offset, reader);
/*
* Cancel the timeout on the Data socket (if any) and
* establish one on the control socket.
*/
- if (data.fd > -1){
- AsyncCall::Pointer nullCall = NULL;
+ if (data.fd > -1) {
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(data.fd, -1, nullCall);
- }
+ }
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(this,&FtpStateData::ftpTimeout));
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
+ TimeoutDialer(this,&FtpStateData::ftpTimeout));
commSetTimeout(ctrl.fd, Config.Timeout.read, timeoutCall);
}
@@ -1826,8 +1817,8 @@
}
if (io.flag != COMM_OK || io.size < 0) {
- debugs(50, ignoreErrno(io.xerrno) ? 3 : DBG_IMPORTANT,
- "ftpReadControlReply: read error: " << xstrerr(io.xerrno));
+ debugs(50, ignoreErrno(io.xerrno) ? 3 : DBG_IMPORTANT,
+ "ftpReadControlReply: read error: " << xstrerr(io.xerrno));
if (ignoreErrno(io.xerrno)) {
scheduleReadControlReply(0);
@@ -1847,7 +1838,7 @@
return;
}
- /* XXX this may end up having to be serverComplete() .. */
+ /* XXX this may end up having to be serverComplete() .. */
abortTransaction("zero control reply read");
return;
}
@@ -1942,7 +1933,7 @@
ftpSendUser(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendUser"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendUser"))
return;
if (ftpState->proxy_host != NULL)
@@ -1978,7 +1969,7 @@
ftpSendPass(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendPass"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendPass"))
return;
snprintf(cbuf, 1024, "PASS %s\r\n", ftpState->password);
@@ -2009,7 +2000,7 @@
char mode;
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendType"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendType"))
return;
/*
@@ -2137,7 +2128,7 @@
char *path = NULL;
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendCwd"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendCwd"))
return;
debugs(9, 3, HERE);
@@ -2195,7 +2186,7 @@
char *path = NULL;
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendMkdir"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendMkdir"))
return;
path = ftpState->filepath;
@@ -2254,7 +2245,7 @@
ftpSendMdtm(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendMdtm"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendMdtm"))
return;
assert(*ftpState->filepath != '\0');
@@ -2275,7 +2266,7 @@
ftpState->unhack();
} else if (code < 0) {
ftpFail(ftpState);
- return;
+ return;
}
ftpSendSize(ftpState);
@@ -2286,7 +2277,7 @@
ftpSendSize(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendSize"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendSize"))
return;
/* Only send SIZE for binary transfers. The returned size
@@ -2316,13 +2307,13 @@
if (ftpState->theSize == 0) {
debugs(9, 2, "SIZE reported " <<
- ftpState->ctrl.last_reply << " on " <<
- ftpState->title_url.buf());
+ ftpState->ctrl.last_reply << " on " <<
+ ftpState->title_url.buf());
ftpState->theSize = -1;
}
} else if (code < 0) {
ftpFail(ftpState);
- return;
+ return;
}
ftpSendPassive(ftpState);
@@ -2338,19 +2329,18 @@
char h1, h2, h3, h4;
int n;
u_short port;
- IPAddress ipa_remote;
+ IpAddress ipa_remote;
int fd = ftpState->data.fd;
char *buf;
debugs(9, 3, HERE);
if (code != 229 && code != 522) {
- if(code == 200) {
+ if (code == 200) {
/* handle broken servers (RFC 2428 says OK code for EPSV MUST be 229 not 200) */
/* vsftpd for one send '200 EPSV ALL ok.' without even port info.
* Its okay to re-send EPSV 1/2 but nothing else. */
debugs(9, DBG_IMPORTANT, "Broken FTP Server at " << fd_table[ftpState->ctrl.fd].ipaddr << ". Wrong accept code for EPSV");
- }
- else {
+ } else {
debugs(9, 2, "EPSV not supported by remote end");
ftpState->state = SENT_EPSV_1; /* simulate having failed EPSV 1 (last EPSV to try before shifting to PASV) */
}
@@ -2358,29 +2348,26 @@
return;
}
- if(code == 522) {
+ if (code == 522) {
/* server response with list of supported methods */
/* 522 Network protocol not supported, use (1) */
/* 522 Network protocol not supported, use (1,2) */
debugs(9, 5, HERE << "scanning: " << ftpState->ctrl.last_reply);
buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(1,2)");
- if(buf == NULL || *buf == '\0') {
+ if (buf == NULL || *buf == '\0') {
/* handle broken server (RFC 2428 says MUST specify supported protocols in 522) */
debugs(9, DBG_IMPORTANT, "Broken FTP Server at " << fd_table[ftpState->ctrl.fd].ipaddr << ". 522 error missing protocol negotiation hints");
ftpSendPassive(ftpState);
- }
- else if(strcmp(buf, "(1)") == 0) {
+ } else if (strcmp(buf, "(1)") == 0) {
ftpState->state = SENT_EPSV_2; /* simulate having sent and failed EPSV 2 */
ftpSendPassive(ftpState);
- }
- else if(strcmp(buf, "(2)") == 0) {
+ } else if (strcmp(buf, "(2)") == 0) {
#if USE_IPV6
/* If server only supports EPSV 2 and we have already tried that. Go straight to EPRT */
- if(ftpState->state == SENT_EPSV_2) {
+ if (ftpState->state == SENT_EPSV_2) {
ftpSendEPRT(ftpState);
- }
- else {
+ } else {
/* or try the next Passive mode down the chain. */
ftpSendPassive(ftpState);
}
@@ -2455,11 +2442,11 @@
static void
ftpSendPassive(FtpStateData * ftpState)
{
- IPAddress addr;
+ IpAddress addr;
struct addrinfo *AI = NULL;
/** Checks the server control channel is still available before running. */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendPassive"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendPassive"))
return;
debugs(9, 3, HERE);
@@ -2469,7 +2456,7 @@
* If enabled to be sent, squid MUST NOT request any other connect methods.
* If 'ALL' is sent and fails the entire FTP Session fails.
* NP: By my reading exact EPSV protocols maybe attempted, but only EPSV method. */
- if(Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent && ftpState->state == SENT_EPSV_1 ) {
+ if (Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent && ftpState->state == SENT_EPSV_1 ) {
debugs(9, DBG_IMPORTANT, "FTP does not allow PASV method after 'EPSV ALL' has been sent.");
ftpFail(ftpState);
return;
@@ -2534,7 +2521,7 @@
\item EPSV 1 is used if EPSV 2 (IPv6) fails or is not available.
\item PASV is used if EPSV 1 fails.
*/
- switch(ftpState->state) {
+ switch (ftpState->state) {
case SENT_EPSV_1: /* EPSV options exhausted. Try PASV now. */
snprintf(cbuf, 1024, "PASV\r\n");
ftpState->state = SENT_PASV;
@@ -2552,13 +2539,12 @@
break;
default:
- if(Config.Ftp.epsv_all) {
+ if (Config.Ftp.epsv_all) {
snprintf(cbuf, 1024, "EPSV ALL\r\n");
ftpState->state = SENT_EPSV_ALL;
/* block other non-EPSV connections being attempted */
ftpState->flags.epsv_all_sent = true;
- }
- else {
+ } else {
#if USE_IPV6
snprintf(cbuf, 1024, "EPSV 2\r\n");
ftpState->state = SENT_EPSV_2;
@@ -2578,7 +2564,7 @@
*/
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
+ TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
commSetTimeout(ftpState->data.fd, 15, timeoutCall);
}
@@ -2608,7 +2594,7 @@
#endif
// processReplyBody calls serverComplete() since there is no body
- processReplyBody();
+ processReplyBody();
}
/// \ingroup ServerProtocolFTPInternal
@@ -2620,7 +2606,7 @@
int p1, p2;
int n;
u_short port;
- IPAddress ipa_remote;
+ IpAddress ipa_remote;
int fd = ftpState->data.fd;
char *buf;
LOCAL_ARRAY(char, ipaddr, 1024);
@@ -2653,7 +2639,7 @@
ipa_remote = ipaddr;
- if( ipa_remote.IsAnyAddr() ) {
+ if ( ipa_remote.IsAnyAddr() ) {
debugs(9, DBG_IMPORTANT, "Unsafe PASV reply from " <<
fd_table[ftpState->ctrl.fd].ipaddr << ": " <<
ftpState->ctrl.last_reply);
@@ -2726,7 +2712,7 @@
{
int fd;
- IPAddress addr;
+ IpAddress addr;
struct addrinfo *AI = NULL;
int on = 1;
int x = 0;
@@ -2747,7 +2733,7 @@
addr.FreeAddrInfo(AI);
- if(x) {
+ if (x) {
debugs(9, DBG_CRITICAL, HERE << "getsockname(" << ftpState->ctrl.fd << ",..): " << xstrerror());
return -1;
}
@@ -2758,8 +2744,7 @@
*/
if (fallback) {
setsockopt(ftpState->ctrl.fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on));
- }
- else {
+ } else {
/* if not running in fallback mode a new port needs to be retrieved */
addr.SetPort(0);
}
@@ -2793,16 +2778,16 @@
{
int fd;
- IPAddress ipa;
+ IpAddress ipa;
struct addrinfo *AI = NULL;
unsigned char *addrptr;
unsigned char *portptr;
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendPort"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendPort"))
return;
- if(Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent) {
+ if (Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent) {
debugs(9, DBG_IMPORTANT, "FTP does not allow PORT method after 'EPSV ALL' has been sent.");
return;
}
@@ -2822,13 +2807,13 @@
}
#if USE_IPV6
- if( AI->ai_addrlen != sizeof(struct sockaddr_in) ) {
+ if ( AI->ai_addrlen != sizeof(struct sockaddr_in) ) {
ipa.FreeAddrInfo(AI);
- /* IPv6 CANNOT send PORT command. */
- /* we got here by attempting and failing an EPRT */
- /* using the same reply code should simulate a PORT failure */
- ftpReadPORT(ftpState);
- return;
+ /* IPv6 CANNOT send PORT command. */
+ /* we got here by attempting and failing an EPRT */
+ /* using the same reply code should simulate a PORT failure */
+ ftpReadPORT(ftpState);
+ return;
}
#endif
@@ -2864,11 +2849,11 @@
ftpSendEPRT(FtpStateData * ftpState)
{
int fd;
- IPAddress addr;
+ IpAddress addr;
struct addrinfo *AI = NULL;
char buf[MAX_IPSTRLEN];
- if(Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent) {
+ if (Config.Ftp.epsv_all && ftpState->flags.epsv_all_sent) {
debugs(9, DBG_IMPORTANT, "FTP does not allow EPRT method after 'EPSV ALL' has been sent.");
return;
}
@@ -2948,15 +2933,15 @@
io.details.peer.NtoA(ntoapeer,MAX_IPSTRLEN);
if (strcmp(fd_table[ctrl.fd].ipaddr, ntoapeer) != 0) {
- debugs(9, DBG_IMPORTANT,
- "FTP data connection from unexpected server (" <<
- io.details.peer << "), expecting " <<
- fd_table[ctrl.fd].ipaddr);
+ debugs(9, DBG_IMPORTANT,
+ "FTP data connection from unexpected server (" <<
+ io.details.peer << "), expecting " <<
+ fd_table[ctrl.fd].ipaddr);
comm_close(io.nfd);
- typedef CommCbMemFunT acceptDialer;
- AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
- acceptDialer(this, &FtpStateData::ftpAcceptDataConnection));
+ typedef CommCbMemFunT acceptDialer;
+ AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
+ acceptDialer(this, &FtpStateData::ftpAcceptDataConnection));
comm_accept(data.fd, acceptCall);
return;
}
@@ -2977,9 +2962,9 @@
io.details.peer.NtoA(data.host,SQUIDHOSTNAMELEN);
debugs(9, 3, "ftpAcceptDataConnection: Connected data socket on " <<
- "FD " << io.nfd << " to " << io.details.peer << " FD table says: " <<
- "ctrl-peer= " << fd_table[ctrl.fd].ipaddr << ", " <<
- "data-peer= " << fd_table[data.fd].ipaddr);
+ "FD " << io.nfd << " to " << io.details.peer << " FD table says: " <<
+ "ctrl-peer= " << fd_table[ctrl.fd].ipaddr << ", " <<
+ "data-peer= " << fd_table[data.fd].ipaddr);
AsyncCall::Pointer nullCall = NULL;
@@ -2987,7 +2972,7 @@
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(this,&FtpStateData::ftpTimeout));
+ TimeoutDialer(this,&FtpStateData::ftpTimeout));
commSetTimeout(data.fd, Config.Timeout.read, timeoutCall);
/*\todo XXX We should have a flag to track connect state...
@@ -3027,7 +3012,7 @@
ftpSendStor(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendStor"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendStor"))
return;
debugs(9, 3, HERE);
@@ -3056,7 +3041,8 @@
ftpState->readStor();
}
-void FtpStateData::readStor() {
+void FtpStateData::readStor()
+{
int code = ctrl.replycode;
debugs(9, 3, HERE);
@@ -3074,12 +3060,12 @@
* Cancel the timeout on the Control socket and
* establish one on the data socket.
*/
- AsyncCall::Pointer nullCall = NULL;
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(ctrl.fd, -1, nullCall);
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(this,&FtpStateData::ftpTimeout));
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
+ TimeoutDialer(this,&FtpStateData::ftpTimeout));
commSetTimeout(data.fd, Config.Timeout.read, timeoutCall);
@@ -3091,7 +3077,7 @@
debugs(9, 3, "ftpReadStor: accepting data channel");
typedef CommCbMemFunT acceptDialer;
AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
- acceptDialer(this, &FtpStateData::ftpAcceptDataConnection));
+ acceptDialer(this, &FtpStateData::ftpAcceptDataConnection));
comm_accept(data.fd, acceptCall);
} else {
@@ -3105,7 +3091,7 @@
ftpSendRest(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendRest"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendRest"))
return;
debugs(9, 3, HERE);
@@ -3136,7 +3122,7 @@
return 0;
if (desired_offset >= theSize)
- return 0;
+ return 0;
restart_offset = desired_offset;
return 1;
@@ -3167,7 +3153,7 @@
ftpSendList(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendList"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendList"))
return;
debugs(9, 3, HERE);
@@ -3187,7 +3173,7 @@
ftpSendNlst(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendNlst"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendNlst"))
return;
debugs(9, 3, HERE);
@@ -3220,26 +3206,26 @@
* Cancel the timeout on the Control socket and establish one
* on the data socket
*/
- AsyncCall::Pointer nullCall = NULL;
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(ftpState->ctrl.fd, -1, nullCall);
return;
} else if (code == 150) {
/* Accept data channel */
- typedef CommCbMemFunT acceptDialer;
- AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
- acceptDialer(ftpState, &FtpStateData::ftpAcceptDataConnection));
+ typedef CommCbMemFunT acceptDialer;
+ AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
+ acceptDialer(ftpState, &FtpStateData::ftpAcceptDataConnection));
comm_accept(ftpState->data.fd, acceptCall);
/*
* Cancel the timeout on the Control socket and establish one
* on the data socket
*/
- AsyncCall::Pointer nullCall = NULL;
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(ftpState->ctrl.fd, -1, nullCall);
-
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
+
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
+ TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
commSetTimeout(ftpState->data.fd, Config.Timeout.read, timeoutCall);
return;
} else if (!ftpState->flags.tried_nlst && code > 300) {
@@ -3255,7 +3241,7 @@
ftpSendRetr(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendRetr"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendRetr"))
return;
debugs(9, 3, HERE);
@@ -3283,24 +3269,24 @@
* Cancel the timeout on the Control socket and establish one
* on the data socket
*/
- AsyncCall::Pointer nullCall = NULL;
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(ftpState->ctrl.fd, -1, nullCall);
} else if (code == 150) {
/* Accept data channel */
- typedef CommCbMemFunT acceptDialer;
- AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
- acceptDialer(ftpState, &FtpStateData::ftpAcceptDataConnection));
+ typedef CommCbMemFunT acceptDialer;
+ AsyncCall::Pointer acceptCall = asyncCall(11, 5, "FtpStateData::ftpAcceptDataConnection",
+ acceptDialer(ftpState, &FtpStateData::ftpAcceptDataConnection));
comm_accept(ftpState->data.fd, acceptCall);
/*
* Cancel the timeout on the Control socket and establish one
* on the data socket
*/
- AsyncCall::Pointer nullCall = NULL;
+ AsyncCall::Pointer nullCall = NULL;
commSetTimeout(ftpState->ctrl.fd, -1, nullCall);
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
- TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer timeoutCall = asyncCall(9, 5, "FtpStateData::ftpTimeout",
+ TimeoutDialer(ftpState,&FtpStateData::ftpTimeout));
commSetTimeout(ftpState->data.fd, Config.Timeout.read, timeoutCall);
} else if (code >= 300) {
if (!ftpState->flags.try_slash_hack) {
@@ -3378,7 +3364,7 @@
ftpSendQuit(FtpStateData * ftpState)
{
/* check the server control channel is still available */
- if(!ftpState || !ftpState->haveControlChannel("ftpSendQuit"))
+ if (!ftpState || !ftpState->haveControlChannel("ftpSendQuit"))
return;
snprintf(cbuf, 1024, "QUIT\r\n");
@@ -3463,10 +3449,10 @@
ftpFail(FtpStateData *ftpState)
{
debugs(9, 6, HERE << "flags(" <<
- (ftpState->flags.isdir?"IS_DIR,":"") <<
- (ftpState->flags.try_slash_hack?"TRY_SLASH_HACK":"") << "), " <<
- "mdtm=" << ftpState->mdtm << ", size=" << ftpState->theSize <<
- "slashhack=" << (ftpState->request->urlpath.caseCmp("/%2f", 4)==0? "T":"F") );
+ (ftpState->flags.isdir?"IS_DIR,":"") <<
+ (ftpState->flags.try_slash_hack?"TRY_SLASH_HACK":"") << "), " <<
+ "mdtm=" << ftpState->mdtm << ", size=" << ftpState->theSize <<
+ "slashhack=" << (ftpState->request->urlpath.caseCmp("/%2f", 4)==0? "T":"F") );
/* Try the / hack to support "Netscape" FTP URL's for retreiving files */
if (!ftpState->flags.isdir && /* Not a directory */
@@ -3685,16 +3671,16 @@
reply->setHeaders(version, HTTP_OK, "Gatewaying",
mime_type, theSize, mdtm, -2);
} else if (theSize < restarted_offset) {
- /*
- * DPW 2007-05-04
- * offset should not be larger than theSize. We should
- * not be seeing this condition any more because we'll only
- * send REST if we know the theSize and if it is less than theSize.
- */
- debugs(0,DBG_CRITICAL,HERE << "Whoops! " <<
- " restarted_offset=" << restarted_offset <<
- ", but theSize=" << theSize <<
- ". assuming full content response");
+ /*
+ * DPW 2007-05-04
+ * offset should not be larger than theSize. We should
+ * not be seeing this condition any more because we'll only
+ * send REST if we know the theSize and if it is less than theSize.
+ */
+ debugs(0,DBG_CRITICAL,HERE << "Whoops! " <<
+ " restarted_offset=" << restarted_offset <<
+ ", but theSize=" << theSize <<
+ ". assuming full content response");
reply->setHeaders(version, HTTP_OK, "Gatewaying",
mime_type, theSize, mdtm, -2);
} else {
@@ -3756,7 +3742,7 @@
* after the initial URI path delimiter, which happens to be / itself.
* This makes FTP absolute URI appear as: ftp:host:port//root/path
* To encompass older software which compacts multiple // to / in transit
- * We use standard URI-encoding on the second / making it
+ * We use standard URI-encoding on the second / making it
* ftp:host:port/%2froot/path AKA 'the FTP %2f hack'.
*/
const char *
@@ -3767,12 +3753,11 @@
if (request->protocol != PROTO_FTP)
return NULL;
- if( !strncmp(request->urlpath.buf(), "/", 1) ) {
+ if ( !strncmp(request->urlpath.buf(), "/", 1) ) {
newbuf.append(request->urlpath);
request->urlpath.absorb(newbuf);
safe_free(request->canonical);
- }
- else if( !strncmp(request->urlpath.buf(), "%2f", 3) ) {
+ } else if ( !strncmp(request->urlpath.buf(), "%2f", 3) ) {
newbuf.append(request->urlpath.buf() +1);
request->urlpath.absorb(newbuf);
safe_free(request->canonical);
@@ -3811,16 +3796,16 @@
{
debugs(9,3, HERE);
dataComplete();
-/* NP: RFC 959 3.3. DATA CONNECTION MANAGEMENT
- * if transfer type is 'stream' call dataComplete()
- * otherwise leave open. (reschedule control channel read?)
- */
+ /* NP: RFC 959 3.3. DATA CONNECTION MANAGEMENT
+ * if transfer type is 'stream' call dataComplete()
+ * otherwise leave open. (reschedule control channel read?)
+ */
}
/**
* A hack to ensure we do not double-complete on the forward entry.
*
- \todo FtpStateData logic should probably be rewritten to avoid
+ \todo FtpStateData logic should probably be rewritten to avoid
* double-completion or FwdState should be rewritten to allow it.
*/
void
@@ -3828,8 +3813,8 @@
{
if (fwd == NULL || flags.completed_forwarding) {
debugs(9, 3, HERE << "completeForwarding avoids " <<
- "double-complete on FD " << ctrl.fd << ", Data FD " << data.fd <<
- ", this " << this << ", fwd " << fwd);
+ "double-complete on FD " << ctrl.fd << ", Data FD " << data.fd <<
+ ", this " << this << ", fwd " << fwd);
return;
}
@@ -3874,11 +3859,11 @@
bool
FtpStateData::haveControlChannel(const char *caller_name) const
{
- if(doneWithServer())
+ if (doneWithServer())
return false;
/* doneWithServer() only checks BOTH channels are closed. */
- if(ctrl.fd < 0) {
+ if (ctrl.fd < 0) {
debugs(9, DBG_IMPORTANT, "WARNING! FTP Server Control channel is closed, but Data channel still active.");
debugs(9, 2, caller_name << ": attempted on a closed FTP channel.");
return false;
@@ -3897,7 +3882,7 @@
FtpStateData::abortTransaction(const char *reason)
{
debugs(9, 3, HERE << "aborting transaction for " << reason <<
- "; FD " << ctrl.fd << ", Data FD " << data.fd << ", this " << this);
+ "; FD " << ctrl.fd << ", Data FD " << data.fd << ", this " << this);
if (ctrl.fd >= 0) {
comm_close(ctrl.fd);
return;
@@ -3913,7 +3898,7 @@
{
typedef CommCbMemFunT Dialer;
return asyncCall(9, 5, "FtpStateData::dataClosed",
- Dialer(this, &FtpStateData::dataClosed));
+ Dialer(this, &FtpStateData::dataClosed));
}
/// configures the channel with a descriptor and registers a close handler
diff -u -r -N squid-3.1.0.3/src/globals.cc squid-3.1.0.4/src/globals.cc
--- squid-3.1.0.3/src/globals.cc 2008-12-05 16:11:09.000000000 +1300
+++ squid-3.1.0.4/src/globals.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,179 +0,0 @@
-#include "squid.h"
-/*
- * $Id: globals.h,v 1.143 2008/02/11 22:36:52 rousskov Exp $
- *
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- */
-
-#if HAVE_STDIO_H
-#include
-#endif
-
-#include "rfc2181.h"
-
-/* for ERROR_BUF_SZ, BUFSIZ, MAXHTTPPORTS */
-#include "defines.h"
-
-/* for iostats, StatCounters */
-#include "structs.h"
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//MOVED:Debug.h extern FILE *debug_log; /* NULL */
-//MOVED:structs.h extern SquidConfig Config;
-//MOVED:structs.h extern SquidConfig2 Config2;
-char *ConfigFile = NULL;
-const char *dns_error_message = NULL;
-char tmp_error_buf[ERROR_BUF_SZ];
-char *volatile debug_options = NULL;
-char ThisCache[RFC2181_MAXHOSTNAMELEN << 1];
-char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1];
-char config_input_line[BUFSIZ];
-const char *DefaultConfigFile = DEFAULT_CONFIG_FILE;
-const char *cfg_filename = NULL;
-//MOVED:version.h:APP_SHORTNAME extern const char *const appname; /* "squid" */
-const char *const dash_str = "-";
-const char *const null_string = "";
-const char *const version_string = VERSION;
-//MOVED:versions.h:APP_FULLNAME extern const char *const full_appname_string; /* PACKAGE "/" VERSION */
-const char *const appname_string = PACKAGE;
-const char *const w_space = " \t\n\r";
-char const * visible_appname_string = NULL;
- class fde;
-fde *fd_table = NULL;
-int Biggest_FD = -1;
-int Number_FD = 0;
-int Opening_FD = 0;
-int HttpSockets[MAXHTTPPORTS];
-int NDnsServersAlloc = 0;
-int NHttpSockets = 0;
-int RESERVED_FD;
-int Squid_MaxFD = SQUID_MAXFD;
-int config_lineno = 0;
-int do_mallinfo = 0;
-int opt_reuseaddr = 1;
-//DEAD extern int icmp_sock; /* -1 */
-int neighbors_do_private_keys = 1;
-int opt_catch_signals = 1;
-int opt_debug_stderr = -1;
-int opt_foreground_rebuild = 0;
-char *opt_forwarded_for = NULL;
-int opt_reload_hit_only = 0;
-#if HAVE_SYSLOG
-
-int opt_syslog_enable = 0;
-#endif
-
-int opt_udp_hit_obj = 0;
-int opt_create_swap_dirs = 0;
-int opt_store_doublecheck = 0;
-int syslog_enable = 0;
-int theInIcpConnection = -1;
-int theOutIcpConnection = -1;
-int DnsSocket = -1;
-#ifdef SQUID_SNMP
-
-int theInSnmpConnection = -1;
-int theOutSnmpConnection = -1;
-char *snmp_agentinfo;
-#endif
-
-int n_disk_objects = 0;
-iostats IOStats;
-
-struct acl_deny_info_list *DenyInfoList = NULL;
-
-//MOVED:icp_v2.cc extern IPAddress theOutICPAddr;
-//MOVED:snmp_core.cc extern IPAddress theOutSNMPAddr;
-
-struct timeval squid_start;
-int shutting_down = 0;
-int reconfiguring = 0;
-unsigned long store_swap_size = 0;
-time_t hit_only_mode_until = 0;
-StatCounters statCounter;
-double request_failure_ratio = 0.0;
-int store_hash_buckets = 0;
-hash_table *store_table = NULL;
-//MOVED:dlink.h extern dlink_list ClientActiveRequests;
-int hot_obj_count = 0;
-const int CacheDigestHashFuncCount = 4;
-CacheDigest *store_digest = NULL;
-const char *StoreDigestFileName = "store_digest";
-const char *StoreDigestMimeStr = "application/cache-digest";
-
-const char *MultipartMsgBoundaryStr = "Unique-Squid-Separator";
-#if HTTP_VIOLATIONS
-
-int refresh_nocache_hack = 0;
-#endif
-
-int store_open_disk_fd = 0;
-int store_swap_low = 0;
-int store_swap_high = 0;
-size_t store_pages_max = 0;
-int64_t store_maxobjsize = -1;
-hash_table *proxy_auth_username_cache = NULL;
-int incoming_sockets_accepted;
-#ifdef _SQUID_MSWIN_
-
-unsigned int WIN32_Socks_initialized = 0;
-#endif
-#ifdef _SQUID_WIN32_
-
-unsigned int WIN32_OS_version = 0;
-char *WIN32_OS_string = NULL;
-char *WIN32_Service_name = NULL;
-char *WIN32_Command_Line = NULL;
-char *WIN32_Service_Command_Line = NULL;
-unsigned int WIN32_run_mode = _WIN_SQUID_RUN_MODE_INTERACTIVE;
-#endif
-#if HAVE_SBRK
-
-void *sbrk_start = 0;
-#endif
-
-int ssl_ex_index_server = -1;
-int ssl_ctx_ex_index_dont_verify_domain = -1;
-int ssl_ex_index_cert_error_check = -1;
-
-const char *external_acl_message = NULL;
-int opt_send_signal = -1;
-int opt_no_daemon = 0;
-
-
-#ifdef __cplusplus
-}
-
-#endif
-
diff -u -r -N squid-3.1.0.3/src/globals.h squid-3.1.0.4/src/globals.h
--- squid-3.1.0.3/src/globals.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/globals.h 2009-01-23 18:37:37.000000000 +1300
@@ -122,8 +122,8 @@
extern struct acl_deny_info_list *DenyInfoList; /* NULL */
-//MOVED:icp_v2.cc extern IPAddress theOutICPAddr;
-//MOVED:snmp_core.cc extern IPAddress theOutSNMPAddr;
+//MOVED:icp_v2.cc extern IpAddress theOutICPAddr;
+//MOVED:snmp_core.cc extern IpAddress theOutSNMPAddr;
extern struct timeval squid_start;
extern int shutting_down; /* 0 */
diff -u -r -N squid-3.1.0.3/src/helper.h squid-3.1.0.4/src/helper.h
--- squid-3.1.0.3/src/helper.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/helper.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: helper.h,v 1.12 2008/02/26 21:49:34 amosjeffries Exp $
- *
* DEBUG: section 84 Helper process maintenance
* AUTHOR: Harvest Derived?
*
@@ -38,7 +35,7 @@
#include "squid.h"
#include "cbdata.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
class helper_request;
@@ -65,7 +62,7 @@
int n_running;
int n_active;
int ipc_type;
- IPAddress addr;
+ IpAddress addr;
unsigned int concurrency;
time_t last_queue_warn;
time_t last_restart;
@@ -87,7 +84,7 @@
int n_running;
int n_active;
int ipc_type;
- IPAddress addr;
+ IpAddress addr;
MemAllocator *datapool;
HLPSAVAIL *IsAvailable;
HLPSONEQ *OnEmptyQueue;
@@ -105,7 +102,7 @@
struct _helper_server {
int index;
int pid;
- IPAddress addr;
+ IpAddress addr;
int rfd;
int wfd;
MemBuf *wqueue;
@@ -141,7 +138,7 @@
struct _helper_stateful_server {
int index;
int pid;
- IPAddress addr;
+ IpAddress addr;
int rfd;
int wfd;
/* MemBuf wqueue; */
diff -u -r -N squid-3.1.0.3/src/htcp.cc squid-3.1.0.4/src/htcp.cc
--- squid-3.1.0.3/src/htcp.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/htcp.cc 2009-01-23 18:37:37.000000000 +1300
@@ -152,7 +152,7 @@
void checkHit();
void checkedHit(StoreEntry *e);
- void setFrom (IPAddress &from);
+ void setFrom (IpAddress &from);
void setDataHeader (htcpDataHeader *);
char *method;
char *uri;
@@ -163,7 +163,7 @@
private:
HttpRequest *checkHitRequest;
- IPAddress from; // was a ptr. return to such IFF needed. otherwise copy should do.
+ IpAddress from; // was a ptr. return to such IFF needed. otherwise copy should do.
htcpDataHeader *dhdr;
};
@@ -231,7 +231,7 @@
static u_int32_t queried_id[N_QUERIED_KEYS];
static cache_key queried_keys[N_QUERIED_KEYS][SQUID_MD5_DIGEST_LENGTH];
-static IPAddress queried_addr[N_QUERIED_KEYS];
+static IpAddress queried_addr[N_QUERIED_KEYS];
static MemAllocator *htcpDetailPool = NULL;
static int old_squid_format = 0;
@@ -250,24 +250,24 @@
static void htcpFreeSpecifier(htcpSpecifier * s);
static void htcpFreeDetail(htcpDetail * s);
-static void htcpHandleMsg(char *buf, int sz, IPAddress &from);
+static void htcpHandleMsg(char *buf, int sz, IpAddress &from);
-static void htcpHandleMon(htcpDataHeader *, char *buf, int sz, IPAddress &from);
+static void htcpHandleMon(htcpDataHeader *, char *buf, int sz, IpAddress &from);
-static void htcpHandleNop(htcpDataHeader *, char *buf, int sz, IPAddress &from);
+static void htcpHandleNop(htcpDataHeader *, char *buf, int sz, IpAddress &from);
-static void htcpHandleSet(htcpDataHeader *, char *buf, int sz, IPAddress &from);
+static void htcpHandleSet(htcpDataHeader *, char *buf, int sz, IpAddress &from);
-static void htcpHandleTst(htcpDataHeader *, char *buf, int sz, IPAddress &from);
+static void htcpHandleTst(htcpDataHeader *, char *buf, int sz, IpAddress &from);
static void htcpRecv(int fd, void *data);
-static void htcpSend(const char *buf, int len, IPAddress &to);
+static void htcpSend(const char *buf, int len, IpAddress &to);
-static void htcpTstReply(htcpDataHeader *, StoreEntry *, htcpSpecifier *, IPAddress &);
+static void htcpTstReply(htcpDataHeader *, StoreEntry *, htcpSpecifier *, IpAddress &);
-static void htcpHandleTstRequest(htcpDataHeader *, char *buf, int sz, IPAddress &from);
+static void htcpHandleTstRequest(htcpDataHeader *, char *buf, int sz, IpAddress &from);
-static void htcpHandleTstResponse(htcpDataHeader *, char *, int, IPAddress &);
+static void htcpHandleTstResponse(htcpDataHeader *, char *, int, IpAddress &);
static void
htcpHexdump(const char *tag, const char *s, int sz)
@@ -590,7 +590,7 @@
static void
-htcpSend(const char *buf, int len, IPAddress &to)
+htcpSend(const char *buf, int len, IpAddress &to)
{
int x;
@@ -614,7 +614,7 @@
void
-htcpSpecifier::setFrom (IPAddress &aSocket)
+htcpSpecifier::setFrom (IpAddress &aSocket)
{
from = aSocket;
}
@@ -845,7 +845,7 @@
static int
-htcpAccessCheck(acl_access * acl, htcpSpecifier * s, IPAddress &from)
+htcpAccessCheck(acl_access * acl, htcpSpecifier * s, IpAddress &from)
{
ACLChecklist checklist;
checklist.src_addr = from;
@@ -858,7 +858,7 @@
}
static void
-htcpTstReply(htcpDataHeader * dhdr, StoreEntry * e, htcpSpecifier * spec, IPAddress &from)
+htcpTstReply(htcpDataHeader * dhdr, StoreEntry * e, htcpSpecifier * spec, IpAddress &from)
{
htcpStuff stuff;
static char pkt[8192];
@@ -908,8 +908,8 @@
#if USE_ICMP
if (char *host = urlHostname(spec->uri)) {
- int rtt = 0;
- int hops = 0;
+ int rtt = 0;
+ int hops = 0;
int samp = 0;
netdbHostData(host, &samp, &rtt, &hops);
@@ -946,7 +946,7 @@
static void
-htcpClrReply(htcpDataHeader * dhdr, int purgeSucceeded, IPAddress &from)
+htcpClrReply(htcpDataHeader * dhdr, int purgeSucceeded, IpAddress &from)
{
htcpStuff stuff;
static char pkt[8192];
@@ -983,7 +983,7 @@
static void
-htcpHandleNop(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleNop(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
debugs(31, 3, "htcpHandleNop: Unimplemented");
}
@@ -1080,7 +1080,7 @@
static void
-htcpHandleTst(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleTst(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
debugs(31, 3, "htcpHandleTst: sz = " << sz);
@@ -1095,12 +1095,12 @@
static void
-htcpHandleTstResponse(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleTstResponse(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
htcpReplyData htcpReply;
cache_key *key = NULL;
- IPAddress *peer;
+ IpAddress *peer;
htcpDetail *d = NULL;
char *t;
@@ -1167,7 +1167,7 @@
static void
-htcpHandleTstRequest(htcpDataHeader * dhdr, char *buf, int sz, IPAddress &from)
+htcpHandleTstRequest(htcpDataHeader * dhdr, char *buf, int sz, IpAddress &from)
{
/* buf should be a SPECIFIER */
htcpSpecifier *s;
@@ -1222,21 +1222,21 @@
static void
-htcpHandleMon(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleMon(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
debugs(31, 3, "htcpHandleMon: Unimplemented");
}
static void
-htcpHandleSet(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleSet(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
debugs(31, 3, "htcpHandleSet: Unimplemented");
}
static void
-htcpHandleClr(htcpDataHeader * hdr, char *buf, int sz, IPAddress &from)
+htcpHandleClr(htcpDataHeader * hdr, char *buf, int sz, IpAddress &from)
{
htcpSpecifier *s;
/* buf[0/1] is reserved and reason */
@@ -1319,7 +1319,7 @@
* hands it off to other functions to break apart message-specific data.
*/
static void
-htcpHandleMsg(char *buf, int sz, IPAddress &from)
+htcpHandleMsg(char *buf, int sz, IpAddress &from)
{
htcpHeader htcpHdr;
htcpDataHeader hdr;
@@ -1439,7 +1439,7 @@
{
static char buf[8192];
int len;
- static IPAddress from;
+ static IpAddress from;
/* Receive up to 8191 bytes, leaving room for a null */
@@ -1469,7 +1469,7 @@
return;
}
- IPAddress incomingAddr = Config.Addrs.udp_incoming;
+ IpAddress incomingAddr = Config.Addrs.udp_incoming;
incomingAddr.SetPort(Config.Port.htcp);
enter_suid();
@@ -1488,7 +1488,7 @@
debugs(31, 1, "Accepting HTCP messages on port " << Config.Port.htcp << ", FD " << htcpInSocket << ".");
if (!Config.Addrs.udp_outgoing.IsNoAddr()) {
- IPAddress outgoingAddr = Config.Addrs.udp_outgoing;
+ IpAddress outgoingAddr = Config.Addrs.udp_outgoing;
outgoingAddr.SetPort(Config.Port.htcp);
enter_suid();
@@ -1516,7 +1516,7 @@
}
}
-void
+int
htcpQuery(StoreEntry * e, HttpRequest * req, peer * p)
{
cache_key *save_key;
@@ -1530,7 +1530,7 @@
http_state_flags flags;
if (htcpInSocket < 0)
- return;
+ return 0;
old_squid_format = p->options.htcp_oldsquid;
memset(&flags, '\0', sizeof(flags));
@@ -1555,7 +1555,7 @@
mb.clean();
if (!pktlen) {
debugs(31, 3, "htcpQuery: htcpBuildPacket() failed");
- return;
+ return -1;
}
htcpSend(pkt, (int) pktlen, p->in_addr);
@@ -1565,6 +1565,8 @@
storeKeyCopy(save_key, (const cache_key *)e->key);
queried_addr[stuff.msg_id % N_QUERIED_KEYS] = p->in_addr;
debugs(31, 3, "htcpQuery: key (" << save_key << ") " << storeKeyText(save_key));
+
+ return 1;
}
/*
diff -u -r -N squid-3.1.0.3/src/htcp.h squid-3.1.0.4/src/htcp.h
--- squid-3.1.0.3/src/htcp.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/htcp.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
/*
- * $Id: htcp.h,v 1.7 2008/02/26 21:49:35 amosjeffries Exp $
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
@@ -34,8 +31,10 @@
#define SQUID_HTCP_H
#if USE_HTCP
+
#include "HttpHeader.h"
-#include "IPAddress.h"
+
+class IpAddress;
/// \ingroup ServerProtocolHTCP
class HtcpReplyData
@@ -60,13 +59,25 @@
typedef class HtcpReplyData htcpReplyData;
/// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const IPAddress &);
+SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const IpAddress &);
/// \ingroup ServerProtocolHTCP
SQUIDCEXTERN void htcpInit(void);
-/// \ingroup ServerProtocolHTCP
-SQUIDCEXTERN void htcpQuery(StoreEntry * e, HttpRequest * req, peer * p);
+/**
+ * \ingroup ServerProtocolHTCP
+ *
+ * Generate and Send an HTCP query to the specified peer.
+ *
+ * \param e
+ * \param req
+ * \param p
+ * \retval 1 Successfully sent request.
+ * \retval 0 Unable to send request at this time. HTCP may be shutting down or starting up.
+ * Don't wait for a reply or count in stats as sent.
+ * \retval -1 Error sending request.
+ */
+SQUIDCEXTERN int htcpQuery(StoreEntry * e, HttpRequest * req, peer * p);
/// \ingroup ServerProtocolHTCP
SQUIDCEXTERN void htcpClear(StoreEntry * e, const char *uri, HttpRequest * req, const HttpRequestMethod &method, peer * p, htcp_clr_reason reason);
diff -u -r -N squid-3.1.0.3/src/http.cc squid-3.1.0.4/src/http.cc
--- squid-3.1.0.3/src/http.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/http.cc 2009-01-23 18:37:37.000000000 +1300
@@ -21,12 +21,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -65,7 +65,7 @@
catch (const std::exception &e) { \
debugs (11, 1, "Exception error:" << e.what()); \
status = false; \
- }
+ }
CBDATA_CLASS_INIT(HttpStateData);
@@ -98,7 +98,7 @@
url = entry->url();
HttpRequest * proxy_req = new HttpRequest(orig_request->method,
- orig_request->protocol, url);
+ orig_request->protocol, url);
proxy_req->SetHost(_peer->host);
@@ -134,7 +134,7 @@
*/
typedef CommCbMemFunT Dialer;
closeHandler = asyncCall(9, 5, "httpStateData::httpStateConnClosed",
- Dialer(this,&HttpStateData::httpStateConnClosed));
+ Dialer(this,&HttpStateData::httpStateConnClosed));
comm_add_close_handler(fd, closeHandler);
}
@@ -149,8 +149,8 @@
delete readBuf;
- if(httpChunkDecoder)
- delete httpChunkDecoder;
+ if (httpChunkDecoder)
+ delete httpChunkDecoder;
HTTPMSGUNLOCK(orig_request);
@@ -171,7 +171,7 @@
delete httpState;
}*/
-void
+void
HttpStateData::httpStateConnClosed(const CommCloseCbParams ¶ms)
{
debugs(11, 5, "httpStateFree: FD " << params.fd << ", httpState=" << params.data);
@@ -183,7 +183,7 @@
{
/* GET and HEAD are cachable. Others are not. */
- // TODO: replase to HttpRequestMethod::isCachable() ?
+ // TODO: replase to HttpRequestMethod::isCachable() ?
if (method != METHOD_GET && method != METHOD_HEAD)
return 0;
@@ -546,7 +546,7 @@
}
/*
- * For Vary, store the relevant request headers as
+ * For Vary, store the relevant request headers as
* virtual headers in the reply
* Returns false if the variance cannot be stored
*/
@@ -633,7 +633,8 @@
if (_peer)
_peer->stats.n_keepalives_recv++;
- if (Config.onoff.detect_broken_server_pconns && reply->bodySize(request->method) == -1) {
+ if (Config.onoff.detect_broken_server_pconns
+ && reply->bodySize(request->method) == -1 && !flags.chunked) {
debugs(11, 1, "keepaliveAccounting: Impossible keep-alive header from '" << entry->url() << "'" );
// debugs(11, 2, "GOT HTTP REPLY HDR:\n---------\n" << readBuf->content() << "\n----------" );
flags.keepalive_broken = 1;
@@ -672,51 +673,50 @@
HttpReply *newrep = new HttpReply;
const bool parsed = newrep->parse(readBuf, eof, &error);
- if(!parsed && readBuf->contentSize() > 5 && strncmp(readBuf->content(), "HTTP/", 5) != 0){
- MemBuf *mb;
- HttpReply *tmprep = new HttpReply;
- tmprep->sline.version = HttpVersion(1, 0);
- tmprep->sline.status = HTTP_OK;
- tmprep->header.putTime(HDR_DATE, squid_curtime);
- tmprep->header.putExt("X-Transformed-From", "HTTP/0.9");
- mb = tmprep->pack();
- newrep->parse(mb, eof, &error);
- delete tmprep;
- }
- else{
- if (!parsed && error > 0) { // unrecoverable parsing error
- debugs(11, 3, "processReplyHeader: Non-HTTP-compliant header: '" << readBuf->content() << "'");
- flags.headers_parsed = 1;
- newrep->sline.version = HttpVersion(1, 0);
- newrep->sline.status = error;
- HttpReply *vrep = setVirginReply(newrep);
- entry->replaceHttpReply(vrep);
- ctx_exit(ctx);
- return;
- }
-
- if (!parsed) { // need more data
- assert(!error);
- assert(!eof);
- delete newrep;
- ctx_exit(ctx);
- return;
- }
+ if (!parsed && readBuf->contentSize() > 5 && strncmp(readBuf->content(), "HTTP/", 5) != 0) {
+ MemBuf *mb;
+ HttpReply *tmprep = new HttpReply;
+ tmprep->sline.version = HttpVersion(1, 0);
+ tmprep->sline.status = HTTP_OK;
+ tmprep->header.putTime(HDR_DATE, squid_curtime);
+ tmprep->header.putExt("X-Transformed-From", "HTTP/0.9");
+ mb = tmprep->pack();
+ newrep->parse(mb, eof, &error);
+ delete tmprep;
+ } else {
+ if (!parsed && error > 0) { // unrecoverable parsing error
+ debugs(11, 3, "processReplyHeader: Non-HTTP-compliant header: '" << readBuf->content() << "'");
+ flags.headers_parsed = 1;
+ newrep->sline.version = HttpVersion(1, 0);
+ newrep->sline.status = error;
+ HttpReply *vrep = setVirginReply(newrep);
+ entry->replaceHttpReply(vrep);
+ ctx_exit(ctx);
+ return;
+ }
+
+ if (!parsed) { // need more data
+ assert(!error);
+ assert(!eof);
+ delete newrep;
+ ctx_exit(ctx);
+ return;
+ }
- debugs(11, 9, "GOT HTTP REPLY HDR:\n---------\n" << readBuf->content() << "\n----------");
+ debugs(11, 9, "GOT HTTP REPLY HDR:\n---------\n" << readBuf->content() << "\n----------");
- header_bytes_read = headersEnd(readBuf->content(), readBuf->contentSize());
- readBuf->consume(header_bytes_read);
+ header_bytes_read = headersEnd(readBuf->content(), readBuf->contentSize());
+ readBuf->consume(header_bytes_read);
}
flags.chunked = 0;
if (newrep->header.hasListMember(HDR_TRANSFER_ENCODING, "chunked", ',')) {
- flags.chunked = 1;
- httpChunkDecoder = new ChunkedCodingParser;
+ flags.chunked = 1;
+ httpChunkDecoder = new ChunkedCodingParser;
}
- if(!peerSupportsConnectionPinning())
- orig_request->flags.connection_auth_disabled = 1;
+ if (!peerSupportsConnectionPinning())
+ orig_request->flags.connection_auth_disabled = 1;
HttpReply *vrep = setVirginReply(newrep);
flags.headers_parsed = 1;
@@ -746,48 +746,48 @@
String header;
if (!_peer)
- return true;
-
- /*If this peer does not support connection pinning (authenticated
+ return true;
+
+ /*If this peer does not support connection pinning (authenticated
connections) return false
*/
if (!_peer->connection_auth)
- return false;
+ return false;
- /*The peer supports connection pinning and the http reply status
+ /*The peer supports connection pinning and the http reply status
is not unauthorized, so the related connection can be pinned
*/
if (rep->sline.status != HTTP_UNAUTHORIZED)
- return true;
-
- /*The server respond with HTTP_UNAUTHORIZED and the peer configured
- with "connection-auth=on" we know that the peer supports pinned
+ return true;
+
+ /*The server respond with HTTP_UNAUTHORIZED and the peer configured
+ with "connection-auth=on" we know that the peer supports pinned
connections
*/
if (_peer->connection_auth == 1)
- return true;
+ return true;
- /*At this point peer has configured with "connection-auth=auto"
- parameter so we need some extra checks to decide if we are going
+ /*At this point peer has configured with "connection-auth=auto"
+ parameter so we need some extra checks to decide if we are going
to allow pinned connections or not
*/
- /*if the peer configured with originserver just allow connection
+ /*if the peer configured with originserver just allow connection
pinning (squid 2.6 behaviour)
*/
if (_peer->options.originserver)
- return true;
+ return true;
/*if the connections it is already pinned it is OK*/
if (request->flags.pinned)
- return true;
-
- /*Allow pinned connections only if the Proxy-support header exists in
- reply and has in its list the "Session-Based-Authentication"
+ return true;
+
+ /*Allow pinned connections only if the Proxy-support header exists in
+ reply and has in its list the "Session-Based-Authentication"
which means that the peer supports connection pinning.
*/
if (!hdr->has(HDR_PROXY_SUPPORT))
- return false;
+ return false;
header = hdr->getStrOrList(HDR_PROXY_SUPPORT);
/* XXX This ought to be done in a case-insensitive manner */
@@ -949,12 +949,13 @@
if (eof) // already reached EOF
return COMPLETE_NONPERSISTENT_MSG;
- /* In chunked responce we do not know the content length but we are absolutelly
+ /** \par
+ * In chunked response we do not know the content length but we are absolutely
* sure about the end of response, so we are calling the statusIfComplete to
- * decide if we can be persistant
+ * decide if we can be persistant
*/
if (lastChunk && flags.chunked)
- return statusIfComplete();
+ return statusIfComplete();
const int64_t clen = vrep->bodySize(request->method);
@@ -964,7 +965,8 @@
if (clen < 0)
return INCOMPLETE_MSG;
- /* If the body size is known, we must wait until we've gotten all of it. */
+ /** \par
+ * If the body size is known, we must wait until we've gotten all of it. */
if (clen > 0) {
// old technique:
// if (entry->mem_obj->endOffset() < vrep->content_length + vrep->hdr_sz)
@@ -976,7 +978,8 @@
return INCOMPLETE_MSG;
}
- /* If there is no message body or we got it all, we can be persistent */
+ /** \par
+ * If there is no message body or we got it all, we can be persistent */
return statusIfComplete();
}
@@ -1007,7 +1010,7 @@
assert(fd == io.fd);
flags.do_next_read = 0;
-
+
debugs(11, 5, "httpReadReply: FD " << fd << ": len " << len << ".");
// Bail out early on COMM_ERR_CLOSING - close handlers will tidy up for us
@@ -1133,12 +1136,12 @@
if (s == HTTP_INVALID_HEADER && v != HttpVersion(0,9)) {
error = ERR_INVALID_RESP;
} else
- if (s == HTTP_HEADER_TOO_LARGE) {
- fwd->dontRetry(true);
- error = ERR_TOO_BIG;
- } else {
- return true; // done parsing, got reply, and no error
- }
+ if (s == HTTP_HEADER_TOO_LARGE) {
+ fwd->dontRetry(true);
+ error = ERR_TOO_BIG;
+ } else {
+ return true; // done parsing, got reply, and no error
+ }
} else {
// parsed headers but got no reply
error = ERR_INVALID_RESP;
@@ -1146,7 +1149,7 @@
} else {
assert(eof);
error = readBuf->hasContent() ?
- ERR_INVALID_RESP : ERR_ZERO_SIZE_OBJECT;
+ ERR_INVALID_RESP : ERR_ZERO_SIZE_OBJECT;
}
assert(error != ERR_NONE);
@@ -1204,7 +1207,7 @@
HttpStateData::processReplyBody()
{
AsyncCall::Pointer call;
- IPAddress client_addr;
+ IpAddress client_addr;
bool ispinned = false;
if (!flags.headers_parsed) {
@@ -1224,15 +1227,14 @@
* That means header content has been removed from readBuf and
* it contains only body data.
*/
- if(flags.chunked){
- if(!decodeAndWriteReplyBody()){
- flags.do_next_read = 0;
- serverComplete();
- return;
- }
- }
- else
- writeReplyBody();
+ if (flags.chunked) {
+ if (!decodeAndWriteReplyBody()) {
+ flags.do_next_read = 0;
+ serverComplete();
+ return;
+ }
+ } else
+ writeReplyBody();
if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
/*
@@ -1247,10 +1249,10 @@
debugs(11, 5, "processReplyBody: INCOMPLETE_MSG");
/* Wait for more data or EOF condition */
if (flags.keepalive_broken) {
- call = NULL;
+ call = NULL;
commSetTimeout(fd, 10, call);
} else {
- call = NULL;
+ call = NULL;
commSetTimeout(fd, Config.Timeout.read, call);
}
@@ -1260,11 +1262,11 @@
case COMPLETE_PERSISTENT_MSG:
debugs(11, 5, "processReplyBody: COMPLETE_PERSISTENT_MSG");
/* yes we have to clear all these! */
- call = NULL;
+ call = NULL;
commSetTimeout(fd, -1, call);
flags.do_next_read = 0;
- comm_remove_close_handler(fd, closeHandler);
+ comm_remove_close_handler(fd, closeHandler);
closeHandler = NULL;
fwd->unregister(fd);
@@ -1272,22 +1274,17 @@
client_addr = orig_request->client_addr;
- if (request->flags.pinned) {
- ispinned = true;
- } else if (request->flags.connection_auth && request->flags.auth_sent) {
- ispinned = true;
- }
-
- if (orig_request->pinnedConnection() && ispinned) {
- orig_request->pinnedConnection()->pinConnection(fd, orig_request, _peer,
- (request->flags.connection_auth != 0));
- } else if (_peer) {
- if (_peer->options.originserver)
- fwd->pconnPush(fd, _peer->name, orig_request->port, orig_request->GetHost(), client_addr);
- else
- fwd->pconnPush(fd, _peer->name, _peer->http_port, NULL, client_addr);
+ if (request->flags.pinned) {
+ ispinned = true;
+ } else if (request->flags.connection_auth && request->flags.auth_sent) {
+ ispinned = true;
+ }
+
+ if (orig_request->pinnedConnection() && ispinned) {
+ orig_request->pinnedConnection()->pinConnection(fd, orig_request, _peer,
+ (request->flags.connection_auth != 0));
} else {
- fwd->pconnPush(fd, request->GetHost(), request->port, NULL, client_addr);
+ fwd->pconnPush(fd, _peer, request, orig_request->GetHost(), client_addr);
}
fd = -1;
@@ -1321,18 +1318,18 @@
* its okay to read again.
*/
if (read_sz < 2) {
- if (flags.headers_parsed)
- return;
- else
- read_sz = 1024;
+ if (flags.headers_parsed)
+ return;
+ else
+ read_sz = 1024;
}
if (flags.do_next_read) {
flags.do_next_read = 0;
typedef CommCbMemFunT Dialer;
entry->delayAwareRead(fd, readBuf->space(read_sz), read_sz,
- asyncCall(11, 5, "HttpStateData::readReply",
- Dialer(this, &HttpStateData::readReply)));
+ asyncCall(11, 5, "HttpStateData::readReply",
+ Dialer(this, &HttpStateData::readReply)));
}
}
@@ -1376,7 +1373,7 @@
*/
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(11, 5, "HttpStateData::httpTimeout",
- TimeoutDialer(this,&HttpStateData::httpTimeout));
+ TimeoutDialer(this,&HttpStateData::httpTimeout));
commSetTimeout(fd, Config.Timeout.read, timeoutCall);
@@ -1391,7 +1388,7 @@
if (fd >= 0) {
fwd->unregister(fd);
- comm_remove_close_handler(fd, closeHandler);
+ comm_remove_close_handler(fd, closeHandler);
closeHandler = NULL;
comm_close(fd);
fd = -1;
@@ -1405,7 +1402,7 @@
}
/*
- * build request headers and append them to a given MemBuf
+ * build request headers and append them to a given MemBuf
* used by buildRequestPrefix()
* note: initialised the HttpHeader, the caller is responsible for Clean()-ing
*/
@@ -1475,29 +1472,29 @@
strFwd = hdr_in->getList(HDR_X_FORWARDED_FOR);
/** \pre Handle X-Forwarded-For */
- if(strcmp(opt_forwarded_for, "delete") != 0) {
- if(strcmp(opt_forwarded_for, "on") == 0) {
+ if (strcmp(opt_forwarded_for, "delete") != 0) {
+ if (strcmp(opt_forwarded_for, "on") == 0) {
/** If set to ON - append client IP or 'unknown'. */
strFwd = hdr_in->getList(HDR_X_FORWARDED_FOR);
- if( orig_request->client_addr.IsNoAddr() )
+ if ( orig_request->client_addr.IsNoAddr() )
strListAdd(&strFwd, "unknown", ',');
else
strListAdd(&strFwd, orig_request->client_addr.NtoA(ntoabuf, MAX_IPSTRLEN), ',');
- } else if(strcmp(opt_forwarded_for, "off") == 0) {
+ } else if (strcmp(opt_forwarded_for, "off") == 0) {
/** If set to OFF - append 'unknown'. */
strFwd = hdr_in->getList(HDR_X_FORWARDED_FOR);
strListAdd(&strFwd, "unknown", ',');
- } else if(strcmp(opt_forwarded_for, "transparent") == 0) {
+ } else if (strcmp(opt_forwarded_for, "transparent") == 0) {
/** If set to TRANSPARENT - pass through unchanged. */
strFwd = hdr_in->getList(HDR_X_FORWARDED_FOR);
- } else if(strcmp(opt_forwarded_for, "truncate") == 0) {
+ } else if (strcmp(opt_forwarded_for, "truncate") == 0) {
/** If set to TRUNCATE - drop existing list and replace with client IP or 'unknown'. */
- if( orig_request->client_addr.IsNoAddr() )
+ if ( orig_request->client_addr.IsNoAddr() )
strFwd = "unknown";
else
strFwd = orig_request->client_addr.NtoA(ntoabuf, MAX_IPSTRLEN);
}
- if(strFwd.size() > 0)
+ if (strFwd.size() > 0)
hdr_out->putStr(HDR_X_FORWARDED_FOR, strFwd.buf());
}
/** If set to DELETE - do not copy through. */
@@ -1603,7 +1600,14 @@
if (!cc)
cc = httpHdrCcCreate();
- if (!EBIT_TEST(cc->mask, CC_MAX_AGE)) {
+#if 0 /* see bug 2330 */
+ /* Set no-cache if determined needed but not found */
+ if (orig_request->flags.nocache)
+ EBIT_SET(cc->mask, CC_NO_CACHE);
+#endif
+
+ /* Add max-age only without no-cache */
+ if (!EBIT_TEST(cc->mask, CC_MAX_AGE) && !EBIT_TEST(cc->mask, CC_NO_CACHE)) {
const char *url =
entry ? entry->url() : urlCanonical(orig_request);
httpHdrCcSetMaxAge(cc, getMaxAge(url));
@@ -1612,10 +1616,6 @@
assert(strstr(url, request->urlpath.buf()));
}
- /* Set no-cache if determined needed but not found */
- if (orig_request->flags.nocache && !hdr_in->has(HDR_PRAGMA))
- EBIT_SET(cc->mask, CC_NO_CACHE);
-
/* Enforce sibling relations */
if (flags.only_if_cached)
EBIT_SET(cc->mask, CC_ONLY_IF_CACHED);
@@ -1698,7 +1698,7 @@
* went through our redirector and the admin configured
* 'redir_rewrites_host' to be off.
*/
- if (orig_request->peer_domain)
+ if (orig_request->peer_domain)
hdr_out->putStr(HDR_HOST, orig_request->peer_domain);
else if (request->flags.redirected && !Config.onoff.redir_rewrites_host)
hdr_out->addEntry(e->clone());
@@ -1794,9 +1794,9 @@
|| orig_request->range->offsetLimitExceeded() || orig_request->flags.connection_auth)
result = false;
- debugs(11, 8, "decideIfWeDoRanges: range specs: " <<
- orig_request->range << ", cachable: " <<
- orig_request->flags.cachable << "; we_do_ranges: " << result);
+ debugs(11, 8, "decideIfWeDoRanges: range specs: " <<
+ orig_request->range << ", cachable: " <<
+ orig_request->flags.cachable << "; we_do_ranges: " << result);
return result;
}
@@ -1821,8 +1821,8 @@
HttpHeader hdr(hoRequest);
Packer p;
httpBuildRequestHeader(request, orig_request, entry, &hdr, flags);
-
- if (request->flags.pinned && request->flags.connection_auth)
+
+ if (request->flags.pinned && request->flags.connection_auth)
request->flags.auth_sent = 1;
else if (hdr.has(HDR_AUTHORIZATION))
request->flags.auth_sent = 1;
@@ -1846,7 +1846,7 @@
debugs(11, 5, "httpSendRequest: FD " << fd << ", request " << request << ", this " << this << ".");
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(11, 5, "HttpStateData::httpTimeout",
- TimeoutDialer(this,&HttpStateData::httpTimeout));
+ TimeoutDialer(this,&HttpStateData::httpTimeout));
commSetTimeout(fd, Config.Timeout.lifetime, timeoutCall);
flags.do_next_read = 1;
maybeReadVirginBody();
@@ -1854,14 +1854,14 @@
if (orig_request->body_pipe != NULL) {
if (!startRequestBodyFlow()) // register to receive body data
return false;
- typedef CommCbMemFunT Dialer;
+ typedef CommCbMemFunT Dialer;
Dialer dialer(this, &HttpStateData::sentRequestBody);
- requestSender = asyncCall(11,5, "HttpStateData::sentRequestBody", dialer);
+ requestSender = asyncCall(11,5, "HttpStateData::sentRequestBody", dialer);
} else {
assert(!requestBodySource);
- typedef CommCbMemFunT Dialer;
+ typedef CommCbMemFunT Dialer;
Dialer dialer(this, &HttpStateData::sendComplete);
- requestSender = asyncCall(11,5, "HttpStateData::SendComplete", dialer);
+ requestSender = asyncCall(11,5, "HttpStateData::SendComplete", dialer);
}
if (_peer != NULL) {
@@ -1881,7 +1881,7 @@
* Is keep-alive okay for all request methods?
*/
if (orig_request->flags.must_keepalive)
- flags.keepalive = 1;
+ flags.keepalive = 1;
else if (!Config.onoff.server_pconns)
flags.keepalive = 0;
else if (_peer == NULL)
@@ -1944,21 +1944,21 @@
if (!Config.accessList.brokenPosts) {
debugs(11, 5, "doneSendingRequestBody: No brokenPosts list");
- CommIoCbParams io(NULL);
- io.fd=fd;
- io.flag=COMM_OK;
- sendComplete(io);
+ CommIoCbParams io(NULL);
+ io.fd=fd;
+ io.flag=COMM_OK;
+ sendComplete(io);
} else if (!ch.fastCheck()) {
debugs(11, 5, "doneSendingRequestBody: didn't match brokenPosts");
- CommIoCbParams io(NULL);
- io.fd=fd;
- io.flag=COMM_OK;
- sendComplete(io);
+ CommIoCbParams io(NULL);
+ io.fd=fd;
+ io.flag=COMM_OK;
+ sendComplete(io);
} else {
debugs(11, 2, "doneSendingRequestBody: matched brokenPosts");
- typedef CommCbMemFunT Dialer;
+ typedef CommCbMemFunT Dialer;
Dialer dialer(this, &HttpStateData::sendComplete);
- AsyncCall::Pointer call= asyncCall(11,5, "HttpStateData::SendComplete", dialer);
+ AsyncCall::Pointer call= asyncCall(11,5, "HttpStateData::SendComplete", dialer);
comm_write(fd, "\r\n", 2, call);
}
}
diff -u -r -N squid-3.1.0.3/src/HttpHeaderTools.cc squid-3.1.0.4/src/HttpHeaderTools.cc
--- squid-3.1.0.3/src/HttpHeaderTools.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/HttpHeaderTools.cc 2009-01-23 18:37:35.000000000 +1300
@@ -141,7 +141,7 @@
}
-/* wrapper arrounf PutContRange */
+/** wrapper arrounf PutContRange */
void
httpHeaderAddContRange(HttpHeader * hdr, HttpHdrRangeSpec spec, int64_t ent_len)
{
@@ -153,7 +153,7 @@
}
-/*
+/**
* return true if a given directive is found in at least one of
* the "connection" header-fields note: if HDR_PROXY_CONNECTION is
* present we ignore HDR_CONNECTION.
diff -u -r -N squid-3.1.0.3/src/HttpRequest.cc squid-3.1.0.4/src/HttpRequest.cc
--- squid-3.1.0.3/src/HttpRequest.cc 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/HttpRequest.cc 2009-01-23 18:37:35.000000000 +1300
@@ -21,12 +21,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -104,9 +104,9 @@
void
HttpRequest::clean()
{
- // we used to assert that the pipe is NULL, but now the request only
+ // we used to assert that the pipe is NULL, but now the request only
// points to a pipe that is owned and initiated by another object.
- body_pipe = NULL;
+ body_pipe = NULL;
AUTHUSERREQUESTUNLOCK(auth_user_request, "request");
@@ -128,8 +128,8 @@
range = NULL;
}
- if(pinned_connection)
- cbdataReferenceDone(pinned_connection);
+ if (pinned_connection)
+ cbdataReferenceDone(pinned_connection);
tag.clean();
@@ -166,20 +166,20 @@
if (auth_user_request) {
copy->auth_user_request = auth_user_request;
AUTHUSERREQUESTLOCK(copy->auth_user_request, "HttpRequest::clone");
- }
+ }
copy->port = port;
// urlPath handled in ctor
- copy->canonical = canonical ? xstrdup(canonical) : NULL;
-
+ copy->canonical = canonical ? xstrdup(canonical) : NULL;
+
// This may be too conservative for the 204 No Content case
// may eventually need cloneNullAdaptationImmune() for that.
copy->flags = flags.cloneAdaptationImmune();
- copy->range = range ? new HttpHdrRange(*range) : NULL;
- copy->ims = ims;
- copy->imslen = imslen;
- copy->max_forwards = max_forwards;
+ copy->range = range ? new HttpHdrRange(*range) : NULL;
+ copy->ims = ims;
+ copy->imslen = imslen;
+ copy->max_forwards = max_forwards;
copy->client_addr = client_addr;
copy->my_addr = my_addr;
copy->hier = hier; // Is it safe to copy? Should we?
@@ -188,7 +188,7 @@
// XXX: what to do with copy->peer_login?
- copy->lastmod = lastmod;
+ copy->lastmod = lastmod;
copy->vary_headers = vary_headers ? xstrdup(vary_headers) : NULL;
// XXX: what to do with copy->peer_domain?
@@ -326,7 +326,7 @@
header.len + 2;
}
-/*
+/**
* Returns true if HTTP allows us to pass this header on. Does not
* check anonymizer (aka header_access) configuration.
*/
@@ -400,7 +400,8 @@
}
bool
-HttpRequest::bodyNibbled() const {
+HttpRequest::bodyNibbled() const
+{
return body_pipe != NULL && body_pipe->consumedSize() > 0;
}
@@ -498,9 +499,9 @@
* The below looks questionable: what non HTTP protocols use connect,
* trace, put and post? RC
*/
-
+
if (!method.isCacheble())
- return false;
+ return false;
/*
* XXX POST may be cached sometimes.. ignored
@@ -518,9 +519,9 @@
bool HttpRequest::inheritProperties(const HttpMsg *aMsg)
{
const HttpRequest* aReq = dynamic_cast(aMsg);
- if(!aReq)
- return false;
-
+ if (!aReq)
+ return false;
+
client_addr = aReq->client_addr;
my_addr = aReq->my_addr;
@@ -530,11 +531,11 @@
if (aReq->auth_user_request) {
auth_user_request = aReq->auth_user_request;
- AUTHUSERREQUESTLOCK(auth_user_request, "inheritProperties");
+ AUTHUSERREQUESTLOCK(auth_user_request, "inheritProperties");
}
- if(aReq->pinned_connection) {
- pinned_connection = cbdataReference(aReq->pinned_connection);
+ if (aReq->pinned_connection) {
+ pinned_connection = cbdataReference(aReq->pinned_connection);
}
return true;
}
diff -u -r -N squid-3.1.0.3/src/HttpRequest.h squid-3.1.0.4/src/HttpRequest.h
--- squid-3.1.0.3/src/HttpRequest.h 2008-12-05 16:09:33.000000000 +1300
+++ squid-3.1.0.4/src/HttpRequest.h 2009-01-23 18:37:35.000000000 +1300
@@ -105,7 +105,7 @@
ConnStateData *pinned_connection;
public:
- IPAddress host_addr;
+ IpAddress host_addr;
AuthUserRequest *auth_user_request;
@@ -125,13 +125,13 @@
int max_forwards;
- IPAddress client_addr;
+ IpAddress client_addr;
#if FOLLOW_X_FORWARDED_FOR
- IPAddress indirect_client_addr;
+ IpAddress indirect_client_addr;
#endif /* FOLLOW_X_FORWARDED_FOR */
- IPAddress my_addr;
+ IpAddress my_addr;
HierarchyLogEntry hier;
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPModXact.cc squid-3.1.0.4/src/ICAP/ICAPModXact.cc
--- squid-3.1.0.3/src/ICAP/ICAPModXact.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPModXact.cc 2009-01-23 18:37:36.000000000 +1300
@@ -38,13 +38,13 @@
}
ICAPModXact::ICAPModXact(Adaptation::Initiator *anInitiator, HttpMsg *virginHeader,
- HttpRequest *virginCause, ICAPServiceRep::Pointer &aService):
- AsyncJob("ICAPModXact"),
- ICAPXaction("ICAPModXact", anInitiator, aService),
- icapReply(NULL),
- virginConsumed(0),
- bodyParser(NULL),
- canStartBypass(false) // too early
+ HttpRequest *virginCause, ICAPServiceRep::Pointer &aService):
+ AsyncJob("ICAPModXact"),
+ ICAPXaction("ICAPModXact", anInitiator, aService),
+ icapReply(NULL),
+ virginConsumed(0),
+ bodyParser(NULL),
+ canStartBypass(false) // too early
{
assert(virginHeader);
@@ -88,7 +88,7 @@
debugs(93, 7, "ICAPModXact will wait for the ICAP service" << status());
state.serviceWaiting = true;
AsyncCall::Pointer call = asyncCall(93,5, "ICAPModXact::noteServiceReady",
- MemFun(this, &ICAPModXact::noteServiceReady));
+ MemFun(this, &ICAPModXact::noteServiceReady));
service().callWhenReady(call);
}
@@ -152,12 +152,12 @@
if (preview.enabled())
state.writing = preview.done() ? State::writingPaused : State::writingPreview;
else
- if (virginBody.expected())
- state.writing = State::writingPrime;
- else {
- stopWriting(true);
- return;
- }
+ if (virginBody.expected())
+ state.writing = State::writingPrime;
+ else {
+ stopWriting(true);
+ return;
+ }
writeMore();
}
@@ -203,7 +203,7 @@
void ICAPModXact::writePreviewBody()
{
debugs(93, 8, HERE << "will write Preview body from " <<
- virgin.body_pipe << status());
+ virgin.body_pipe << status());
Must(state.writing == State::writingPreview);
Must(virgin.body_pipe != NULL);
@@ -307,7 +307,7 @@
// did the activity reached the end of the virgin body?
bool ICAPModXact::virginBodyEndReached(const VirginBodyAct &act) const
{
- return
+ return
!act.active() || // did all (assuming it was originally planned)
!virgin.body_pipe->expectMoreAfter(act.offset()); // wont have more
}
@@ -347,11 +347,11 @@
BodyPipe &bp = *virgin.body_pipe;
// Why > 2? HttpState does not use the last bytes in the buffer
- // because delayAwareRead() is arguably broken. See
+ // because delayAwareRead() is arguably broken. See
// HttpStateData::maybeReadVirginBody for more details.
if (canStartBypass && bp.buf().spaceSize() > 2) {
// Postponing may increase memory footprint and slow the HTTP side
- // down. Not postponing may increase the number of ICAP errors
+ // down. Not postponing may increase the number of ICAP errors
// if the ICAP service fails. We may also use "potential" space to
// postpone more aggressively. Should the trade-off be configurable?
debugs(93, 8, HERE << "postponing consumption from " << bp.status());
@@ -363,9 +363,9 @@
uint64_t offset = end;
debugs(93, 9, HERE << "max virgin consumption offset=" << offset <<
- " acts " << virginBodyWriting.active() << virginBodySending.active() <<
- " consumed=" << virginConsumed <<
- " from " << virgin.body_pipe->status());
+ " acts " << virginBodyWriting.active() << virginBodySending.active() <<
+ " consumed=" << virginConsumed <<
+ " from " << virgin.body_pipe->status());
if (virginBodyWriting.active())
offset = XMIN(virginBodyWriting.offset(), offset);
@@ -462,7 +462,7 @@
// do not fill readBuf if we have no space to store the result
if (adapted.body_pipe != NULL &&
- !adapted.body_pipe->buf().hasPotentialSpace()) {
+ !adapted.body_pipe->buf().hasPotentialSpace()) {
debugs(93,3,HERE << "not reading because ICAP reply pipe is full");
return;
}
@@ -489,14 +489,14 @@
const size_t sizeMax = virginContentSize(virginBodySending);
debugs(93,5, HERE << "will echo up to " << sizeMax << " bytes from " <<
- virgin.body_pipe->status());
+ virgin.body_pipe->status());
debugs(93,5, HERE << "will echo up to " << sizeMax << " bytes to " <<
- adapted.body_pipe->status());
+ adapted.body_pipe->status());
if (sizeMax > 0) {
const size_t size = adapted.body_pipe->putMoreData(virginContentData(virginBodySending), sizeMax);
debugs(93,5, HERE << "echoed " << size << " out of " << sizeMax <<
- " bytes");
+ " bytes");
virginBodySending.progress(size);
virginConsume();
disableBypass("echoed content");
@@ -507,8 +507,8 @@
stopSending(true);
} else {
debugs(93, 5, "ICAPModXact has " <<
- virgin.body_pipe->buf().contentSize() << " bytes " <<
- "and expects more to echo" << status());
+ virgin.body_pipe->buf().contentSize() << " bytes " <<
+ "and expects more to echo" << status());
// TODO: timeout if virgin or adapted pipes are broken
}
}
@@ -575,10 +575,9 @@
try {
debugs(93, 3, "bypassing ICAPModXact::" << inCall << " exception: " <<
- e.what() << ' ' << status());
+ e.what() << ' ' << status());
bypassFailure();
- }
- catch (const std::exception &bypassE) {
+ } catch (const std::exception &bypassE) {
ICAPXaction::callException(bypassE);
}
}
@@ -785,10 +784,9 @@
if (dynamic_cast(oldHead)) {
HttpRequest *newR = new HttpRequest;
newHead = newR;
- }
- else if (dynamic_cast(oldHead)) {
- HttpReply *newRep = new HttpReply;
- newHead = newRep;
+ } else if (dynamic_cast(oldHead)) {
+ HttpReply *newRep = new HttpReply;
+ newHead = newRep;
}
Must(newHead);
newHead->inheritProperties(oldHead);
@@ -805,12 +803,12 @@
httpBuf.clean();
debugs(93, 7, "ICAPModXact cloned virgin message " << oldHead << " to " <<
- newHead);
+ newHead);
// setup adapted body pipe if needed
if (oldHead->body_pipe != NULL) {
debugs(93, 7, HERE << "will echo virgin body from " <<
- oldHead->body_pipe);
+ oldHead->body_pipe);
if (!virginBodySending.active())
virginBodySending.plan(); // will throw if not possible
state.sending = State::sendingVirgin;
@@ -822,7 +820,7 @@
if (oldHead->body_pipe->bodySizeKnown())
adapted.body_pipe->setBodySize(oldHead->body_pipe->bodySize());
debugs(93, 7, HERE << "will echo virgin body to " <<
- adapted.body_pipe);
+ adapted.body_pipe);
} else {
debugs(93, 7, HERE << "no virgin body to echo");
stopSending(true);
@@ -850,15 +848,15 @@
if (dynamic_cast(adapted.header)) {
const HttpRequest *oldR = dynamic_cast(virgin.header);
Must(oldR);
- // TODO: the adapted request did not really originate from the
- // client; give proxy admin an option to prevent copying of
+ // TODO: the adapted request did not really originate from the
+ // client; give proxy admin an option to prevent copying of
// sensitive client information here. See the following thread:
// http://www.squid-cache.org/mail-archive/squid-dev/200703/0040.html
}
- // Maybe adapted.header==NULL if HttpReply and have Http 0.9 ....
- if(adapted.header)
- adapted.header->inheritProperties(virgin.header);
+ // Maybe adapted.header==NULL if HttpReply and have Http 0.9 ....
+ if (adapted.header)
+ adapted.header->inheritProperties(virgin.header);
}
decideOnParsingBody();
@@ -886,7 +884,8 @@
return true;
}
-void ICAPModXact::decideOnParsingBody() {
+void ICAPModXact::decideOnParsingBody()
+{
if (gotEncapsulated("res-body") || gotEncapsulated("req-body")) {
debugs(93, 5, HERE << "expecting a body");
state.parsing = State::psBody;
@@ -976,7 +975,7 @@
echoMore();
}
-// body producer aborted, but the initiator may still want to know
+// body producer aborted, but the initiator may still want to know
// the answer, even though the HTTP message has been truncated
void ICAPModXact::noteBodyProducerAborted(BodyPipe::Pointer)
{
@@ -989,7 +988,7 @@
echoMore();
}
-// adapted body consumer wants more adapted data and
+// adapted body consumer wants more adapted data and
// possibly freed some buffer space
void ICAPModXact::noteMoreBodySpaceAvailable(BodyPipe::Pointer)
{
@@ -1039,13 +1038,13 @@
// we must forward "Proxy-Authenticate" and "Proxy-Authorization"
// as ICAP headers.
- if (virgin.header->header.has(HDR_PROXY_AUTHENTICATE))
- buf.Printf("Proxy-Authenticate: %s\r\n",
- virgin.header->header.getByName("Proxy-Authenticate").buf());
-
- if (virgin.header->header.has(HDR_PROXY_AUTHORIZATION))
- buf.Printf("Proxy-Authorization: %s\r\n",
- virgin.header->header.getByName("Proxy-Authorization").buf());
+ if (virgin.header->header.has(HDR_PROXY_AUTHENTICATE))
+ buf.Printf("Proxy-Authenticate: %s\r\n",
+ virgin.header->header.getByName("Proxy-Authenticate").buf());
+
+ if (virgin.header->header.has(HDR_PROXY_AUTHORIZATION))
+ buf.Printf("Proxy-Authorization: %s\r\n",
+ virgin.header->header.getByName("Proxy-Authorization").buf());
buf.Printf("Encapsulated: ");
@@ -1057,8 +1056,8 @@
ICAP::Method m = s.method;
const HttpRequest *request = virgin.cause ?
- virgin.cause :
- dynamic_cast(virgin.header);
+ virgin.cause :
+ dynamic_cast(virgin.header);
// to simplify, we could assume that request is always available
@@ -1068,8 +1067,8 @@
if (ICAP::methodRespmod == m)
encapsulateHead(buf, "req-hdr", httpBuf, request);
else
- if (ICAP::methodReqmod == m)
- encapsulateHead(buf, "req-hdr", httpBuf, virgin.header);
+ if (ICAP::methodReqmod == m)
+ encapsulateHead(buf, "req-hdr", httpBuf, virgin.header);
}
if (ICAP::methodRespmod == m)
@@ -1118,13 +1117,14 @@
httpBuf.clean();
}
-void ICAPModXact::makeUsernameHeader(const HttpRequest *request, MemBuf &buf) {
+void ICAPModXact::makeUsernameHeader(const HttpRequest *request, MemBuf &buf)
+{
if (const AuthUserRequest *auth = request->auth_user_request) {
if (char const *name = auth->username()) {
const char *value = TheICAPConfig.client_username_encode ?
- base64_encode(name) : name;
+ base64_encode(name) : name;
buf.Printf("%s: %s\r\n", TheICAPConfig.client_username_header,
- value);
+ value);
}
}
}
@@ -1136,29 +1136,28 @@
// begin cloning
HttpMsg *headClone = NULL;
-
+
if (const HttpRequest* old_request = dynamic_cast(head)) {
HttpRequest* new_request = new HttpRequest;
urlParse(old_request->method, old_request->canonical,new_request);
new_request->http_ver = old_request->http_ver;
headClone = new_request;
- }
- else if (const HttpReply *old_reply = dynamic_cast(head)) {
+ } else if (const HttpReply *old_reply = dynamic_cast(head)) {
HttpReply* new_reply = new HttpReply;
new_reply->sline = old_reply->sline;
headClone = new_reply;
}
-
+
Must(headClone);
headClone->inheritProperties(head);
-
+
HttpHeaderPos pos = HttpHeaderInitPos;
HttpHeaderEntry* p_head_entry = NULL;
while (NULL != (p_head_entry = head->header.getEntry(&pos)) )
headClone->header.addEntry(p_head_entry->clone());
// end cloning
-
+
// remove all hop-by-hop headers from the clone
headClone->header.delById(HDR_PROXY_AUTHENTICATE);
headClone->header.removeHopByHopEntries();
@@ -1186,8 +1185,8 @@
}
const HttpRequest *request = virgin.cause ?
- virgin.cause :
- dynamic_cast(virgin.header);
+ virgin.cause :
+ dynamic_cast(virgin.header);
const String urlPath = request ? request->urlpath : String();
size_t wantedSize;
if (!service().wantsPreview(urlPath, wantedSize)) {
@@ -1205,8 +1204,8 @@
if (!virginBody.expected())
ad = 0;
else
- if (virginBody.knownSize())
- ad = XMIN(static_cast(ad), virginBody.size()); // not more than we have
+ if (virginBody.knownSize())
+ ad = XMIN(static_cast(ad), virginBody.size()); // not more than we have
debugs(93, 5, "ICAPModXact should offer " << ad << "-byte preview " <<
"(service wanted " << wantedSize << ")");
@@ -1307,7 +1306,7 @@
buf.Printf("S(%d)", state.sending);
if (canStartBypass)
- buf.append("Y", 1);
+ buf.append("Y", 1);
}
void ICAPModXact::fillDoneStatus(MemBuf &buf) const
@@ -1356,17 +1355,17 @@
if (virgin.cause)
method = virgin.cause->method;
else
- if (HttpRequest *req = dynamic_cast(msg))
- method = req->method;
- else
- method = METHOD_NONE;
+ if (HttpRequest *req = dynamic_cast(msg))
+ method = req->method;
+ else
+ method = METHOD_NONE;
int64_t size;
// expectingBody returns true for zero-sized bodies, but we will not
// get a pipe for that body, so we treat the message as bodyless
if (method != METHOD_NONE && msg->expectingBody(method, size) && size) {
- debugs(93, 6, "ICAPModXact expects virgin body from " <<
- virgin.body_pipe << "; size: " << size);
+ debugs(93, 6, "ICAPModXact expects virgin body from " <<
+ virgin.body_pipe << "; size: " << size);
virginBody.expect(size);
virginBodyWriting.plan();
@@ -1385,13 +1384,14 @@
}
}
-void ICAPModXact::makeAdaptedBodyPipe(const char *what) {
+void ICAPModXact::makeAdaptedBodyPipe(const char *what)
+{
Must(!adapted.body_pipe);
Must(!adapted.header->body_pipe);
adapted.header->body_pipe = new BodyPipe(this);
adapted.body_pipe = adapted.header->body_pipe;
debugs(93, 7, HERE << "will supply " << what << " via " <<
- adapted.body_pipe << " pipe");
+ adapted.body_pipe << " pipe");
}
@@ -1501,13 +1501,13 @@
theWritten += size;
- Must(theWritten <= theAd);
+ Must(theWritten <= theAd);
- if (wroteEof)
- theState = stIeof; // written size is irrelevant
- else
- if (theWritten >= theAd)
- theState = stDone;
+ if (wroteEof)
+ theState = stIeof; // written size is irrelevant
+ else
+ if (theWritten >= theAd)
+ theState = stDone;
}
bool ICAPModXact::fillVirginHttpHeader(MemBuf &mb) const
@@ -1524,8 +1524,8 @@
/* ICAPModXactLauncher */
ICAPModXactLauncher::ICAPModXactLauncher(Adaptation::Initiator *anInitiator, HttpMsg *virginHeader, HttpRequest *virginCause, Adaptation::ServicePointer aService):
- AsyncJob("ICAPModXactLauncher"),
- ICAPLauncher("ICAPModXactLauncher", anInitiator, aService)
+ AsyncJob("ICAPModXactLauncher"),
+ ICAPLauncher("ICAPModXactLauncher", anInitiator, aService)
{
virgin.setHeader(virginHeader);
virgin.setCause(virginCause);
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPModXact.h squid-3.1.0.4/src/ICAP/ICAPModXact.h
--- squid-3.1.0.3/src/ICAP/ICAPModXact.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPModXact.h 2009-01-23 18:37:36.000000000 +1300
@@ -19,12 +19,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -72,7 +72,7 @@
int64_t theData; // combines expectation and size info to save RAM
};
-// Virgin body may be used for two activities: (a) writing preview or prime
+// Virgin body may be used for two activities: (a) writing preview or prime
// body to the ICAP server and (b) sending the body back in the echo mode.
// Both activities use the same BodyPipe and may be active at the same time.
// This class is used to maintain the state of body writing or sending
@@ -274,15 +274,16 @@
bool doneWriting() const { return writing == writingReallyDone; }
// will not use virgin.body_pipe
- bool doneConsumingVirgin() const { return writing >= writingAlmostDone
- && (sending == sendingAdapted || sending == sendingDone); }
+ bool doneConsumingVirgin() const {
+ return writing >= writingAlmostDone
+ && (sending == sendingAdapted || sending == sendingDone);
+ }
// parsed entire ICAP response from the ICAP server
bool doneParsing() const { return parsing == psDone; }
// is parsing ICAP or HTTP headers read from the ICAP server
- bool parsingHeaders() const
- {
+ bool parsingHeaders() const {
return parsing == psIcapHeader ||
parsing == psHttpHeader;
}
@@ -291,18 +292,20 @@
// measures ICAP request writing progress
enum Writing { writingInit, writingConnect, writingHeaders,
- writingPreview, writingPaused, writingPrime,
- writingAlmostDone, // waiting for the last write() call to finish
- writingReallyDone } writing;
+ writingPreview, writingPaused, writingPrime,
+ writingAlmostDone, // waiting for the last write() call to finish
+ writingReallyDone
+ } writing;
enum Sending { sendingUndecided, sendingVirgin, sendingAdapted,
- sendingDone } sending;
+ sendingDone
+ } sending;
} state;
CBDATA_CLASS2(ICAPModXact);
};
-// An ICAPLauncher that stores ICAPModXact construction info and
+// An ICAPLauncher that stores ICAPModXact construction info and
// creates ICAPModXact when needed
class ICAPModXactLauncher: public ICAPLauncher
{
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPOptions.cc squid-3.1.0.4/src/ICAP/ICAPOptions.cc
--- squid-3.1.0.3/src/ICAP/ICAPOptions.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPOptions.cc 2009-01-23 18:37:36.000000000 +1300
@@ -43,7 +43,7 @@
return xferIgnore;
debugs(93,7, "ICAPOptions url " << urlPath << " matches no extensions; " <<
- "using default: " << theTransfers.byDefault->name);
+ "using default: " << theTransfers.byDefault->name);
return theTransfers.byDefault->kind;
}
@@ -141,7 +141,7 @@
if (foundStar) {
theTransfers.byDefault = &list;
debugs(93,5, "ICAPOptions::cfgTransferList: " <<
- "set default transfer to " << list.name);
+ "set default transfer to " << list.name);
}
list.report(5, "ICAPOptions::cfgTransferList: ");
@@ -151,18 +151,22 @@
/* ICAPOptions::TransferList */
ICAPOptions::TransferList::TransferList(): extensions(NULL), name(NULL),
- kind(xferNone) {
+ kind(xferNone)
+{
};
-ICAPOptions::TransferList::~TransferList() {
+ICAPOptions::TransferList::~TransferList()
+{
wordlistDestroy(&extensions);
};
-void ICAPOptions::TransferList::add(const char *extension) {
+void ICAPOptions::TransferList::add(const char *extension)
+{
wordlistAdd(&extensions, extension);
};
-bool ICAPOptions::TransferList::matches(const String &urlPath) const {
+bool ICAPOptions::TransferList::matches(const String &urlPath) const
+{
const int urlLen = urlPath.size();
for (wordlist *e = extensions; e; e = e->next) {
// optimize: store extension lengths
@@ -173,9 +177,9 @@
const int eOff = urlLen - eLen;
// RFC 3507 examples imply that extensions come without leading '.'
if (urlPath.buf()[eOff-1] == '.' &&
- strcmp(urlPath.buf() + eOff, e->key) == 0) {
+ strcmp(urlPath.buf() + eOff, e->key) == 0) {
debugs(93,7, "ICAPOptions url " << urlPath << " matches " <<
- name << " extension " << e->key);
+ name << " extension " << e->key);
return true;
}
}
@@ -184,7 +188,8 @@
return false;
}
-void ICAPOptions::TransferList::parse(const String &buf, bool &foundStar) {
+void ICAPOptions::TransferList::parse(const String &buf, bool &foundStar)
+{
foundStar = false;
const char *item;
@@ -198,7 +203,8 @@
}
}
-void ICAPOptions::TransferList::report(int level, const char *prefix) const {
+void ICAPOptions::TransferList::report(int level, const char *prefix) const
+{
if (extensions) {
for (wordlist *e = extensions; e; e = e->next)
debugs(93,level, prefix << name << ": " << e->key);
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPServiceRep.cc squid-3.1.0.4/src/ICAP/ICAPServiceRep.cc
--- squid-3.1.0.3/src/ICAP/ICAPServiceRep.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPServiceRep.cc 2009-01-23 18:37:36.000000000 +1300
@@ -39,11 +39,11 @@
void
ICAPServiceRep::finalize()
{
- Adaptation::Service::finalize();
+ Adaptation::Service::finalize();
assert(self != NULL);
// use /etc/services or default port if needed
- const bool have_port = cfg().port >= 0;
+ const bool have_port = cfg().port >= 0;
if (!have_port) {
struct servent *serv = getservbyname("icap", "tcp");
@@ -67,25 +67,27 @@
// TODO: it would be nice to invalidate cbdata(this) when not destroyed
}
-void ICAPServiceRep::noteFailure() {
+void ICAPServiceRep::noteFailure()
+{
++theSessionFailures;
- debugs(93,4, theSessionFailures << " ICAPService failures, out of " <<
- TheICAPConfig.service_failure_limit << " allowed " << status());
+ debugs(93,4, theSessionFailures << " ICAPService failures, out of " <<
+ TheICAPConfig.service_failure_limit << " allowed " << status());
if (isSuspended)
return;
if (TheICAPConfig.service_failure_limit >= 0 &&
- theSessionFailures > TheICAPConfig.service_failure_limit)
+ theSessionFailures > TheICAPConfig.service_failure_limit)
suspend("too many failures");
// TODO: Should bypass setting affect how much Squid tries to talk to
- // the ICAP service that is currently unusable and is likely to remain
- // so for some time? The current code says "no". Perhaps the answer
+ // the ICAP service that is currently unusable and is likely to remain
+ // so for some time? The current code says "no". Perhaps the answer
// should be configurable.
}
-void ICAPServiceRep::suspend(const char *reason) {
+void ICAPServiceRep::suspend(const char *reason)
+{
if (isSuspended) {
debugs(93,4, "keeping ICAPService suspended, also for " << reason);
} else {
@@ -101,7 +103,8 @@
return theLastUpdate != 0;
}
-bool ICAPServiceRep::hasOptions() const {
+bool ICAPServiceRep::hasOptions() const
+{
return theOptions && theOptions->valid() && theOptions->fresh();
}
@@ -183,8 +186,8 @@
while (!theClients.empty()) {
Client i = theClients.pop_back();
- ScheduleCallHere(i.callback);
- i.callback = 0;
+ ScheduleCallHere(i.callback);
+ i.callback = 0;
}
notifying = false;
@@ -195,7 +198,7 @@
Must(cb!=NULL);
debugs(93,5, HERE << "ICAPService is asked to call " << *cb <<
- " when ready " << status());
+ " when ready " << status());
Must(self != NULL);
Must(!broken()); // we do not wait for a broken service
@@ -217,7 +220,7 @@
void ICAPServiceRep::scheduleNotification()
{
debugs(93,7, "ICAPService will notify " << theClients.size() << " clients");
- CallJobHere(93, 5, this, ICAPServiceRep::noteTimeToNotify);
+ CallJobHere(93, 5, this, ICAPServiceRep::noteTimeToNotify);
}
bool ICAPServiceRep::needNewOptions() const
@@ -247,7 +250,7 @@
if (!theOptions->valid()) {
debugs(93,1, "WARNING: Squid got an invalid ICAP OPTIONS response " <<
- "from service " << cfg().uri << "; error: " << theOptions->error);
+ "from service " << cfg().uri << "; error: " << theOptions->error);
return;
}
@@ -290,7 +293,7 @@
// TODO: If skew is negative, the option will be considered down
// because of stale options. We should probably change this.
debugs(93, 1, "ICAP service's clock is skewed by " << skew <<
- " seconds: " << cfg().uri.buf());
+ " seconds: " << cfg().uri.buf());
}
}
@@ -301,9 +304,9 @@
const char *what = cfg().bypass ? "optional" : "essential";
const char *state = wasAnnouncedUp ? downPhrase : "up";
- const int level = important ? 1 : 2;
+ const int level = important ? 1 :2;
debugs(93,level, what << " ICAP service is " << state << ": " <<
- cfg().uri << ' ' << status());
+ cfg().uri << ' ' << status());
wasAnnouncedUp = !wasAnnouncedUp;
}
@@ -320,16 +323,17 @@
ICAPOptions *newOptions = NULL;
if (HttpReply *r = dynamic_cast(msg)) {
- newOptions = new ICAPOptions;
- newOptions->configure(r);
+ newOptions = new ICAPOptions;
+ newOptions->configure(r);
} else {
- debugs(93,1, "ICAPService got wrong options message " << status());
+ debugs(93,1, "ICAPService got wrong options message " << status());
}
handleNewOptions(newOptions);
}
-void ICAPServiceRep::noteAdaptationQueryAbort(bool) {
+void ICAPServiceRep::noteAdaptationQueryAbort(bool)
+{
Must(theOptionsFetcher);
clearAdaptation(theOptionsFetcher);
@@ -374,9 +378,9 @@
}
debugs(93,7, HERE << "raw OPTIONS fetch at " << when << " or in " <<
- (when - squid_curtime) << " sec");
+ (when - squid_curtime) << " sec");
debugs(93,9, HERE << "last fetched at " << theLastUpdate << " or " <<
- (squid_curtime - theLastUpdate) << " sec ago");
+ (squid_curtime - theLastUpdate) << " sec ago");
/* adjust update time to prevent too-frequent updates */
@@ -423,7 +427,7 @@
Adaptation::Initiate *
ICAPServiceRep::makeXactLauncher(Adaptation::Initiator *initiator,
- HttpMsg *virgin, HttpRequest *cause)
+ HttpMsg *virgin, HttpRequest *cause)
{
return new ICAPModXactLauncher(initiator, virgin, cause, this);
}
@@ -448,11 +452,11 @@
if (!theOptions)
buf.append(",!opt", 5);
else
- if (!theOptions->valid())
- buf.append(",!valid", 7);
- else
- if (!theOptions->fresh())
- buf.append(",stale", 6);
+ if (!theOptions->valid())
+ buf.append(",!valid", 7);
+ else
+ if (!theOptions->fresh())
+ buf.append(",stale", 6);
}
if (theOptionsFetcher)
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPServiceRep.h squid-3.1.0.4/src/ICAP/ICAPServiceRep.h
--- squid-3.1.0.3/src/ICAP/ICAPServiceRep.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPServiceRep.h 2009-01-23 18:37:36.000000000 +1300
@@ -19,12 +19,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -66,14 +66,14 @@
* eventually retry to fetch its options in hope to bring the service up.
*
* A service that should no longer be used after Squid reconfiguration is
- * treated as if it does not have a fresh cached OPTIONS response. We do
- * not try to fetch fresh options for such a service. It should be
+ * treated as if it does not have a fresh cached OPTIONS response. We do
+ * not try to fetch fresh options for such a service. It should be
* auto-destroyed by refcounting when no longer used.
*/
class ICAPServiceRep : public RefCountable, public Adaptation::Service,
- public Adaptation::Initiator
+ public Adaptation::Initiator
{
public:
@@ -101,7 +101,7 @@
bool allows204() const;
void noteFailure(); // called by transactions to report service failure
-
+
//AsyncJob virtual methods
virtual bool doneAll() const { return Adaptation::Initiator::doneAll() && false;}
@@ -116,8 +116,7 @@
private:
// stores Prepare() callback info
- struct Client
- {
+ struct Client {
Pointer service; // one for each client to preserve service
AsyncCall::Pointer callback;
};
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPXaction.cc squid-3.1.0.4/src/ICAP/ICAPXaction.cc
--- squid-3.1.0.3/src/ICAP/ICAPXaction.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPXaction.cc 2009-01-23 18:37:36.000000000 +1300
@@ -29,13 +29,13 @@
connector(NULL), reader(NULL), writer(NULL), closer(NULL)
{
debugs(93,3, typeName << " constructed, this=" << this <<
- " [icapx" << id << ']'); // we should not call virtual status() here
+ " [icapx" << id << ']'); // we should not call virtual status() here
}
ICAPXaction::~ICAPXaction()
{
debugs(93,3, typeName << " destructed, this=" << this <<
- " [icapx" << id << ']'); // we should not call virtual status() here
+ " [icapx" << id << ']'); // we should not call virtual status() here
}
ICAPServiceRep &
@@ -46,9 +46,10 @@
return *s;
}
-void ICAPXaction::disableRetries() {
+void ICAPXaction::disableRetries()
+{
debugs(93,5, typeName << (isRetriable ? " becomes" : " remains") <<
- " final" << status());
+ " final" << status());
isRetriable = false;
}
@@ -65,7 +66,7 @@
// TODO: obey service-specific, OPTIONS-reported connection limit
void ICAPXaction::openConnection()
{
- IPAddress client_addr;
+ IpAddress client_addr;
Must(connection < 0);
@@ -83,18 +84,19 @@
// TODO: can we sync call ICAPXaction::noteCommConnected here instead?
typedef CommCbMemFunT Dialer;
Dialer dialer(this, &ICAPXaction::noteCommConnected);
+ dialer.params.fd = connection;
dialer.params.flag = COMM_OK;
// fake other parameters by copying from the existing connection
connector = asyncCall(93,3, "ICAPXaction::noteCommConnected", dialer);
- ScheduleCallHere(connector);
+ ScheduleCallHere(connector);
return;
}
disableRetries(); // we only retry pconn failures
- IPAddress outgoing;
- connection = comm_open(SOCK_STREAM, 0, outgoing,
- COMM_NONBLOCKING, s.cfg().uri.buf());
+ IpAddress outgoing;
+ connection = comm_open(SOCK_STREAM, 0, outgoing,
+ COMM_NONBLOCKING, s.cfg().uri.buf());
if (connection < 0)
dieOnConnectionFailure(); // throws
@@ -104,19 +106,19 @@
// TODO: service bypass status may differ from that of a transaction
typedef CommCbMemFunT TimeoutDialer;
AsyncCall::Pointer timeoutCall = asyncCall(93, 5, "ICAPXaction::noteCommTimedout",
- TimeoutDialer(this,&ICAPXaction::noteCommTimedout));
+ TimeoutDialer(this,&ICAPXaction::noteCommTimedout));
commSetTimeout(connection, TheICAPConfig.connect_timeout(
- service().cfg().bypass), timeoutCall);
+ service().cfg().bypass), timeoutCall);
typedef CommCbMemFunT CloseDialer;
closer = asyncCall(93, 5, "ICAPXaction::noteCommClosed",
- CloseDialer(this,&ICAPXaction::noteCommClosed));
+ CloseDialer(this,&ICAPXaction::noteCommClosed));
comm_add_close_handler(connection, closer);
typedef CommCbMemFunT ConnectDialer;
connector = asyncCall(93,3, "ICAPXaction::noteCommConnected",
- ConnectDialer(this, &ICAPXaction::noteCommConnected));
+ ConnectDialer(this, &ICAPXaction::noteCommConnected));
commConnectStart(connection, s.cfg().host.buf(), s.cfg().port, connector);
}
@@ -151,12 +153,12 @@
}
if (reuseConnection) {
- IPAddress client_addr;
+ IpAddress client_addr;
debugs(93,3, HERE << "pushing pconn" << status());
- AsyncCall::Pointer call = NULL;
- commSetTimeout(connection, -1, call);
+ AsyncCall::Pointer call = NULL;
+ commSetTimeout(connection, -1, call);
icapPconnPool->push(connection, theService->cfg().host.buf(),
- theService->cfg().port, NULL, client_addr);
+ theService->cfg().port, NULL, client_addr);
disableRetries();
} else {
debugs(93,3, HERE << "closing pconn" << status());
@@ -185,9 +187,10 @@
handleCommConnected();
}
-void ICAPXaction::dieOnConnectionFailure() {
+void ICAPXaction::dieOnConnectionFailure()
+{
debugs(93, 2, HERE << typeName <<
- " failed to connect to " << service().cfg().uri);
+ " failed to connect to " << service().cfg().uri);
theService->noteFailure();
throw TexcHere("cannot connect to the ICAP service");
}
@@ -197,7 +200,7 @@
// comm module will free the buffer
typedef CommCbMemFunT Dialer;
writer = asyncCall(93,3, "ICAPXaction::noteCommWrote",
- Dialer(this, &ICAPXaction::noteCommWrote));
+ Dialer(this, &ICAPXaction::noteCommWrote));
comm_write_mbuf(connection, &buf, writer);
updateTimeout();
@@ -207,10 +210,10 @@
{
Must(writer != NULL);
writer = NULL;
-
+
if (ignoreLastWrite) {
// a hack due to comm inability to cancel a pending write
- ignoreLastWrite = false;
+ ignoreLastWrite = false;
debugs(93, 7, HERE << "ignoring last write; status: " << io.flag);
} else {
Must(io.flag == COMM_OK);
@@ -228,14 +231,14 @@
void ICAPXaction::handleCommTimedout()
{
debugs(93, 2, HERE << typeName << " failed: timeout with " <<
- theService->cfg().methodStr() << " " <<
- theService->cfg().uri.buf() << status());
+ theService->cfg().methodStr() << " " <<
+ theService->cfg().uri.buf() << status());
reuseConnection = false;
service().noteFailure();
throw TexcHere(connector != NULL ?
- "timed out while connecting to the ICAP service" :
- "timed out while talking to the ICAP service");
+ "timed out while connecting to the ICAP service" :
+ "timed out while talking to the ICAP service");
}
// unexpected connection close while talking to the ICAP service
@@ -264,21 +267,22 @@
return !connector && !reader && !writer && Adaptation::Initiate::doneAll();
}
-void ICAPXaction::updateTimeout() {
+void ICAPXaction::updateTimeout()
+{
if (reader != NULL || writer != NULL) {
// restart the timeout before each I/O
// XXX: why does Config.Timeout lacks a write timeout?
// TODO: service bypass status may differ from that of a transaction
- typedef CommCbMemFunT TimeoutDialer;
- AsyncCall::Pointer call = asyncCall(93, 5, "ICAPXaction::noteCommTimedout",
- TimeoutDialer(this,&ICAPXaction::noteCommTimedout));
+ typedef CommCbMemFunT TimeoutDialer;
+ AsyncCall::Pointer call = asyncCall(93, 5, "ICAPXaction::noteCommTimedout",
+ TimeoutDialer(this,&ICAPXaction::noteCommTimedout));
- commSetTimeout(connection,
- TheICAPConfig.io_timeout(service().cfg().bypass), call);
+ commSetTimeout(connection,
+ TheICAPConfig.io_timeout(service().cfg().bypass), call);
} else {
// clear timeout when there is no I/O
// Do we need a lifetime timeout?
- AsyncCall::Pointer call = NULL;
+ AsyncCall::Pointer call = NULL;
commSetTimeout(connection, -1, call);
}
}
@@ -295,7 +299,7 @@
*/
typedef CommCbMemFunT Dialer;
reader = asyncCall(93,3, "ICAPXaction::noteCommRead",
- Dialer(this, &ICAPXaction::noteCommRead));
+ Dialer(this, &ICAPXaction::noteCommRead));
comm_read(connection, commBuf, readBuf.spaceSize(), reader);
updateTimeout();
@@ -375,8 +379,8 @@
bool ICAPXaction::doneWithIo() const
{
return connection >= 0 && // or we could still be waiting to open it
- !connector && !reader && !writer && // fast checks, some redundant
- doneReading() && doneWriting();
+ !connector && !reader && !writer && // fast checks, some redundant
+ doneReading() && doneWriting();
}
// initiator aborted
diff -u -r -N squid-3.1.0.3/src/ICAP/ICAPXaction.h squid-3.1.0.4/src/ICAP/ICAPXaction.h
--- squid-3.1.0.3/src/ICAP/ICAPXaction.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/ICAPXaction.h 2009-01-23 18:37:36.000000000 +1300
@@ -19,12 +19,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -99,7 +99,7 @@
virtual bool doneAll() const;
// called just before the 'done' transaction is deleted
- virtual void swanSong();
+ virtual void swanSong();
// returns a temporary string depicting transaction status, for debugging
virtual const char *status() const;
diff -u -r -N squid-3.1.0.3/src/ICAP/Makefile.am squid-3.1.0.4/src/ICAP/Makefile.am
--- squid-3.1.0.3/src/ICAP/Makefile.am 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/Makefile.am 2009-01-23 18:37:36.000000000 +1300
@@ -1,5 +1,6 @@
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES =
INCLUDES = \
-I$(top_builddir)/include \
@@ -39,3 +40,4 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
diff -u -r -N squid-3.1.0.3/src/ICAP/Makefile.in squid-3.1.0.4/src/ICAP/Makefile.in
--- squid-3.1.0.3/src/ICAP/Makefile.in 2008-12-05 16:09:55.000000000 +1300
+++ squid-3.1.0.4/src/ICAP/Makefile.in 2009-01-23 18:37:57.000000000 +1300
@@ -312,6 +312,7 @@
target_alias = @target_alias@
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
INCLUDES = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
@@ -557,6 +558,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp4.cc squid-3.1.0.4/src/icmp/Icmp4.cc
--- squid-3.1.0.3/src/icmp/Icmp4.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp4.cc 2009-01-23 18:37:37.000000000 +1300
@@ -90,7 +90,7 @@
}
void
-Icmp4::SendEcho(IPAddress &to, int opcode, const char *payload, int len)
+Icmp4::SendEcho(IpAddress &to, int opcode, const char *payload, int len)
{
int x;
LOCAL_ARRAY(char, pkt, MAX_PKT4_SZ);
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp4.h squid-3.1.0.4/src/icmp/Icmp4.h
--- squid-3.1.0.3/src/icmp/Icmp4.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp4.h 2009-01-23 18:37:37.000000000 +1300
@@ -36,7 +36,6 @@
#include "config.h"
#include "Icmp.h"
-#include "IPAddress.h"
#if HAVE_NETINET_IN_SYSTM_H
#include
@@ -171,7 +170,7 @@
virtual int Open();
#if USE_ICMP
- virtual void SendEcho(IPAddress &, int, const char*, int);
+ virtual void SendEcho(IpAddress &, int, const char*, int);
virtual void Recv(void);
#endif
};
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp6.cc squid-3.1.0.4/src/icmp/Icmp6.cc
--- squid-3.1.0.3/src/icmp/Icmp6.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp6.cc 2009-01-23 18:37:37.000000000 +1300
@@ -133,7 +133,7 @@
* Generates an RFC 4443 Icmp6 ECHO Packet and sends into the network.
*/
void
-Icmp6::SendEcho(IPAddress &to, int opcode, const char *payload, int len)
+Icmp6::SendEcho(IpAddress &to, int opcode, const char *payload, int len)
{
int x;
LOCAL_ARRAY(char, pkt, MAX_PKT6_SZ);
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp6.h squid-3.1.0.4/src/icmp/Icmp6.h
--- squid-3.1.0.3/src/icmp/Icmp6.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp6.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: ICMPv6.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
* DEBUG: section 37 ICMP Routines
* AUTHOR: Duane Wessels, Amos Jeffries
*
@@ -39,7 +37,6 @@
#if USE_IPV6
#include "Icmp.h"
-#include "IPAddress.h"
#if HAVE_NETINET_IN_H
#include
@@ -79,7 +76,7 @@
virtual int Open();
#if USE_ICMP
- virtual void SendEcho(IPAddress &, int, const char*, int);
+ virtual void SendEcho(IpAddress &, int, const char*, int);
virtual void Recv(void);
#endif
};
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp.cc squid-3.1.0.4/src/icmp/Icmp.cc
--- squid-3.1.0.3/src/icmp/Icmp.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp.cc 2009-01-23 18:37:37.000000000 +1300
@@ -107,7 +107,7 @@
}
void
-Icmp::Log(const IPAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops)
+Icmp::Log(const IpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops)
{
debugs(42, 2, "pingerLog: " << std::setw(9) << current_time.tv_sec <<
"." << std::setfill('0') << std::setw(6) <<
diff -u -r -N squid-3.1.0.3/src/icmp/Icmp.h squid-3.1.0.4/src/icmp/Icmp.h
--- squid-3.1.0.3/src/icmp/Icmp.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Icmp.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: ICMP.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
* DEBUG: section 37 ICMP Routines
* AUTHOR: Duane Wessels, Amos Jeffries
*
@@ -35,7 +33,7 @@
#define _INCLUDE_ICMP_H
#include "config.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#define PINGER_PAYLOAD_SZ 8192
@@ -49,7 +47,7 @@
/* This is a line-data format struct. DO NOT alter. */
struct pingerEchoData {
- IPAddress to;
+ IpAddress to;
unsigned char opcode;
int psize;
char payload[PINGER_PAYLOAD_SZ];
@@ -57,7 +55,7 @@
/* This is a line-data format struct. DO NOT alter. */
struct pingerReplyData {
- IPAddress from;
+ IpAddress from;
unsigned char opcode;
int rtt;
int hops;
@@ -111,7 +109,7 @@
* Content longer than MAX_PAYLOAD will be truncated.
\param len Length of the payload in bytes if any is to be sent or 0.
*/
- virtual void SendEcho(IPAddress &to, int opcode, const char *payload=NULL, int len=0) =0;
+ virtual void SendEcho(IpAddress &to, int opcode, const char *payload=NULL, int len=0) =0;
/// Handle ICMP responses.
virtual void Recv(void) =0;
@@ -139,7 +137,7 @@
int ipHops(int ttl);
/// Log the packet.
- void Log(const IPAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops);
+ void Log(const IpAddress &addr, const u_int8_t type, const char* pkt_str, const int rtt, const int hops);
/* no use wasting memory */
int icmp_sock;
diff -u -r -N squid-3.1.0.3/src/icmp/IcmpPinger.h squid-3.1.0.4/src/icmp/IcmpPinger.h
--- squid-3.1.0.3/src/icmp/IcmpPinger.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/IcmpPinger.h 2009-01-23 18:37:37.000000000 +1300
@@ -62,7 +62,7 @@
private:
// unused in IcmpPinger
- virtual void SendEcho(IPAddress &to, int opcode, const char *payload, int len) {};
+ virtual void SendEcho(IpAddress &to, int opcode, const char *payload, int len) {};
/**
* Control channel(s) to squid.
diff -u -r -N squid-3.1.0.3/src/icmp/IcmpSquid.cc squid-3.1.0.4/src/icmp/IcmpSquid.cc
--- squid-3.1.0.3/src/icmp/IcmpSquid.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/IcmpSquid.cc 2009-01-23 18:37:37.000000000 +1300
@@ -69,7 +69,7 @@
#if USE_ICMP
void
-IcmpSquid::SendEcho(IPAddress &to, int opcode, const char *payload, int len)
+IcmpSquid::SendEcho(IpAddress &to, int opcode, const char *payload, int len)
{
static pingerEchoData pecho;
int x, slen;
@@ -141,7 +141,7 @@
int n;
static int fail_count = 0;
pingerReplyData preply;
- static IPAddress F;
+ static IpAddress F;
commSetSelect(icmp_sock, COMM_SELECT_READ, icmpSquidRecv, NULL, 0);
memset(&preply, '\0', sizeof(pingerReplyData));
@@ -196,7 +196,7 @@
#endif /* USE_ICMP */
void
-IcmpSquid::DomainPing(IPAddress &to, const char *domain)
+IcmpSquid::DomainPing(IpAddress &to, const char *domain)
{
#if USE_ICMP
debugs(37, 4, HERE << "'" << domain << "' (" << to << ")");
@@ -211,7 +211,7 @@
const char *args[2];
int rfd;
int wfd;
- IPAddress localhost;
+ IpAddress localhost;
/* User configured disabled. */
if (!Config.pinger.enable) {
diff -u -r -N squid-3.1.0.3/src/icmp/IcmpSquid.h squid-3.1.0.4/src/icmp/IcmpSquid.h
--- squid-3.1.0.3/src/icmp/IcmpSquid.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/IcmpSquid.h 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: ICMPSquid.h,v 1.1 2007/12/14 23:11:45 amosjeffries Exp $
- *
* DEBUG: section 37 ICMP Routines
* AUTHOR: Duane Wessels, Amos Jeffries
*
@@ -36,7 +34,6 @@
#include "config.h"
#include "Icmp.h"
-#include "IPAddress.h"
/**
* Implements a non-blocking pseudo-ICMP engine for squid internally.
@@ -55,10 +52,10 @@
virtual int Open();
virtual void Close();
- void DomainPing(IPAddress &to, const char *domain);
+ void DomainPing(IpAddress &to, const char *domain);
#if USE_ICMP
- virtual void SendEcho(IPAddress &to, int opcode, const char* payload=NULL, int len=0);
+ virtual void SendEcho(IpAddress &to, int opcode, const char* payload=NULL, int len=0);
virtual void Recv(void);
#endif
};
diff -u -r -N squid-3.1.0.3/src/icmp/Makefile.am squid-3.1.0.4/src/icmp/Makefile.am
--- squid-3.1.0.3/src/icmp/Makefile.am 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Makefile.am 2009-01-23 18:37:37.000000000 +1300
@@ -7,6 +7,7 @@
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
DEFS = @DEFS@
+CLEANFILES =
INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
@@ -48,6 +49,7 @@
# ICMP lookup helper
pinger_SOURCES = \
+ Icmp.h \
IcmpPinger.h \
IcmpPinger.cc \
Icmp4.h \
@@ -59,16 +61,16 @@
# depends on these but install/dist is done elsewhere.
# TODO: remove when these are cleaned up in their own way.
nodist_pinger_SOURCES = \
- Icmp.h \
../debug.cc \
+ ../globals.cc \
../time.cc \
../SquidConfig.cc \
- ../SquidNew.cc \
- ../globals.cc
+ ../SquidNew.cc
pinger_LDFLAGS = $(LIBADD_DL)
pinger_LDADD=\
libicmp-core.la \
+ ../ip/libip.la \
$(top_builddir)/lib/libmiscutil.a
pinger_DEPENDENCIES= \
libicmp-core.la \
@@ -101,14 +103,16 @@
## No such file...
testHeaders.c:
touch testHeaders.c
+CLEANFILES += testHeaders.c
## Tests of the ICMP base module.
# Its used by pinger so SHOULD NOT require more dependancies! :-(
-testIcmp_SOURCES=\
+testIcmp_SOURCES = \
Icmp.h \
testIcmp.h \
- testIcmp.cc \
+ testIcmp.cc
+nodist_testIcmp_SOURCES = \
../tests/testMain.cc \
../SquidTime.h \
../time.cc \
@@ -119,6 +123,7 @@
@SQUID_CPPUNIT_LIBS@ \
@SQUID_CPPUNIT_LA@ \
libicmp-core.la \
+ ../ip/libip.la \
$(top_builddir)/lib/libmiscutil.a
testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
libicmp-core.la \
diff -u -r -N squid-3.1.0.3/src/icmp/Makefile.in squid-3.1.0.4/src/icmp/Makefile.in
--- squid-3.1.0.3/src/icmp/Makefile.in 2008-12-05 16:09:57.000000000 +1300
+++ squid-3.1.0.4/src/icmp/Makefile.in 2009-01-23 18:38:00.000000000 +1300
@@ -67,15 +67,16 @@
PROGRAMS = $(libexec_PROGRAMS)
am_pinger_OBJECTS = IcmpPinger.$(OBJEXT) Icmp4.$(OBJEXT) \
Icmp6.$(OBJEXT) pinger.$(OBJEXT)
-nodist_pinger_OBJECTS = debug.$(OBJEXT) time.$(OBJEXT) \
- SquidConfig.$(OBJEXT) SquidNew.$(OBJEXT) globals.$(OBJEXT)
+nodist_pinger_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
+ time.$(OBJEXT) SquidConfig.$(OBJEXT) SquidNew.$(OBJEXT)
pinger_OBJECTS = $(am_pinger_OBJECTS) $(nodist_pinger_OBJECTS)
testHeaders_SOURCES = testHeaders.c
testHeaders_OBJECTS = testHeaders.$(OBJEXT)
testHeaders_LDADD = $(LDADD)
-am_testIcmp_OBJECTS = testIcmp.$(OBJEXT) testMain.$(OBJEXT) \
- time.$(OBJEXT) test_tools.$(OBJEXT) globals.$(OBJEXT)
-testIcmp_OBJECTS = $(am_testIcmp_OBJECTS)
+am_testIcmp_OBJECTS = testIcmp.$(OBJEXT)
+nodist_testIcmp_OBJECTS = testMain.$(OBJEXT) time.$(OBJEXT) \
+ test_tools.$(OBJEXT) globals.$(OBJEXT)
+testIcmp_OBJECTS = $(am_testIcmp_OBJECTS) $(nodist_testIcmp_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp
am__depfiles_maybe = depfiles
@@ -97,7 +98,7 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libicmp_core_la_SOURCES) $(libicmp_la_SOURCES) \
$(pinger_SOURCES) $(nodist_pinger_SOURCES) testHeaders.c \
- $(testIcmp_SOURCES)
+ $(testIcmp_SOURCES) $(nodist_testIcmp_SOURCES)
DIST_SOURCES = $(libicmp_core_la_SOURCES) $(libicmp_la_SOURCES) \
$(pinger_SOURCES) testHeaders.c $(testIcmp_SOURCES)
ETAGS = etags
@@ -341,6 +342,7 @@
# TODO: make this set by configure?
AM_CFLAGS = @SQUID_CFLAGS@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
@ENABLE_PINGER_FALSE@PINGER =
@@ -365,6 +367,7 @@
# ICMP lookup helper
pinger_SOURCES = \
+ Icmp.h \
IcmpPinger.h \
IcmpPinger.cc \
Icmp4.h \
@@ -377,16 +380,16 @@
# depends on these but install/dist is done elsewhere.
# TODO: remove when these are cleaned up in their own way.
nodist_pinger_SOURCES = \
- Icmp.h \
../debug.cc \
+ ../globals.cc \
../time.cc \
../SquidConfig.cc \
- ../SquidNew.cc \
- ../globals.cc
+ ../SquidNew.cc
pinger_LDFLAGS = $(LIBADD_DL)
pinger_LDADD = \
libicmp-core.la \
+ ../ip/libip.la \
$(top_builddir)/lib/libmiscutil.a
pinger_DEPENDENCIES = \
@@ -399,7 +402,9 @@
testIcmp_SOURCES = \
Icmp.h \
testIcmp.h \
- testIcmp.cc \
+ testIcmp.cc
+
+nodist_testIcmp_SOURCES = \
../tests/testMain.cc \
../SquidTime.h \
../time.cc \
@@ -411,6 +416,7 @@
@SQUID_CPPUNIT_LIBS@ \
@SQUID_CPPUNIT_LA@ \
libicmp-core.la \
+ ../ip/libip.la \
$(top_builddir)/lib/libmiscutil.a
testIcmp_DEPENDENCIES = @SQUID_CPPUNIT_LA@ \
@@ -584,6 +590,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o debug.obj `if test -f '../debug.cc'; then $(CYGPATH_W) '../debug.cc'; else $(CYGPATH_W) '$(srcdir)/../debug.cc'; fi`
+globals.o: ../globals.cc
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.o -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.o `test -f '../globals.cc' || echo '$(srcdir)/'`../globals.cc; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../globals.cc' object='globals.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.o `test -f '../globals.cc' || echo '$(srcdir)/'`../globals.cc
+
+globals.obj: ../globals.cc
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.obj -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.obj `if test -f '../globals.cc'; then $(CYGPATH_W) '../globals.cc'; else $(CYGPATH_W) '$(srcdir)/../globals.cc'; fi`; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../globals.cc' object='globals.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.obj `if test -f '../globals.cc'; then $(CYGPATH_W) '../globals.cc'; else $(CYGPATH_W) '$(srcdir)/../globals.cc'; fi`
+
time.o: ../time.cc
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT time.o -MD -MP -MF "$(DEPDIR)/time.Tpo" -c -o time.o `test -f '../time.cc' || echo '$(srcdir)/'`../time.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/time.Tpo" "$(DEPDIR)/time.Po"; else rm -f "$(DEPDIR)/time.Tpo"; exit 1; fi
@@ -626,20 +646,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SquidNew.obj `if test -f '../SquidNew.cc'; then $(CYGPATH_W) '../SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/../SquidNew.cc'; fi`
-globals.o: ../globals.cc
-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.o -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.o `test -f '../globals.cc' || echo '$(srcdir)/'`../globals.cc; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../globals.cc' object='globals.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.o `test -f '../globals.cc' || echo '$(srcdir)/'`../globals.cc
-
-globals.obj: ../globals.cc
-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT globals.obj -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.obj `if test -f '../globals.cc'; then $(CYGPATH_W) '../globals.cc'; else $(CYGPATH_W) '$(srcdir)/../globals.cc'; fi`; \
-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../globals.cc' object='globals.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o globals.obj `if test -f '../globals.cc'; then $(CYGPATH_W) '../globals.cc'; else $(CYGPATH_W) '$(srcdir)/../globals.cc'; fi`
-
testMain.o: ../tests/testMain.cc
@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF "$(DEPDIR)/testMain.Tpo" -c -o testMain.o `test -f '../tests/testMain.cc' || echo '$(srcdir)/'`../tests/testMain.cc; \
@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testMain.Tpo" "$(DEPDIR)/testMain.Po"; else rm -f "$(DEPDIR)/testMain.Tpo"; exit 1; fi
@@ -852,6 +858,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff -u -r -N squid-3.1.0.3/src/icmp/net_db.cc squid-3.1.0.4/src/icmp/net_db.cc
--- squid-3.1.0.3/src/icmp/net_db.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/net_db.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: net_db.cc,v 1.202 2008/01/07 17:12:28 hno Exp $
- *
* DEBUG: section 38 Network Measurement Database
* AUTHOR: Duane Wessels
*
@@ -54,7 +52,7 @@
#include "forward.h"
#include "SquidTime.h"
#include "wordlist.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
#if USE_ICMP
#include "icmp/IcmpSquid.h"
@@ -83,10 +81,10 @@
static hash_table *addr_table = NULL;
static hash_table *host_table = NULL;
-IPAddress networkFromInaddr(const IPAddress &a);
+IpAddress networkFromInaddr(const IpAddress &a);
static void netdbRelease(netdbEntry * n);
-static void netdbHashInsert(netdbEntry * n, IPAddress &addr);
+static void netdbHashInsert(netdbEntry * n, IpAddress &addr);
static void netdbHashDelete(const char *key);
static void netdbHostInsert(netdbEntry * n, const char *hostname);
static void netdbHostDelete(const net_db_name * x);
@@ -111,7 +109,7 @@
static wordlist *peer_names = NULL;
static void
-netdbHashInsert(netdbEntry * n, IPAddress &addr)
+netdbHashInsert(netdbEntry * n, IpAddress &addr)
{
networkFromInaddr(addr).NtoA(n->network, MAX_IPSTRLEN);
n->hash.key = n->network;
@@ -247,7 +245,7 @@
}
static netdbEntry *
-netdbLookupAddr(const IPAddress &addr)
+netdbLookupAddr(const IpAddress &addr)
{
netdbEntry *n;
char *key = new char[MAX_IPSTRLEN];
@@ -257,7 +255,7 @@
}
static netdbEntry *
-netdbAdd(IPAddress &addr)
+netdbAdd(IpAddress &addr)
{
netdbEntry *n;
@@ -275,7 +273,7 @@
static void
netdbSendPing(const ipcache_addrs * ia, void *data)
{
- IPAddress addr;
+ IpAddress addr;
char *hostname = NULL;
static_cast(data)->unwrap(&hostname);
netdbEntry *n;
@@ -340,10 +338,10 @@
xfree(hostname);
}
-IPAddress
-networkFromInaddr(const IPAddress &in)
+IpAddress
+networkFromInaddr(const IpAddress &in)
{
- IPAddress out;
+ IpAddress out;
out = in;
#if USE_IPV6
@@ -536,7 +534,7 @@
netdbEntry *n;
netdbEntry N;
- IPAddress addr;
+ IpAddress addr;
int count = 0;
struct timeval start = current_time;
@@ -677,7 +675,7 @@
static void
netdbExchangeHandleReply(void *data, StoreIOBuffer receivedData)
{
- IPAddress addr;
+ IpAddress addr;
netdbExchangeState *ex = (netdbExchangeState *)data;
int rec_sz = 0;
@@ -937,7 +935,7 @@
}
void
-netdbHandlePingReply(const IPAddress &from, int hops, int rtt)
+netdbHandlePingReply(const IpAddress &from, int hops, int rtt)
{
#if USE_ICMP
netdbEntry *n;
@@ -984,7 +982,7 @@
#if 0 // AYJ: Looks to be unused code.
int
-netdbHops(IPAddress &addr)
+netdbHops(IpAddress &addr)
{
#if USE_ICMP
netdbEntry *n = netdbLookupAddr(addr);
@@ -1151,7 +1149,7 @@
}
void
-netdbExchangeUpdatePeer(IPAddress &addr, peer * e, double rtt, double hops)
+netdbExchangeUpdatePeer(IpAddress &addr, peer * e, double rtt, double hops)
{
#if USE_ICMP
netdbEntry *n;
@@ -1193,7 +1191,7 @@
}
void
-netdbDeleteAddrNetwork(IPAddress &addr)
+netdbDeleteAddrNetwork(IpAddress &addr)
{
#if USE_ICMP
netdbEntry *n = netdbLookupAddr(addr);
@@ -1214,7 +1212,7 @@
HttpReply *reply = new HttpReply;
#if USE_ICMP
- IPAddress addr;
+ IpAddress addr;
netdbEntry *n;
int i;
@@ -1341,6 +1339,8 @@
if (p->login)
xstrncpy(ex->r->login, p->login, MAX_LOGIN_SZ);
+ urlCanonical(ex->r);
+
FwdState::fwdStart(-1, ex->e, ex->r);
#endif
diff -u -r -N squid-3.1.0.3/src/icmp/net_db.h squid-3.1.0.4/src/icmp/net_db.h
--- squid-3.1.0.3/src/icmp/net_db.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/net_db.h 2009-01-23 18:37:37.000000000 +1300
@@ -3,7 +3,7 @@
#include "config.h"
-class IPAddress;
+class IpAddress;
class StoreEntry;
class HttpRequest;
@@ -13,12 +13,12 @@
SQUIDCEXTERN void netdbInit(void);
-SQUIDCEXTERN void netdbHandlePingReply(const IPAddress &from, int hops, int rtt);
+SQUIDCEXTERN void netdbHandlePingReply(const IpAddress &from, int hops, int rtt);
SQUIDCEXTERN void netdbPingSite(const char *hostname);
SQUIDCEXTERN void netdbDump(StoreEntry *);
#if 0 // AYJ: Looks to be unused now.
-SQUIDCEXTERN int netdbHops(IPAddress &);
+SQUIDCEXTERN int netdbHops(IpAddress &);
#endif
SQUIDCEXTERN void netdbFreeMemory(void);
@@ -26,11 +26,11 @@
SQUIDCEXTERN int netdbHostRtt(const char *host);
SQUIDCEXTERN void netdbUpdatePeer(HttpRequest *, peer * e, int rtt, int hops);
-SQUIDCEXTERN void netdbDeleteAddrNetwork(IPAddress &addr);
+SQUIDCEXTERN void netdbDeleteAddrNetwork(IpAddress &addr);
SQUIDCEXTERN void netdbBinaryExchange(StoreEntry *);
SQUIDCEXTERN void netdbExchangeStart(void *);
-SQUIDCEXTERN void netdbExchangeUpdatePeer(IPAddress &, peer *, double, double);
+SQUIDCEXTERN void netdbExchangeUpdatePeer(IpAddress &, peer *, double, double);
SQUIDCEXTERN peer *netdbClosestParent(HttpRequest *);
SQUIDCEXTERN void netdbHostData(const char *host, int *samp, int *rtt, int *hops);
diff -u -r -N squid-3.1.0.3/src/icmp/pinger.cc squid-3.1.0.4/src/icmp/pinger.cc
--- squid-3.1.0.3/src/icmp/pinger.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/pinger.cc 2009-01-23 18:37:37.000000000 +1300
@@ -192,6 +192,8 @@
setgid(getgid());
setuid(getuid());
+ last_check_time = squid_curtime;
+
for (;;) {
tv.tv_sec = PINGER_TIMEOUT;
tv.tv_usec = 0;
diff -u -r -N squid-3.1.0.3/src/icmp/testIcmp.h squid-3.1.0.4/src/icmp/testIcmp.h
--- squid-3.1.0.3/src/icmp/testIcmp.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/icmp/testIcmp.h 2009-01-23 18:37:37.000000000 +1300
@@ -16,7 +16,7 @@
virtual void Close() {};
/// Construct ECHO request
- virtual void SendEcho(IPAddress &to, int opcode, const char *payload, int len) {};
+ virtual void SendEcho(IpAddress &to, int opcode, const char *payload, int len) {};
/// Handle ICMP responses.
virtual void Recv(void) {};
diff -u -r -N squid-3.1.0.3/src/ICP.h squid-3.1.0.4/src/ICP.h
--- squid-3.1.0.3/src/ICP.h 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/ICP.h 2009-01-23 18:37:36.000000000 +1300
@@ -68,7 +68,7 @@
_icp_common_t();
_icp_common_t(char *buf, unsigned int len);
- void handleReply(char *buf, IPAddress &from);
+ void handleReply(char *buf, IpAddress &from);
static _icp_common_t *createMessage(icp_opcode opcode, int flags, const char *url, int reqnum, int pad);
icp_opcode getOpCode() const;
#endif
@@ -99,7 +99,7 @@
HttpRequest *request;
int fd;
- IPAddress from;
+ IpAddress from;
char *url;
};
@@ -107,7 +107,7 @@
/// \ingroup ServerProtocolICPAPI
struct icpUdpData {
- IPAddress address;
+ IpAddress address;
void *msg;
size_t len;
icpUdpData *next;
@@ -122,25 +122,25 @@
};
/// \ingroup ServerProtocolICPAPI
-HttpRequest* icpGetRequest(char *url, int reqnum, int fd, IPAddress &from);
+HttpRequest* icpGetRequest(char *url, int reqnum, int fd, IpAddress &from);
/// \ingroup ServerProtocolICPAPI
-int icpAccessAllowed(IPAddress &from, HttpRequest * icp_request);
+int icpAccessAllowed(IpAddress &from, HttpRequest * icp_request);
/// \ingroup ServerProtocolICPAPI
-SQUIDCEXTERN void icpCreateAndSend(icp_opcode, int flags, char const *url, int reqnum, int pad, int fd, const IPAddress &from);
+SQUIDCEXTERN void icpCreateAndSend(icp_opcode, int flags, char const *url, int reqnum, int pad, int fd, const IpAddress &from);
/// \ingroup ServerProtocolICPAPI
extern icp_opcode icpGetCommonOpcode();
/// \ingroup ServerProtocolICPAPI
-SQUIDCEXTERN int icpUdpSend(int, const IPAddress &, icp_common_t *, log_type, int);
+SQUIDCEXTERN int icpUdpSend(int, const IpAddress &, icp_common_t *, log_type, int);
/// \ingroup ServerProtocolICPAPI
SQUIDCEXTERN log_type icpLogFromICPCode(icp_opcode opcode);
/// \ingroup ServerProtocolICPAPI
-void icpDenyAccess(IPAddress &from, char *url, int reqnum, int fd);
+void icpDenyAccess(IpAddress &from, char *url, int reqnum, int fd);
/// \ingroup ServerProtocolICPAPI
SQUIDCEXTERN PF icpHandleUdp;
@@ -149,7 +149,7 @@
SQUIDCEXTERN PF icpUdpSendQueue;
/// \ingroup ServerProtocolICPAPI
-SQUIDCEXTERN void icpHandleIcpV3(int, IPAddress &, char *, int);
+SQUIDCEXTERN void icpHandleIcpV3(int, IpAddress &, char *, int);
/// \ingroup ServerProtocolICPAPI
SQUIDCEXTERN int icpCheckUdpHit(StoreEntry *, HttpRequest * request);
diff -u -r -N squid-3.1.0.3/src/icp_v2.cc squid-3.1.0.4/src/icp_v2.cc
--- squid-3.1.0.3/src/icp_v2.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/icp_v2.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,6 +1,4 @@
/*
- * $Id: icp_v2.cc,v 1.103 2008/02/26 21:49:35 amosjeffries Exp $
- *
* DEBUG: section 12 Internet Cache Protocol (ICP)
* AUTHOR: Duane Wessels
*
@@ -48,14 +46,14 @@
#include "wordlist.h"
#include "SquidTime.h"
#include "SwapDir.h"
-#include "IPAddress.h"
#include "icmp/net_db.h"
+#include "ip/IpAddress.h"
/// \ingroup ServerProtocolICPInternal2
-static void icpLogIcp(const IPAddress &, log_type, int, const char *, int);
+static void icpLogIcp(const IpAddress &, log_type, int, const char *, int);
/// \ingroup ServerProtocolICPInternal2
-static void icpHandleIcpV2(int, IPAddress &, char *, int);
+static void icpHandleIcpV2(int, IpAddress &, char *, int);
/// \ingroup ServerProtocolICPInternal2
static void icpCount(void *, int, size_t, int);
@@ -70,7 +68,7 @@
static icpUdpData *IcpQueueTail = NULL;
/// \ingroup ServerProtocolICPInternal2
-IPAddress theOutICPAddr;
+IpAddress theOutICPAddr;
/* icp_common_t */
_icp_common_t::_icp_common_t() : opcode(ICP_INVALID), version(0), length(0), reqnum(0), flags(0), pad(0), shostid(0)
@@ -175,7 +173,7 @@
/// \ingroup ServerProtocolICPInternal2
static void
-icpLogIcp(const IPAddress &caddr, log_type logcode, int len, const char *url, int delay)
+icpLogIcp(const IpAddress &caddr, log_type logcode, int len, const char *url, int delay)
{
AccessLogEntry al;
@@ -272,7 +270,7 @@
int
icpUdpSend(int fd,
- const IPAddress &to,
+ const IpAddress &to,
icp_common_t * msg,
log_type logcode,
int delay)
@@ -382,14 +380,14 @@
}
void
-icpCreateAndSend(icp_opcode opcode, int flags, char const *url, int reqnum, int pad, int fd, const IPAddress &from)
+icpCreateAndSend(icp_opcode opcode, int flags, char const *url, int reqnum, int pad, int fd, const IpAddress &from)
{
icp_common_t *reply = _icp_common_t::createMessage(opcode, flags, url, reqnum, pad);
icpUdpSend(fd, from, reply, icpLogFromICPCode(opcode), 0);
}
void
-icpDenyAccess(IPAddress &from, char *url, int reqnum, int fd)
+icpDenyAccess(IpAddress &from, char *url, int reqnum, int fd)
{
debugs(12, 2, "icpDenyAccess: Access Denied for " << from << " by " << AclMatchedName << ".");
@@ -405,7 +403,7 @@
}
int
-icpAccessAllowed(IPAddress &from, HttpRequest * icp_request)
+icpAccessAllowed(IpAddress &from, HttpRequest * icp_request)
{
ACLChecklist checklist;
checklist.src_addr = from;
@@ -427,7 +425,7 @@
}
HttpRequest *
-icpGetRequest(char *url, int reqnum, int fd, IPAddress &from)
+icpGetRequest(char *url, int reqnum, int fd, IpAddress &from)
{
if (strpbrk(url, w_space)) {
url = rfc1738_escape(url);
@@ -445,7 +443,7 @@
}
static void
-doV2Query(int fd, IPAddress &from, char *buf, icp_common_t header)
+doV2Query(int fd, IpAddress &from, char *buf, icp_common_t header)
{
int rtt = 0;
int src_rtt = 0;
@@ -496,7 +494,7 @@
}
void
-_icp_common_t::handleReply(char *buf, IPAddress &from)
+_icp_common_t::handleReply(char *buf, IpAddress &from)
{
if (neighbors_do_private_keys && reqnum == 0) {
debugs(12, 0, "icpHandleIcpV2: Neighbor " << from << " returned reqnum = 0");
@@ -513,7 +511,7 @@
}
static void
-icpHandleIcpV2(int fd, IPAddress &from, char *buf, int len)
+icpHandleIcpV2(int fd, IpAddress &from, char *buf, int len)
{
if (len <= 0) {
debugs(12, 3, "icpHandleIcpV2: ICP message is too small");
@@ -566,7 +564,7 @@
icpPktDump(icp_common_t * pkt)
{
- IPAddress a;
+ IpAddress a;
debugs(12, 9, "opcode: " << std::setw(3) << pkt->opcode << " " << icp_opcode_str[pkt->opcode]);
debugs(12, 9, "version: "<< std::left << std::setw(8) << pkt->version);
@@ -585,7 +583,7 @@
{
int *N = &incoming_sockets_accepted;
- IPAddress from;
+ IpAddress from;
LOCAL_ARRAY(char, buf, SQUID_UDP_SO_RCVBUF);
int len;
int icp_version;
@@ -652,7 +650,7 @@
{
u_int16_t port;
- IPAddress addr;
+ IpAddress addr;
struct addrinfo *xai = NULL;
int x;
diff -u -r -N squid-3.1.0.3/src/icp_v3.cc squid-3.1.0.4/src/icp_v3.cc
--- squid-3.1.0.3/src/icp_v3.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/icp_v3.cc 2009-01-23 18:37:37.000000000 +1300
@@ -56,7 +56,7 @@
/// \ingroup ServerProtocolICPInternal3
static void
-doV3Query(int fd, IPAddress &from, char *buf, icp_common_t header)
+doV3Query(int fd, IpAddress &from, char *buf, icp_common_t header)
{
/* We have a valid packet */
char *url = buf + sizeof(icp_common_t) + sizeof(u_int32_t);
@@ -109,7 +109,7 @@
/// \ingroup ServerProtocolICPInternal3
/* Currently Harvest cached-2.x uses ICP_VERSION_3 */
void
-icpHandleIcpV3(int fd, IPAddress&from, char *buf, int len)
+icpHandleIcpV3(int fd, IpAddress&from, char *buf, int len)
{
if (len <= 0) {
debugs(12, 3, "icpHandleIcpV3: ICP message is too small");
diff -u -r -N squid-3.1.0.3/src/ident.cc squid-3.1.0.4/src/ident.cc
--- squid-3.1.0.3/src/ident.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/ident.cc 2009-01-23 18:37:37.000000000 +1300
@@ -51,9 +51,9 @@
hash_link hash; /* must be first */
int fd; /* IDENT fd */
- IPAddress me;
+ IpAddress me;
- IPAddress my_peer;
+ IpAddress my_peer;
IdentClient *clients;
char buf[4096];
} IdentStateData;
@@ -202,7 +202,7 @@
* start a TCP connection to the peer host on port 113
*/
void
-identStart(IPAddress &me, IPAddress &my_peer, IDCB * callback, void *data)
+identStart(IpAddress &me, IpAddress &my_peer, IDCB * callback, void *data)
{
IdentStateData *state;
int fd;
diff -u -r -N squid-3.1.0.3/src/ident.h squid-3.1.0.4/src/ident.h
--- squid-3.1.0.3/src/ident.h 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/ident.h 2009-01-23 18:37:37.000000000 +1300
@@ -16,10 +16,10 @@
#include "cbdata.h"
-class IPAddress;
+class IpAddress;
/// \ingroup IdentAPI
-SQUIDCEXTERN void identStart(IPAddress &me, IPAddress &my_peer, IDCB * callback, void *cbdata);
+SQUIDCEXTERN void identStart(IpAddress &me, IpAddress &my_peer, IDCB * callback, void *cbdata);
/// \ingroup IdentAPI
SQUIDCEXTERN void identInit(void);
diff -u -r -N squid-3.1.0.3/src/internal.cc squid-3.1.0.4/src/internal.cc
--- squid-3.1.0.3/src/internal.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/internal.cc 2009-01-23 18:37:37.000000000 +1300
@@ -110,7 +110,7 @@
#if USE_IPV6
/* check for an IP address and format appropriately if found */
- IPAddress test = lc_host;
+ IpAddress test = lc_host;
if ( !test.IsAnyAddr() ) {
test.ToHostname(lc_host,SQUIDHOSTNAMELEN);
}
diff -u -r -N squid-3.1.0.3/src/ip/IpAddress.cc squid-3.1.0.4/src/ip/IpAddress.cc
--- squid-3.1.0.3/src/ip/IpAddress.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/IpAddress.cc 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,1242 @@
+/*
+ * DEBUG: section 14 IP Storage and Handling
+ * AUTHOR: Amos Jeffries
+ *
+ * SQUID Internet Object Cache http://squid.nlanr.net/Squid/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from the
+ * Internet community. Development is led by Duane Wessels of the
+ * National Laboratory for Applied Network Research and funded by the
+ * National Science Foundation. Squid is Copyrighted (C) 1998 by
+ * the Regents of the University of California. Please see the
+ * COPYRIGHT file for full details. Squid incorporates software
+ * developed and/or copyrighted by other sources. Please see the
+ * CREDITS file for full details.
+ *
+ * This IpAddress code is copyright (C) 2007 by Treehouse Networks Ltd
+ * of New Zealand. It is published and Lisenced as an extension of
+ * squid under the same conditions as the main squid application.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include "config.h"
+#include "ip/IpAddress.h"
+#include "util.h"
+
+
+#if HAVE_ASSERT_H
+#include
+#endif
+#if HAVE_STDLIB_H
+#include
+#endif
+#if HAVE_STRING_H
+#include
+#endif
+#if HAVE_ARPA_INET_H
+#include /* inet_ntoa() */
+#endif
+
+#ifdef INET6
+#error "INET6 defined but has been deprecated! Try running bootstrap and configure again."
+#endif
+
+/* We want to use the debug routines when running as module of squid. */
+/* otherwise fallback to printf if those are not available. */
+#ifndef SQUID_DEBUG
+# define debugs(a,b,c) // drop.
+#else
+#warning "IpAddress built with Debugs!!"
+# include "../src/Debug.h"
+#endif
+
+#if !USE_IPV6
+// So there are some places where I will drop to using Macros too.
+// At least I can restrict them to this file so they don't corrupt the app with C code.
+# define sin6_addr sin_addr
+# define sin6_port sin_port
+# define sin6_family sin_family
+#undef s6_addr
+# 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) \
+ if(!(b)){ printf("assert \"%s\" at line %d\n", a, __LINE__); \
+ printf("IpAddress invalid? with IsIPv4()=%c, IsIPv6()=%c\n",(IsIPv4()?'T':'F'),(IsIPv6()?'T':'F')); \
+ printf("ADDRESS:"); \
+ for(unsigned int i = 0; i < sizeof(m_SocketAddr.sin6_addr); i++) { \
+ printf(" %x", m_SocketAddr.sin6_addr.s6_addr[i]); \
+ } printf("\n"); assert(b); \
+ }
+#else
+#define IASSERT(a,b) \
+ if(!(b)){ printf("assert \"%s\" at line %d\n", a, __LINE__); \
+ printf("IpAddress invalid? with IsIPv4()=%c, IsIPv6()=%c\n",(IsIPv4()?'T':'F'),(IsIPv6()?'T':'F')); \
+ printf("ADDRESS: %x\n", (unsigned int)m_SocketAddr.sin_addr.s_addr); \
+ assert(b); \
+ }
+#endif
+
+IpAddress::IpAddress()
+{
+ SetEmpty();
+}
+
+IpAddress::~IpAddress()
+{
+ memset(this,0,sizeof(IpAddress));
+}
+
+int
+IpAddress::GetCIDR() const
+{
+ uint8_t shift,byte;
+ uint8_t bit,caught;
+ int len = 0;
+#if USE_IPV6
+ const uint8_t *ptr= m_SocketAddr.sin6_addr.s6_addr;
+#else
+ const uint8_t *ptr= (uint8_t *)&m_SocketAddr.sin_addr.s_addr;
+#endif
+
+ /* Let's scan all the bits from Most Significant to Least */
+ /* Until we find an "0" bit. Then, we return */
+ shift=0;
+
+#if USE_IPV6
+ /* return IPv4 CIDR for any Mapped address */
+ /* Thus only check the mapped bit */
+
+ if ( !IsIPv6() ) {
+ shift = 12;
+ }
+
+#endif
+
+ for (;shift 128)
+ return false;
+
+ if (cidr > 32 && mtype == AF_INET)
+ return false;
+
+ clearbits = (uint8_t)( (mtype==AF_INET6?128:32) -cidr);
+
+ // short-cut
+ if (clearbits == 0)
+ return true;
+
+#if USE_IPV6
+
+ p = (uint8_t*)(&m_SocketAddr.sin6_addr) + 15;
+
+#else
+
+ p = (uint8_t*)(&m_SocketAddr.sin_addr) + 3;
+
+#endif
+
+ for (; clearbits>0 && p >= (uint8_t*)&m_SocketAddr.sin6_addr ; p-- ) {
+ if (clearbits < 8) {
+ *p &= ((0xFF << clearbits) & 0xFF);
+ clearbits = 0;
+ } else {
+ *p &= 0x00;
+ clearbits -= 8;
+ }
+ }
+
+ return true;
+}
+
+bool IpAddress::IsSockAddr() const
+{
+ return (m_SocketAddr.sin6_port != 0);
+}
+
+bool IpAddress::IsIPv4() const
+{
+#if USE_IPV6
+
+ return IsAnyAddr() || IsNoAddr() ||
+#if IPV6_SPECIAL_LOCALHOST
+ IsLocalhost() ||
+#endif
+ ( m_SocketAddr.sin6_addr.s6_addr32[0] == htonl(0x00000000) &&
+ m_SocketAddr.sin6_addr.s6_addr32[1] == htonl(0x00000000) &&
+ m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0x0000FFFF)
+ );
+
+#else
+ return true; // enforce IPv4 in IPv4-only mode.
+#endif
+}
+
+bool IpAddress::IsIPv6() const
+{
+#if USE_IPV6
+
+ return IsAnyAddr() || IsNoAddr() ||
+#if IPV6_SPECIAL_LOCALHOST
+ IsLocalhost() ||
+#endif
+ !( m_SocketAddr.sin6_addr.s6_addr32[0] == htonl(0x00000000) &&
+ m_SocketAddr.sin6_addr.s6_addr32[1] == htonl(0x00000000) &&
+ m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0x0000FFFF)
+ );
+#else
+ return false; // enforce IPv4 in IPv4-only mode.
+#endif
+}
+
+bool IpAddress::IsAnyAddr() const
+{
+#if USE_IPV6
+ return m_SocketAddr.sin6_addr.s6_addr32[0] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[2] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[3] == 0
+ ;
+#else
+
+ return (INADDR_ANY == m_SocketAddr.sin_addr.s_addr);
+#endif
+}
+
+/// NOTE: Does NOT clear the Port stored. Ony the Address and Type.
+void IpAddress::SetAnyAddr()
+{
+#if USE_IPV6
+ memset(&m_SocketAddr.sin6_addr, 0, sizeof(struct in6_addr) );
+#else
+ memset(&m_SocketAddr.sin_addr, 0, sizeof(struct in_addr) );
+#endif
+}
+
+/// NOTE: completely empties the IpAddress structure. Address, Port, Type, everything.
+void IpAddress::SetEmpty()
+{
+ memset(&m_SocketAddr, 0, sizeof(m_SocketAddr) );
+}
+
+bool IpAddress::SetIPv4()
+{
+#if USE_IPV6
+
+#if !IPV6_SPECIAL_LOCALHOST
+ if ( IsLocalhost() ) {
+ m_SocketAddr.sin6_addr.s6_addr32[2] = htonl(0xffff);
+ m_SocketAddr.sin6_addr.s6_addr32[3] = htonl(0x7F000001);
+ return true;
+ }
+#endif
+
+ if ( IsAnyAddr() ) {
+ m_SocketAddr.sin6_addr.s6_addr32[2] = htonl(0xffff);
+ return true;
+ }
+
+ if ( IsIPv4())
+ return true;
+
+ // anything non-IPv4 and non-convertable is BAD.
+ return false;
+#else
+ return true; // Always IPv4 in IPv4-only builds.
+#endif
+}
+
+bool IpAddress::IsLocalhost() const
+{
+#if USE_IPV6
+ return ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[2] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x1)
+ )
+#if !IPV6_SPECIAL_LOCALHOST
+ ||
+ ( m_SocketAddr.sin6_addr.s6_addr32[0] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[1] == 0
+ && m_SocketAddr.sin6_addr.s6_addr32[2] == htonl(0xffff)
+ && m_SocketAddr.sin6_addr.s6_addr32[3] == htonl(0x7F000001)
+ )
+#endif
+ ;
+#else
+
+ return (htonl(0x7F000001) == m_SocketAddr.sin_addr.s_addr);
+#endif
+}
+
+void IpAddress::SetLocalhost()
+{
+#if USE_IPV6
+ SetAnyAddr();
+ m_SocketAddr.sin6_addr.s6_addr[15] = 0x1;
+ m_SocketAddr.sin6_family = AF_INET6;
+
+#else
+ m_SocketAddr.sin_addr.s_addr = htonl(0x7F000001);
+ m_SocketAddr.sin_family = AF_INET;
+#endif
+}
+
+bool IpAddress::IsNoAddr() const
+{
+ // IFF the address == 0xff..ff (all ones)
+#if USE_IPV6
+ return m_SocketAddr.sin6_addr.s6_addr32[0] == 0xFFFFFFFF
+ && m_SocketAddr.sin6_addr.s6_addr32[1] == 0xFFFFFFFF
+ && m_SocketAddr.sin6_addr.s6_addr32[2] == 0xFFFFFFFF
+ && m_SocketAddr.sin6_addr.s6_addr32[3] == 0xFFFFFFFF
+ ;
+#else
+
+ return 0xFFFFFFFF == m_SocketAddr.sin_addr.s_addr;
+#endif
+}
+
+void IpAddress::SetNoAddr()
+{
+#if USE_IPV6
+ memset(&m_SocketAddr.sin6_addr, 0xFFFFFFFF, sizeof(struct in6_addr) );
+ m_SocketAddr.sin6_family = AF_INET6;
+#else
+ memset(&m_SocketAddr.sin_addr, 0xFFFFFFFF, sizeof(struct in_addr) );
+ m_SocketAddr.sin_family = AF_INET;
+#endif
+}
+
+#if USE_IPV6
+
+bool IpAddress::GetReverseString6(char buf[MAX_IPSTRLEN], const struct in6_addr &dat) const
+{
+ char *p = buf;
+ unsigned char const *r = dat.s6_addr;
+
+ /* RFC1886 says: */
+ /* 4321:0:1:2:3:4:567:89ab */
+ /* must be sent */
+ /* b.a.9.8.7.6.5.0.4.0.0.0.3.0.0.0.2.0.0.0.1.0.0.0.0.0.0.0.1.2.3.4.ip6.int. */
+
+ /* Work from the binary field. Anything else may have representation changes. */
+ /* The sin6_port and sin6_addr members shall be in network byte order. */
+
+ /* Compile Err: 'Too many arguments for format. */
+
+ for (int i = 15; i >= 0; i--, p+=4) {
+ snprintf(p, 5, "%x.%x.", ((r[i])&0xf), (((r[i])>>4)&0xf) );
+ }
+
+ /* RFC3152 says: */
+ /* ip6.int is now deprecated TLD, use ip6.arpa instead. */
+ snprintf(p,10,"ip6.arpa.");
+
+ return true;
+}
+
+#endif
+
+bool IpAddress::GetReverseString4(char buf[MAX_IPSTRLEN], const struct in_addr &dat) const
+{
+ unsigned int i = (unsigned int) ntohl(dat.s_addr);
+ snprintf(buf, 32, "%u.%u.%u.%u.in-addr.arpa.",
+ i & 255,
+ (i >> 8) & 255,
+ (i >> 16) & 255,
+ (i >> 24) & 255);
+ return true;
+}
+
+bool IpAddress::GetReverseString(char buf[MAX_IPSTRLEN], int show_type) const
+{
+
+ if (show_type == AF_UNSPEC) {
+#if USE_IPV6
+ show_type = IsIPv6() ? AF_INET6 : AF_INET ;
+#else
+ show_type = AF_INET;
+#endif
+ }
+
+ if (show_type == AF_INET && IsIPv4()) {
+#if USE_IPV6
+
+ return GetReverseString4(buf, *(struct in_addr*)&m_SocketAddr.sin6_addr.s6_addr32[3] );
+ } else if ( show_type == AF_INET6 && IsIPv6() ) {
+ return GetReverseString6(buf, m_SocketAddr.sin6_addr);
+#else
+ return GetReverseString4(buf, m_SocketAddr.sin_addr);
+#endif
+ }
+
+ debugs(14,0, "Unable to convert '" << NtoA(buf,MAX_IPSTRLEN) << "' to the rDNS type requested.");
+
+ buf[0] = '\0';
+
+ return false;
+}
+
+IpAddress& IpAddress::operator =(const IpAddress &s)
+{
+ memcpy(this, &s, sizeof(IpAddress));
+ return *this;
+};
+
+IpAddress::IpAddress(const char*s)
+{
+ SetEmpty();
+ operator=(s);
+}
+
+bool IpAddress::operator =(const char* s)
+{
+ return LookupHostIP(s, true);
+}
+
+bool IpAddress::GetHostByName(const char* s)
+{
+ return LookupHostIP(s, false);
+}
+
+bool IpAddress::LookupHostIP(const char *s, bool nodns)
+{
+ int err = 0;
+
+ short port = 0;
+
+ struct addrinfo *res = NULL;
+
+ struct addrinfo want;
+
+ memset(&want, 0, sizeof(struct addrinfo));
+ if (nodns) {
+ want.ai_flags = AI_NUMERICHOST; // prevent actual DNS lookups!
+ }
+#if !USE_IPV6
+ want.ai_family = AF_INET;
+#endif
+
+ if ( (err = xgetaddrinfo(s, NULL, &want, &res)) != 0) {
+ debugs(14,1, HERE << "Given Bad IP '" << s << "': " << xgai_strerror(err) );
+ /* free the memory xgetaddrinfo() dynamically allocated. */
+ if (res) {
+ xfreeaddrinfo(res);
+ res = NULL;
+ }
+ return false;
+ }
+
+ /*
+ * NP: =(sockaddr_*) may alter the port. we don't want that.
+ * all we have been given as input was an IPA.
+ */
+ port = GetPort();
+ operator=(*res);
+ SetPort(port);
+
+ /* free the memory xgetaddrinfo() dynamically allocated. */
+ xfreeaddrinfo(res);
+
+ res = NULL;
+
+ return true;
+}
+
+IpAddress::IpAddress(struct sockaddr_in const &s)
+{
+ SetEmpty();
+ operator=(s);
+};
+
+IpAddress& IpAddress::operator =(struct sockaddr_in const &s)
+{
+#if USE_IPV6
+ Map4to6((const in_addr)s.sin_addr, m_SocketAddr.sin6_addr);
+ m_SocketAddr.sin6_port = s.sin_port;
+ m_SocketAddr.sin6_family = AF_INET6;
+#else
+
+ memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
+#endif
+
+ /* maintain stored family values properly */
+ check4Mapped();
+
+ return *this;
+};
+
+IpAddress& IpAddress::operator =(const struct sockaddr_storage &s)
+{
+#if USE_IPV6
+ /* some AF_* magic to tell socket types apart and what we need to do */
+ if (s.ss_family == AF_INET6) {
+ memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
+ } else { // convert it to our storage mapping.
+ struct sockaddr_in *sin = (struct sockaddr_in*)&s;
+ m_SocketAddr.sin6_port = sin->sin_port;
+ Map4to6( sin->sin_addr, m_SocketAddr.sin6_addr);
+ }
+#else
+ memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in));
+#endif
+ return *this;
+};
+
+void IpAddress::check4Mapped()
+{
+ // obsolete.
+ // TODO use this NOW to set the sin6_family properly on exporting. not on import.
+}
+
+#if USE_IPV6
+IpAddress::IpAddress(struct sockaddr_in6 const &s)
+{
+ SetEmpty();
+ operator=(s);
+};
+
+IpAddress& IpAddress::operator =(struct sockaddr_in6 const &s)
+{
+ memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in6));
+
+ /* maintain address family properly */
+ check4Mapped();
+ return *this;
+};
+
+#endif
+
+IpAddress::IpAddress(struct in_addr const &s)
+{
+ SetEmpty();
+ operator=(s);
+};
+
+IpAddress& IpAddress::operator =(struct in_addr const &s)
+{
+#if USE_IPV6
+ Map4to6((const in_addr)s, m_SocketAddr.sin6_addr);
+ m_SocketAddr.sin6_family = AF_INET6;
+
+#else
+
+ memcpy(&m_SocketAddr.sin_addr, &s, sizeof(struct in_addr));
+
+#endif
+
+ /* maintain stored family type properly */
+ check4Mapped();
+
+ return *this;
+};
+
+#if USE_IPV6
+
+IpAddress::IpAddress(struct in6_addr const &s)
+{
+ SetEmpty();
+ operator=(s);
+};
+
+IpAddress& IpAddress::operator =(struct in6_addr const &s)
+{
+
+ memcpy(&m_SocketAddr.sin6_addr, &s, sizeof(struct in6_addr));
+ m_SocketAddr.sin6_family = AF_INET6;
+
+ /* maintain address family type properly */
+ check4Mapped();
+
+ return *this;
+};
+
+#endif
+
+IpAddress::IpAddress(const IpAddress &s)
+{
+ SetEmpty();
+ operator=(s);
+}
+
+IpAddress::IpAddress(IpAddress *s)
+{
+ SetEmpty();
+ operator=(s);
+}
+
+IpAddress& IpAddress::operator =(IpAddress *s)
+{
+ IpAddress *tmp = NULL;
+ if (!s) return *this;
+ tmp = dynamic_cast(s);
+ if (!tmp) return *this;
+ return operator=(*tmp);
+}
+
+IpAddress::IpAddress(const struct hostent &s)
+{
+ SetEmpty();
+ operator=(s);
+}
+
+bool IpAddress::operator =(const struct hostent &s)
+{
+
+ struct in_addr* ipv4 = NULL;
+
+ struct in6_addr* ipv6 = NULL;
+
+ //struct hostent {
+ // char *h_name; /* official name of host */
+ // char **h_aliases; /* alias list */
+ // int h_addrtype; /* host address type */
+ // int h_length; /* length of address */
+ // char **h_addr_list; /* list of addresses */
+ //}
+
+ switch (s.h_addrtype) {
+
+ case AF_INET:
+ ipv4 = (in_addr*)(s.h_addr_list[0]);
+ /* this */
+ operator=(*ipv4);
+ break;
+
+ case AF_INET6:
+ ipv6 = (in6_addr*)(s.h_addr_list[0]);
+#if USE_IPV6
+ /* this */
+ operator=(*ipv6);
+#else
+
+ debugs(14,1, HERE << "Discarded IPv6 Address. Protocol disabled.");
+
+ // FIXME see if there is another address in the list that might be usable ??
+ return false;
+#endif
+
+ break;
+
+ default:
+ IASSERT("false",false);
+ return false;
+ }
+
+ return true;
+}
+
+IpAddress::IpAddress(const struct addrinfo &s)
+{
+ SetEmpty();
+ operator=(s);
+}
+
+bool IpAddress::operator =(const struct addrinfo &s)
+{
+
+ struct sockaddr_in* ipv4 = NULL;
+
+ struct sockaddr_in6* ipv6 = NULL;
+
+ //struct addrinfo {
+ // int ai_flags; /* input flags */
+ // int ai_family; /* protocol family for socket */
+ // int ai_socktype; /* socket type */
+ // int ai_protocol; /* protocol for socket */
+ // socklen_t ai_addrlen; /* length of socket-address */
+ // struct sockaddr *ai_addr; /* socket-address for socket */
+ // char *ai_canonname; /* canonical name for service location */
+ // struct addrinfo *ai_next; /* pointer to next in list */
+ //}
+
+ switch (s.ai_family) {
+
+ case AF_INET:
+ ipv4 = (sockaddr_in*)(s.ai_addr);
+ /* this */
+ assert(ipv4);
+ operator=(*ipv4);
+ break;
+
+ case AF_INET6:
+ ipv6 = (sockaddr_in6*)(s.ai_addr);
+#if USE_IPV6
+ /* this */
+ assert(ipv6);
+ operator=(*ipv6);
+#else
+
+ debugs(14,1, HERE << "Discarded IPv6 Address. Protocol disabled.");
+
+ // see if there is another address in the list that might be usable ??
+
+ if (s.ai_next)
+ return operator=(*s.ai_next);
+ else
+ return false;
+
+#endif
+ break;
+
+ case AF_UNSPEC:
+ default:
+ // attempt to handle partially initialised addrinfo.
+ // such as those where data only comes from getsockopt()
+ if (s.ai_addr != NULL) {
+#if USE_IPV6
+ if (s.ai_addrlen == sizeof(struct sockaddr_in6)) {
+ operator=(*((struct sockaddr_in6*)s.ai_addr));
+ return true;
+ } else
+#endif
+ if (s.ai_addrlen == sizeof(struct sockaddr_in)) {
+ operator=(*((struct sockaddr_in*)s.ai_addr));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ return true;
+}
+
+void IpAddress::GetAddrInfo(struct addrinfo *&dst, int force) const
+{
+ if (dst == NULL) {
+ dst = new addrinfo;
+ }
+
+ memset(dst, 0, sizeof(struct addrinfo));
+
+ // set defaults
+ dst->ai_flags = AI_NUMERICHOST;
+
+ if (dst->ai_socktype == 0)
+ dst->ai_socktype = SOCK_STREAM;
+
+ if (dst->ai_socktype == SOCK_STREAM // implies TCP
+ && dst->ai_protocol == 0)
+ dst->ai_protocol = IPPROTO_TCP;
+
+ if (dst->ai_socktype == SOCK_DGRAM // implies UDP
+ && dst->ai_protocol == 0)
+ dst->ai_protocol = IPPROTO_UDP;
+
+#if USE_IPV6
+ if ( force == AF_INET6 || (force == AF_UNSPEC && IsIPv6()) ) {
+ dst->ai_addr = (struct sockaddr*)new sockaddr_in6;
+
+ memset(dst->ai_addr,0,sizeof(struct sockaddr_in6));
+
+ GetSockAddr(*((struct sockaddr_in6*)dst->ai_addr));
+
+ dst->ai_addrlen = sizeof(struct sockaddr_in6);
+
+ dst->ai_family = ((struct sockaddr_in6*)dst->ai_addr)->sin6_family;
+
+#if 0
+ /**
+ * Enable only if you must and please report to squid-dev if you find a need for this.
+ *
+ * Vista may need this to cope with dual-stack (unsetting IP6_V6ONLY).
+ * http://msdn.microsoft.com/en-us/library/ms738574(VS.85).aspx
+ * Linux appears to only do some things when its present.
+ * (93) Bad Protocol
+ * FreeBSD dies horribly when using dual-stack with it set.
+ * (43) Protocol not supported
+ */
+ dst->ai_protocol = IPPROTO_IPV6;
+#endif
+
+ } else
+#endif
+ if ( force == AF_INET || (force == AF_UNSPEC && IsIPv4()) ) {
+
+ dst->ai_addr = (struct sockaddr*)new sockaddr_in;
+
+ memset(dst->ai_addr,0,sizeof(struct sockaddr_in));
+
+ GetSockAddr(*((struct sockaddr_in*)dst->ai_addr));
+
+ dst->ai_addrlen = sizeof(struct sockaddr_in);
+
+ dst->ai_family = ((struct sockaddr_in*)dst->ai_addr)->sin_family;
+ } else {
+ IASSERT("false",false);
+ }
+}
+
+void IpAddress::InitAddrInfo(struct addrinfo *&ai) const
+{
+ if (ai == NULL) {
+ ai = new addrinfo;
+ memset(ai,0,sizeof(struct addrinfo));
+ }
+
+ // remove any existing data.
+ if (ai->ai_addr) delete ai->ai_addr;
+
+ ai->ai_addr = (struct sockaddr*)new sockaddr_in6;
+ memset(ai->ai_addr, 0, sizeof(struct sockaddr_in6));
+
+ ai->ai_addrlen = sizeof(struct sockaddr_in6);
+
+}
+
+void IpAddress::FreeAddrInfo(struct addrinfo *&ai) const
+{
+ if (ai == NULL) return;
+
+ if (ai->ai_addr) delete ai->ai_addr;
+
+ ai->ai_addr = NULL;
+
+ ai->ai_addrlen = 0;
+
+ // NP: name fields are NOT allocated at present.
+ delete ai;
+
+ ai = NULL;
+}
+
+int IpAddress::matchIPAddr(const IpAddress &rhs) const
+{
+#if USE_IPV6
+ uint8_t *l = (uint8_t*)m_SocketAddr.sin6_addr.s6_addr;
+ uint8_t *r = (uint8_t*)rhs.m_SocketAddr.sin6_addr.s6_addr;
+#else
+ uint8_t *l = (uint8_t*)&m_SocketAddr.sin_addr.s_addr;
+ uint8_t *r = (uint8_t*)&rhs.m_SocketAddr.sin_addr.s_addr;
+#endif
+
+ // loop a byte-wise compare
+ // NP: match MUST be R-to-L : L-to-R produces inconsistent gt/lt results at varying CIDR
+ // expected difference on CIDR is gt/eq or lt/eq ONLY.
+ for (unsigned int i = 0 ; i < sizeof(m_SocketAddr.sin6_addr) ; i++) {
+
+ if (l[i] < r[i])
+ return -1;
+
+ if (l[i] > r[i])
+ return 1;
+ }
+
+ return 0;
+}
+
+bool IpAddress::operator ==(const IpAddress &s) const
+{
+ return (0 == matchIPAddr(s));
+}
+
+bool IpAddress::operator !=(const IpAddress &s) const
+{
+ return ! ( operator==(s) );
+}
+
+bool IpAddress::operator <=(const IpAddress &rhs) const
+{
+ if (IsAnyAddr() && !rhs.IsAnyAddr())
+ return true;
+
+ return (matchIPAddr(rhs) <= 0);
+}
+
+bool IpAddress::operator >=(const IpAddress &rhs) const
+{
+ if (IsNoAddr() && !rhs.IsNoAddr())
+ return true;
+
+ return ( matchIPAddr(rhs) >= 0);
+}
+
+bool IpAddress::operator >(const IpAddress &rhs) const
+{
+ if (IsNoAddr() && !rhs.IsNoAddr())
+ return true;
+
+ return ( matchIPAddr(rhs) > 0);
+}
+
+bool IpAddress::operator <(const IpAddress &rhs) const
+{
+ if (IsNoAddr() && !rhs.IsNoAddr())
+ return true;
+
+ return ( matchIPAddr(rhs) < 0);
+}
+
+u_short IpAddress::GetPort() const
+{
+ return ntohs( m_SocketAddr.sin6_port );
+}
+
+u_short IpAddress::SetPort(u_short prt)
+{
+ m_SocketAddr.sin6_port = htons(prt);
+
+ return prt;
+}
+
+/**
+ * NtoA Given a buffer writes a readable ascii version of the IPA and/or port stored
+ *
+ * Buffer must be of a size large enough to hold the converted address.
+ * This size is provided in the form of a global defined variable MAX_IPSTRLEN
+ * Should a buffer shorter be provided the string result will be truncated
+ * at the length of the available buffer.
+ *
+ * A copy of the buffer is also returned for simple immediate display.
+ */
+char* IpAddress::NtoA(char* buf, const unsigned int blen, int force) const
+{
+ // Ensure we have a buffer.
+ if (buf == NULL) {
+ return NULL;
+ }
+
+ /* some external code may have blindly memset a parent. */
+ /* thats okay, our default is known */
+ if ( IsAnyAddr() ) {
+#if USE_IPV6
+ memcpy(buf,"::\0", xmin(3,blen));
+#else
+ memcpy(buf,"0.0.0.0\0", xmin(8,blen));
+#endif
+ return buf;
+ }
+
+ memset(buf,0,blen); // clear buffer before write
+
+ /* Pure-IPv6 CANNOT be displayed in IPv4 format. */
+ /* However IPv4 CAN. */
+ if ( force == AF_INET && !IsIPv4() ) {
+ if ( IsIPv6() ) {
+ memcpy(buf, "{!IPv4}\0", xmin(8,blen));
+ }
+ return buf;
+ }
+
+#if USE_IPV6
+ if ( force == AF_INET6 || (force == AF_UNSPEC && IsIPv6()) ) {
+
+ xinet_ntop(AF_INET6, &m_SocketAddr.sin6_addr, buf, blen);
+
+ } else if ( force == AF_INET || (force == AF_UNSPEC && IsIPv4()) ) {
+
+ struct in_addr tmp;
+ GetInAddr(tmp);
+ xinet_ntop(AF_INET, &tmp, buf, blen);
+#else
+ if ( force == AF_UNSPEC || (force == AF_INET && IsIPv4()) ) {
+ xinet_ntop(AF_INET, &m_SocketAddr.sin_addr, buf, blen);
+#endif
+ } else {
+ debugs(14,0,"WARNING: Corrupt IP Address details OR required to display in unknown format (" <<
+ force << "). accepted={" << AF_UNSPEC << "," << AF_INET << "," << AF_INET6 << "}");
+ fprintf(stderr,"WARNING: Corrupt IP Address details OR required to display in unknown format (%d). accepted={%d,%d,%d} ",
+ force, AF_UNSPEC, AF_INET, AF_INET6);
+ memcpy(buf,"dead:beef::\0", xmin(13,blen));
+ assert(false);
+ }
+
+ return buf;
+}
+
+unsigned int IpAddress::ToHostname(char *buf, const unsigned int blen) const {
+ char *p = buf;
+
+ if (IsIPv6() && blen > 0) {
+ *p = '[';
+ p++;
+ }
+
+ /* 7 being space for [,], and port */
+ if ( IsIPv6() )
+ NtoA(p, blen-7, AF_INET6);
+ else
+ NtoA(p, blen-7, AF_INET);
+
+ // find the end of the new string
+ while (*p != '\0' && p < buf+blen)
+ p++;
+
+ if (IsIPv6() && p < (buf+blen-1) ) {
+ *p = ']';
+ p++;
+ }
+
+ /* terminate just in case. */
+ *p = '\0';
+
+ /* return size of buffer now used */
+ return (p - buf);
+}
+
+char* IpAddress::ToURL(char* buf, unsigned int blen) const {
+ char *p = buf;
+
+ // Ensure we have a buffer.
+
+ if (buf == NULL) {
+ return NULL;
+ }
+
+ p += ToHostname(p, blen);
+
+ if (m_SocketAddr.sin6_port > 0 && p < (buf+blen-6) ) {
+ /* 6 is max length of expected ':port' (short int) */
+ snprintf(p, 6,":%d", GetPort() );
+ }
+
+ // force a null-terminated string
+ buf[blen-1] = '\0';
+
+ return buf;
+}
+
+void IpAddress::GetSockAddr(struct sockaddr_storage &addr, const int family) const {
+ struct sockaddr_in *sin = NULL;
+
+ if ( family == AF_INET && !IsIPv4()) {
+ // FIXME INET6: caller using the wrong socket type!
+ debugs(14, DBG_CRITICAL, HERE << "IpAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4. from " << *this);
+ assert(false);
+ }
+
+#if USE_IPV6
+ if ( family == AF_INET6 || (family == AF_UNSPEC && IsIPv6()) ) {
+ struct sockaddr_in6 *ss6 = (struct sockaddr_in6*)&addr;
+ GetSockAddr(*ss6);
+ } else if ( family == AF_INET || (family == AF_UNSPEC && IsIPv4()) ) {
+ sin = (struct sockaddr_in*)&addr;
+ GetSockAddr(*sin);
+ } else {
+ IASSERT("false",false);
+ }
+#else /* not USE_IPV6 */
+ sin = (struct sockaddr_in*)&addr;
+ GetSockAddr(*sin);
+#endif /* USE_IPV6 */
+}
+
+void IpAddress::GetSockAddr(struct sockaddr_in &buf) const {
+#if USE_IPV6
+
+ if ( IsIPv4() ) {
+ buf.sin_family = AF_INET;
+ buf.sin_port = m_SocketAddr.sin6_port;
+ Map6to4( m_SocketAddr.sin6_addr, buf.sin_addr);
+ } else {
+ debugs(14, DBG_CRITICAL, HERE << "IpAddress::GetSockAddr : Cannot convert non-IPv4 to IPv4. from " << *this );
+
+ memset(&buf,0xFFFFFFFF,sizeof(struct sockaddr_in));
+ assert(false);
+ }
+
+#else
+
+ memcpy(&buf, &m_SocketAddr, sizeof(struct sockaddr_in));
+
+ if (buf.sin_family == 0) {
+ buf.sin_family = AF_INET;
+ }
+
+#endif
+
+#if HAVE_SIN_LEN_IN_SAI
+ /* not all OS have this field, BUT when they do it can be a problem if set wrong */
+ buf.sin_len = sizeof(struct sockaddr_in);
+#endif
+
+}
+
+#if USE_IPV6
+
+void IpAddress::GetSockAddr(struct sockaddr_in6 &buf) const {
+ memcpy(&buf, &m_SocketAddr, sizeof(struct sockaddr_in6));
+ /* maintain address family. It may have changed inside us. */
+ buf.sin6_family = AF_INET6;
+
+#if HAVE_SIN6_LEN_IN_SAI
+ /* not all OS have this field, BUT when they do it can be a problem if set wrong */
+ buf.sin6_len = sizeof(struct sockaddr_in6);
+#endif
+}
+
+#endif
+
+#if USE_IPV6
+
+void IpAddress::Map4to6(const struct in_addr &in, struct in6_addr &out) const {
+ /* check for special cases */
+
+ if ( in.s_addr == 0x00000000) {
+ /* ANYADDR */
+
+ memset(&out, 0, sizeof(struct in6_addr));
+ } else if ( in.s_addr == 0xFFFFFFFF) {
+ /* NOADDR */
+
+ out.s6_addr32[0] = 0xFFFFFFFF;
+ out.s6_addr32[1] = 0xFFFFFFFF;
+ out.s6_addr32[2] = 0xFFFFFFFF;
+ out.s6_addr32[3] = 0xFFFFFFFF;
+
+#if IPV6_SPECIAL_LOCALHOST
+ } else if ( in.s_addr == htonl(0x7F000001)) {
+ /* LOCALHOST */
+
+ memset(&out, 0, sizeof(struct in6_addr));
+ out.s6_addr32[3] = htonl(0x1);
+#endif
+
+ } else {
+ /* general */
+
+ memset(&out, 0, sizeof(struct in6_addr));
+ out.s6_addr32[2] = htonl(0xFFFF);
+ out.s6_addr32[3] = in.s_addr;
+ }
+}
+
+void IpAddress::Map6to4(const struct in6_addr &in, struct in_addr &out) const {
+ /* ANYADDR */
+ /* NOADDR */
+ /* general */
+
+ memset(&out, 0, sizeof(struct in_addr));
+ out.s_addr = in.s6_addr32[3];
+
+#if IPV6_SPECIAL_LOCALHOST
+ /* LOCALHOST */
+
+ if ( IsLocalhost() ) {
+ out.s_addr = htonl(0x7F000001);
+ }
+#endif
+
+}
+
+#endif
+
+#if USE_IPV6
+void IpAddress::GetInAddr(in6_addr &buf) const {
+ memcpy(&buf, &m_SocketAddr.sin6_addr, sizeof(struct in6_addr));
+}
+
+#endif
+
+bool IpAddress::GetInAddr(struct in_addr &buf) const {
+
+#if USE_IPV6
+ if ( IsIPv4() ) {
+ Map6to4((const in6_addr)m_SocketAddr.sin6_addr, buf);
+ return true;
+ }
+#else
+
+ if ( IsIPv4() ) {
+ memcpy(&buf, &m_SocketAddr.sin_addr, sizeof(struct in_addr));
+ return true;
+ }
+#endif
+
+ // default:
+ // non-compatible IPv6 Pure Address
+
+ debugs(14,1, HERE << "IpAddress::GetInAddr : Cannot convert non-IPv4 to IPv4. IPA=" << *this);
+ memset(&buf,0xFFFFFFFF,sizeof(struct in_addr));
+ assert(false);
+ return false;
+}
diff -u -r -N squid-3.1.0.3/src/ip/IpAddress.h squid-3.1.0.4/src/ip/IpAddress.h
--- squid-3.1.0.3/src/ip/IpAddress.h 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/IpAddress.h 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,435 @@
+/*
+ * DEBUG: section 14 IP Storage and Handling
+ * AUTHOR: Amos Jeffries
+ *
+ * SQUID Internet Object Cache http://squid.nlanr.net/Squid/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from the
+ * Internet community. Development is led by Duane Wessels of the
+ * National Laboratory for Applied Network Research and funded by the
+ * National Science Foundation. Squid is Copyrighted (C) 1998 by
+ * the Regents of the University of California. Please see the
+ * COPYRIGHT file for full details. Squid incorporates software
+ * developed and/or copyrighted by other sources. Please see the
+ * CREDITS file for full details.
+ *
+ * This IpAddress code is copyright (C) 2007 by Treehouse Networks Ltd
+ * of New Zealand. It is published and Lisenced as an extension of
+ * squid under the same conditions as the main squid application.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+#ifndef _INC_IPADDRESS_H
+#define _INC_IPADDRESS_H
+
+#include "getaddrinfo.h"
+#include "getnameinfo.h"
+#include "inet_ntop.h"
+#include "inet_pton.h"
+
+
+#if HAVE_SYS_SOCKET_H
+#include
+#endif
+#if HAVE_NETINET_IN_H
+#include
+#endif
+#ifdef _SQUID_MSWIN_
+#include
+#endif
+#if HAVE_NETDB_H && !defined(_SQUID_NETDB_H_) /* protect NEXTSTEP */
+#define _SQUID_NETDB_H_
+#ifdef _SQUID_NEXT_
+#include
+#endif
+#include
+#endif
+
+#include
+#include
+
+
+/* FreeBSD hack:
+ * This OS has at least one version that defines these as private
+ * kernel macros commented as being 'non-standard'.
+ * We need to use them, much nicer than the OS-provided __u*_*[]
+ * UPDATE: OpenBSD 4.3 has the same.
+ * UPDATE: MacOSX has the same.
+ */
+#if USE_IPV6 && ( defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_APPLE_))
+//#define s6_addr8 __u6_addr.__u6_addr8
+//#define s6_addr16 __u6_addr.__u6_addr16
+#define s6_addr32 __u6_addr.__u6_addr32
+#endif
+
+/* OpenBSD also hide v6only socket option we need for comm layer. :-( */
+#if !defined(IPV6_V6ONLY) && defined(_SQUID_OPENBSD_)
+#define IPV6_V6ONLY 27 // from OpenBSD 4.3 headers. (NP: does not match non-BSD OS values)
+#endif
+
+/* Bug 2500: Solaris 10/11 require s6_addr* defines. */
+#if USE_IPV6 && defined(_SQUID_SOLARIS_)
+//#define s6_addr8 _S6_un._S6_u8
+//#define s6_addr16 _S6_un._S6_u16
+#define s6_addr32 _S6_un._S6_u32
+#endif
+
+/// Length of buffer that needs to be allocated to old a null-terminated IP-string
+// Yuck. But there are still structures that need it to be an 'integer constant'.
+#define MAX_IPSTRLEN 75
+
+/**
+ * Holds and manipulates IPv4, IPv6, and Socket Addresses.
+ */
+class IpAddress
+{
+
+public:
+ /** @name Constructors and Destructor */
+ /*@{*/
+ IpAddress();
+ IpAddress(const IpAddress &);
+
+ /**
+ * This constructor takes its own copy of the object pointed to for memory-safe usage later.
+ * The caller must itself perform and ptr memory-management needed.
+ *
+ \deprecated Use of pointers can be nasty. Consider this a last-resort.
+ * Prefer the by-reference (&) version instead.
+ */
+ IpAddress(IpAddress *);
+
+ IpAddress(const struct in_addr &);
+
+ IpAddress(const struct sockaddr_in &);
+#if USE_IPV6
+
+ IpAddress(const struct in6_addr &);
+
+ IpAddress(const struct sockaddr_in6 &);
+#endif
+
+ IpAddress(const struct hostent &);
+ IpAddress(const struct addrinfo &);
+ IpAddress(const char*);
+ /// Default destructor.
+ ~IpAddress();
+ /*@}*/
+
+ /** @name Assignment Operators */
+ /*@{*/
+ IpAddress& operator =(const IpAddress &s);
+ IpAddress& operator =(IpAddress *s);
+ IpAddress& operator =(struct sockaddr_in const &s);
+ IpAddress& operator =(struct sockaddr_storage const &s);
+ IpAddress& operator =(struct in_addr const &s);
+#if USE_IPV6
+ IpAddress& operator =(struct in6_addr const &s);
+ IpAddress& operator =(struct sockaddr_in6 const &s);
+#endif
+ bool operator =(const struct hostent &s);
+ bool operator =(const struct addrinfo &s);
+ bool operator =(const char *s);
+ /*@}*/
+
+ /** @name Boolean Operators */
+ /*@{*/
+ bool operator ==(IpAddress const &s) const;
+ bool operator !=(IpAddress const &s) const;
+ bool operator >=(IpAddress const &rhs) const;
+ bool operator <=(IpAddress const &rhs) const;
+ bool operator >(IpAddress const &rhs) const;
+ bool operator <(IpAddress const &rhs) const;
+
+public:
+ /* methods */
+
+ /** Test whether content can be used as an IPv4 address
+ \retval true if content was received as an IPv4 address
+ \retval true if content was received as an IPv4-Mapped address
+ \retval false if content was received as a non-mapped IPv6 native address.
+ */
+ bool IsIPv4() const;
+
+ /** Test whether content can be used as an IPv6 address.
+ \retval true if --enable-ipv6 has been compiled.
+ \retval false if --disable-ipv6 has been compiled.
+ \retval false if --with-ipv6-split-stack has been compiled AND content is IPv4-mapped.
+ */
+ bool IsIPv6() const;
+
+ /** Test whether content can be used as a Socket address.
+ \retval true if address AND port are both set
+ \retval true if content was received as a Socket address with port
+ \retval false if port in unset (zero)
+ */
+ bool IsSockAddr() const;
+
+ /** Content-neutral test for whether the specific IP case ANY_ADDR is stored.
+ * This is the default content of a new undefined IpAddress object.
+ \retval true IPv4 0.0.0.0
+ \retval true IPv6 ::
+ \retval false anything else.
+ */
+ bool IsAnyAddr() const;
+
+ /** Content-neutral test for whether the specific IP case NO_ADDR is stored.
+ \retval true IPv4 255.255.255.255
+ \retval true IPv6 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+ \retval false anything else.
+ */
+ bool IsNoAddr() const;
+
+ /** Content-neutral test for whether the specific IP case LOCALHOST is stored.
+ * This is the default content of a new undefined IpAddress object.
+ \retval true IPv4 127.0.0.1
+ \retval true IPv6 ::1
+ \retval false anything else.
+ */
+ bool IsLocalhost() const;
+
+ /*@}*/
+
+ /** Retrieve the Port if stored.
+ \retval 0 Port is unset or an error occured.
+ \retval n Port associated with this address in host native -endian.
+ */
+ u_short GetPort() const;
+
+ /** Set the Port value for an address.
+ * Replaces any previously existing Port value.
+ \param port Port being assigned in host native -endian.
+ \retval 0 Port is unset or an error occured.
+ \retval n Port associated with this address in host native -endian.
+ */
+ u_short SetPort(u_short port);
+
+ /// Set object to contain the specific IP case ANY_ADDR (format-neutral).
+ /// see IsAnyAddr() for more detail.
+ void SetAnyAddr();
+
+ /// Set object to contain the specific IP case NO_ADDR (format-neutral).
+ /// see \link IsNoAddr() for more detail.
+ void SetNoAddr();
+
+ /// Set object to contain the specific IP case LOCALHOST (format-neutral).
+ /// see \link IsLocalhost() for more detail.
+ void SetLocalhost();
+
+ /// Fast reset of the stored content to what would be after default constructor.
+ void SetEmpty();
+
+ /** Require an IPv4-only address for this usage.
+ * Converts the object to prefer only IPv4 output.
+ \retval true Content can be IPv4
+ \retval false Content CANNOT be IPv4
+ */
+ bool SetIPv4();
+
+ /**
+ * Valid results IF and only IF the stored IP address is actually a network bitmask
+ \retval N number of bits which are set in the bitmask stored.
+ */
+ int GetCIDR() const;
+
+ /** Apply a mask to the stored address.
+ \param mask Netmask format to be bit-mask-AND'd over the stored address.
+ */
+ const int ApplyMask(const IpAddress &mask);
+
+ /** Apply a mask to the stored address.
+ * CIDR will be converted appropriate to map the stored content.
+ \param cidr CIDR Mask being applied. As an integer in host format.
+ \param mtype Type of CIDR mask being applied (AF_INET or AF_INET6)
+ */
+ bool ApplyMask(const unsigned int cidr, int mtype = AF_UNSPEC);
+
+
+ /** Return the ASCII equivalent of the address
+ * Semantically equivalent to the IPv4 inet_ntoa()
+ * eg. 127.0.0.1 (IPv4) or ::1 (IPv6)
+ * But for memory safety it requires a buffer as input
+ * instead of producing one magically.
+ * If buffer is not large enough the data is truncated silently.
+ \param buf Allocated buffer to write address to
+ \param len byte length of buffer available for writing.
+ \param force (optional) require the IPA in a specific format.
+ \return pointer to buffer received.
+ */
+ char* NtoA(char *buf, unsigned int len, int force = AF_UNSPEC) const;
+
+ /** Return the ASCII equivalent of the address:port combination
+ * Provides a URL formatted version of the content.
+ * If buffer is not large enough the data is truncated silently.
+ * eg. 127.0.0.1:80 (IPv4) or [::1]:80 (IPv6)
+ \param buf Allocated buffer to write address:port to
+ \param len byte length of buffer available for writing.
+ \return pointer to buffer received.
+ */
+ char* ToURL(char *buf, unsigned int len) const;
+
+ /** Return a properly hostname formatted copy of the address
+ * Provides a URL formatted version of the content.
+ * If buffer is not large enough the data is truncated silently.
+ * eg. 127.0.0.1 (IPv4) or [::1] (IPv6)
+ \param buf Allocated buffer to write address to
+ \param len byte length of buffer available for writing.
+ \return pointer to buffer received.
+ */
+ unsigned int ToHostname(char *buf, const unsigned int len) const;
+
+ /**
+ * Convert the content into a Reverse-DNS string.
+ * The buffer sent MUST be allocated large enough to hold the resulting string.
+ * Name truncation will occur if buf does not have enough space.
+ * The constant MAX_IPSTRLEN is defined to provide for sizing arrays correctly.
+ \param show_format may be one of: AF_INET, AF_INET6 for the format of rDNS string wanted.
+ \param buf buffer to receive the text string output.
+ */
+ bool GetReverseString(char buf[], int show_format = AF_UNSPEC) const;
+
+ /** Test how two IP relate to each other.
+ \retval 0 IP are equal
+ \retval 1 IP rhs is greater (numerically) than that stored.
+ \retval -1 IP rhs is less (numerically) than that stored.
+ */
+ int matchIPAddr(const IpAddress &rhs) const;
+
+ /**
+ * Get RFC 3493 addrinfo structure from the IpAddress data
+ * for protocol-neutral socket operations.
+ * Should be passed a NULL pointer of type struct addrinfo* it will
+ * allocate memory for the structures involved. (see FreeAddrInfo to clear).
+ * Defaults to a TCP streaming socket, if other values (such as UDP) are needed
+ * the caller MUST override these default settings.
+ * Some situations may also require an actual call to the system getaddrinfo()
+ * to pull relevant OS details for the socket.
+ \par
+ * IpAddress allocated objects MUST be destructed by IpAddress::FreeAddrInfo
+ * System getaddrinfo() allocated objects MUST be freed with system freeaddrinfo()
+ \par
+ * Some OS require that IPv4 addresses are pre-mapped by the client.
+ * The configure option --with-ipv4-mapping=yes will enable this.
+ *
+ \param ai structure to be filled out.
+ \param force a specific sockaddr type is needed. default: don't care.
+ */
+#if IPV6_SPECIAL_V4MAPPING
+ void GetAddrInfo(struct addrinfo *&ai, int force = AF_INET6) const;
+#else
+ void GetAddrInfo(struct addrinfo *&ai, int force = AF_UNSPEC) const;
+#endif
+
+ /**
+ * Equivalent to the sysem call freeaddrinfo() but for IpAddress allocated data
+ */
+ void FreeAddrInfo(struct addrinfo *&ai) const;
+
+ /**
+ * Initializes an empty addrinfo properly for use.
+ * It is intended for use in cases such as getsockopt() where the addrinfo is
+ * about to be changed and the stored details may not match the new ones coming.
+ \param ai addrinfo struct to be initialized as AF_UNSPEC with large address buffer
+ */
+ void InitAddrInfo(struct addrinfo *&ai) const;
+
+ /**
+ * Lookup a Host by Name. Equivalent to system call gethostbyname(char*)
+ \param s The textual FQDN of the host being located.
+ \retval true lookup was successful and an IPA was located.
+ \retval false lookup failed or FQDN has no IP associated.
+ */
+ bool GetHostByName(const char *s);
+
+public:
+ /* FIXME: When C => C++ conversion is done will be fully private.
+ * Legacy Transition Methods.
+ * These are here solely to simplify the transition
+ * when moving from converted code to unconverted
+ * these functions can be used to convert this object
+ * and pull out the data needed by the unconverted code
+ * they are intentionaly hard to use, use GetAddrInfo() instead.
+ * these functiosn WILL NOT be in the final public API after transition.
+ */
+
+ void GetSockAddr(struct sockaddr_storage &addr, const int family) const;
+
+ /// \deprecated Deprecated for public use. Use IpAddress::GetAddrInfo()
+ void GetSockAddr(struct sockaddr_in &) const;
+
+ /// \deprecated Deprecated for public use. Use IpAddress::GetAddrInfo()
+ bool GetInAddr(struct in_addr &) const; /* false if could not convert IPv6 down to IPv4 */
+#if USE_IPV6
+
+ /// \deprecated Deprecated for public use. Use IpAddress::GetAddrInfo()
+ void GetSockAddr(struct sockaddr_in6 &) const;
+
+ /// \deprecated Deprecated for public use. Use IpAddress::GetAddrInfo()
+ void GetInAddr(struct in6_addr &) const;
+#endif
+
+private:
+ /* Conversion for dual-type internals */
+
+ bool GetReverseString4(char buf[], const struct in_addr &) const;
+
+ void check4Mapped();
+
+#if USE_IPV6
+
+ bool GetReverseString6(char buf[], const struct in6_addr &) const;
+
+ void Map4to6(const struct in_addr &src, struct in6_addr &dest) const;
+
+ void Map6to4(const struct in6_addr &src, struct in_addr &dest) const;
+#endif
+
+ // Worker behind GetHostName and char* converters
+ bool LookupHostIP(const char *s, bool nodns);
+
+ /* variables */
+#if USE_IPV6
+
+ struct sockaddr_in6 m_SocketAddr;
+#else
+
+ struct sockaddr_in m_SocketAddr;
+#endif
+};
+
+
+inline std::ostream &
+operator << (std::ostream &os, const IpAddress &ipa)
+{
+ char buf[MAX_IPSTRLEN];
+ os << ipa.ToURL(buf,MAX_IPSTRLEN);
+ return os;
+}
+
+// WAS _sockaddr_in_list in an earlier incarnation
+class IpAddress_list
+{
+public:
+ IpAddress_list() { next = NULL; };
+ ~IpAddress_list() { if (next) delete next; next = NULL; };
+
+ IpAddress s;
+ IpAddress_list *next;
+};
+
+
+#endif /* _INC_IPADDRESS_H */
diff -u -r -N squid-3.1.0.3/src/ip/IpIntercept.cc squid-3.1.0.4/src/ip/IpIntercept.cc
--- squid-3.1.0.3/src/ip/IpIntercept.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/IpIntercept.cc 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,432 @@
+/*
+ * DEBUG: section 89 NAT / IP Interception
+ * AUTHOR: Robert Collins
+ * AUTHOR: Amos Jeffries
+ *
+ * SQUID Web Proxy Cache http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ * Squid is the result of efforts by numerous individuals from
+ * the Internet community; see the CONTRIBUTORS file for full
+ * details. Many organizations have provided support for Squid's
+ * development; see the SPONSORS file for full details. Squid is
+ * Copyrighted (C) 2001 by the Regents of the University of
+ * California; see the COPYRIGHT file for full details. Squid
+ * incorporates software developed and/or copyrighted by other
+ * sources; see the CREDITS file for full details.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+#include "config.h"
+#include "IpIntercept.h"
+#include "fde.h"
+
+#if IPF_TRANSPARENT
+
+#if HAVE_SYS_IOCTL_H
+#include
+#endif
+#if HAVE_NETINET_TCP_H
+#include
+#endif
+#if HAVE_NET_IF_H
+#include
+#endif
+#ifdef HAVE_IPL_H
+#include
+#elif HAVE_NETINET_IPL_H
+#include
+#endif
+#if HAVE_IP_FIL_COMPAT_H
+#include
+#elif HAVE_NETINET_IP_FIL_COMPAT_H
+#include
+#elif HAVE_IP_COMPAT_H
+#include
+#elif HAVE_NETINET_IP_COMPAT_H
+#include
+#endif
+#if HAVE_IP_FIL_H
+#include
+#elif HAVE_NETINET_IP_FIL_H
+#include
+#endif
+#if HAVE_IP_NAT_H
+#include
+#elif HAVE_NETINET_IP_NAT_H
+#include
+#endif
+
+#endif /* IPF_TRANSPARENT required headers */
+
+#if PF_TRANSPARENT
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#endif /* PF_TRANSPARENT required headers */
+
+#if LINUX_NETFILTER
+#include
+#include
+#endif
+
+#if LINUX_TPROXY2
+#ifdef HAVE_LINUX_NETFILTER_IPV4_IP_TPROXY_H
+#include
+#else
+#error " TPROXY v2 Header file missing: linux/netfilter_ipv4/ip_tproxy.h. Perhapse you meant to use TPROXY v4 ? "
+#endif
+#endif
+
+
+// single global instance for access by other components.
+IpIntercept IpInterceptor;
+
+void
+IpIntercept::StopTransparency(const char *str)
+{
+ if (transparent_active) {
+ debugs(89, DBG_IMPORTANT, "Stopping full transparency: " << str);
+ transparent_active = 0;
+ }
+}
+
+void
+IpIntercept::StopInterception(const char *str)
+{
+ if (intercept_active) {
+ debugs(89, DBG_IMPORTANT, "Stopping IP interception: " << str);
+ intercept_active = 0;
+ }
+}
+
+int
+IpIntercept::NetfilterInterception(int fd, const IpAddress &me, IpAddress &dst, int silent)
+{
+#if LINUX_NETFILTER
+ struct addrinfo *lookup = NULL;
+
+ dst.GetAddrInfo(lookup,AF_INET);
+
+ /** \par
+ * Try NAT lookup for REDIRECT or DNAT targets. */
+ if ( getsockopt(fd, SOL_IP, SO_ORIGINAL_DST, lookup->ai_addr, &lookup->ai_addrlen) == 0) {
+ if (!silent) {
+ debugs(89, DBG_IMPORTANT, HERE << " NF getsockopt(SO_ORIGINAL_DST) failed on FD " << fd << ": " << xstrerror());
+ last_reported = squid_curtime;
+ }
+ } else {
+ dst = *lookup;
+ }
+
+ dst.FreeAddrInfo(lookup);
+
+ if (me != dst) {
+ debugs(89, 5, HERE << "address: " << dst);
+ return 0;
+ }
+
+ debugs(89, 9, HERE << "address: me= " << me << ", dst= " << dst);
+#endif
+ return -1;
+}
+
+int
+IpIntercept::NetfilterTransparent(int fd, const IpAddress &me, IpAddress &client, int silent)
+{
+#if LINUX_NETFILTER
+
+ /* Trust the user configured properly. If not no harm done.
+ * We will simply attempt a bind outgoing on our own IP.
+ */
+ if (fd_table[fd].flags.transparent) {
+ client.SetPort(0); // allow random outgoing port to prevent address clashes
+ return 0;
+ }
+#endif
+ return -1;
+}
+
+int
+IpIntercept::IpfwInterception(int fd, const IpAddress &me, IpAddress &dst, int silent)
+{
+#if IPFW_TRANSPARENT
+ struct addrinfo *lookup = NULL;
+
+ dst.GetAddrInfo(lookup,AF_INET);
+
+ /** \par
+ * Try lookup for IPFW interception. */
+ if ( getsockname(fd, lookup->ai_addr, &lookup->ai_addrlen) != 0 ) {
+ if ( !silent ) {
+ debugs(89, DBG_IMPORTANT, HERE << " IPFW getsockname(...) failed: " << xstrerror());
+ last_reported = squid_curtime;
+ }
+ } else {
+ dst = *lookup;
+ }
+
+ dst.FreeAddrInfo(lookup);
+
+ if (me != dst) {
+ debugs(89, 5, HERE << "address: " << dst);
+ return 0;
+ }
+
+ debugs(89, 9, HERE << "address: me= " << me << ", dst= " << dst);
+#endif
+ return -1;
+}
+
+int
+IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAddress &client, IpAddress &dst)
+{
+#if IPF_TRANSPARENT /* --enable-ipf-transparent */
+ client = me;
+ if ( !me.IsIPv4() ) return -1;
+ if ( !peer.IsIPv4() ) return -1;
+
+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
+
+ struct ipfobj obj;
+#else
+
+ static int siocgnatl_cmd = SIOCGNATL & 0xff;
+
+#endif
+
+ struct natlookup natLookup;
+ static int natfd = -1;
+ int x;
+
+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
+
+ obj.ipfo_rev = IPFILTER_VERSION;
+ obj.ipfo_size = sizeof(natLookup);
+ obj.ipfo_ptr = &natLookup;
+ obj.ipfo_type = IPFOBJ_NATLOOKUP;
+ obj.ipfo_offset = 0;
+#endif
+
+ natLookup.nl_inport = htons(me.GetPort());
+ natLookup.nl_outport = htons(peer.GetPort());
+ me.GetInAddr(natLookup.nl_inip);
+ peer.GetInAddr(natLookup.nl_outip);
+ natLookup.nl_flags = IPN_TCP;
+
+ if (natfd < 0) {
+ int save_errno;
+ enter_suid();
+#ifdef IPNAT_NAME
+
+ natfd = open(IPNAT_NAME, O_RDONLY, 0);
+#else
+
+ natfd = open(IPL_NAT, O_RDONLY, 0);
+#endif
+
+ save_errno = errno;
+ leave_suid();
+ errno = save_errno;
+ }
+
+ if (natfd < 0) {
+ if (squid_curtime - last_reported > 60) {
+ debugs(89, 1, "clientNatLookup: NAT open failed: " << xstrerror());
+ last_reported = squid_curtime;
+ return -1;
+ }
+ }
+
+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
+ x = ioctl(natfd, SIOCGNATL, &obj);
+
+#else
+ /*
+ * IP-Filter changed the type for SIOCGNATL between
+ * 3.3 and 3.4. It also changed the cmd value for
+ * SIOCGNATL, so at least we can detect it. We could
+ * put something in configure and use ifdefs here, but
+ * this seems simpler.
+ */
+ if (63 == siocgnatl_cmd) {
+
+ struct natlookup *nlp = &natLookup;
+ x = ioctl(natfd, SIOCGNATL, &nlp);
+ } else {
+ x = ioctl(natfd, SIOCGNATL, &natLookup);
+ }
+
+#endif
+ if (x < 0) {
+ if (errno != ESRCH) {
+ if (squid_curtime - last_reported > 60) {
+ debugs(89, 1, "clientNatLookup: NAT lookup failed: ioctl(SIOCGNATL)");
+ last_reported = squid_curtime;
+ }
+
+ close(natfd);
+ natfd = -1;
+ }
+
+ return -1;
+ } else {
+ if (me != natLookup.nl_realip) {
+ client = natLookup.nl_realip;
+
+ client.SetPort(ntohs(natLookup.nl_realport));
+ }
+ // else. we already copied it.
+
+ return 0;
+ }
+
+
+
+#elif LINUX_NETFILTER || IPFW_TRANSPARENT /* --enable-linux-netfilter OR --enable-ipfw-transparent */
+
+ /* Netfilter and IPFW share almost identical lookup methods for their NAT tables.
+ * This allows us to perform a nice clean failover sequence for them.
+ */
+
+ client = me;
+ dst = peer;
+
+ if ( !me.IsIPv4() ) return -1;
+ if ( !peer.IsIPv4() ) return -1;
+
+#if 0
+ // Crop interception errors down to one per minute.
+ int silent = (squid_curtime - last_reported > 60 ? 0 : 1);
+#else
+ // Show all interception errors.
+ int silent = 0;
+#endif
+
+ if (intercept_active) {
+ if ( NetfilterInterception(fd, me, client, silent) == 0) return 0;
+ if ( IpfwInterception(fd, me, client, silent) == 0) return 0;
+ }
+ if (transparent_active) {
+ if ( NetfilterTransparent(fd, me, dst, silent) == 0) return 0;
+ }
+
+ return -1;
+
+#elif PF_TRANSPARENT /* --enable-pf-transparent */
+
+ struct pfioc_natlook nl;
+ static int pffd = -1;
+
+ if ( !me.IsIPv4() ) return -1;
+ if ( !peer.IsIPv4() ) return -1;
+
+ if (pffd < 0)
+ pffd = open("/dev/pf", O_RDONLY);
+
+ if (pffd < 0) {
+ if (squid_curtime - last_reported > 60) {
+ debugs(89, 1, "clientNatLookup: PF open failed: " << xstrerror());
+ last_reported = squid_curtime;
+ }
+
+ return -1;
+
+ }
+
+ client.SetEmpty();
+
+ memset(&nl, 0, sizeof(struct pfioc_natlook));
+ peer.GetInAddr(nl.saddr.v4);
+ nl.sport = htons(peer.GetPort());
+
+ me.GetInAddr(nl.daddr.v4);
+ nl.dport = htons(me.GetPort());
+
+ nl.af = AF_INET;
+ nl.proto = IPPROTO_TCP;
+ nl.direction = PF_OUT;
+
+ if (ioctl(pffd, DIOCNATLOOK, &nl)) {
+ if (errno != ENOENT) {
+ if (squid_curtime - last_reported > 60) {
+ debugs(89, 1, "clientNatLookup: PF lookup failed: ioctl(DIOCNATLOOK)");
+ last_reported = squid_curtime;
+ }
+
+ close(pffd);
+ pffd = -1;
+ }
+
+ return -1;
+ } else {
+ int natted = (me != nl.rdaddr.v4);
+ client = nl.rdaddr.v4;
+ client.SetPort(ntohs(nl.rdport));
+
+ if (natted)
+ return 0;
+ else
+ return -1;
+ }
+
+
+#else /* none of the transparent options configured */
+
+ debugs(89, 1, "WARNING: transparent proxying not supported");
+ return -1;
+
+#endif
+
+}
+
+#if LINUX_TPROXY2
+IpIntercept::SetTproxy2OutgoingAddr(int fd, const IpAddress &src)
+{
+ IpAddress addr;
+ struct in_tproxy itp;
+
+ src.GetInAddr(itp.v.addr.faddr);
+ itp.v.addr.fport = 0;
+
+ /* If these syscalls fail then we just fallback to connecting
+ * normally by simply ignoring the errors...
+ */
+ itp.op = TPROXY_ASSIGN;
+
+ addr = (struct in_addr)itp.v.addr.faddr;
+ addr.SetPort(itp.v.addr.fport);
+
+ if (setsockopt(fd, SOL_IP, IP_TPROXY, &itp, sizeof(itp)) == -1) {
+ debugs(20, 1, "tproxy ip=" << addr << " ERROR ASSIGN");
+ return -1;
+ } else {
+ itp.op = TPROXY_FLAGS;
+ itp.v.flags = ITP_CONNECT;
+
+ if (setsockopt(fd, SOL_IP, IP_TPROXY, &itp, sizeof(itp)) == -1) {
+ debugs(20, 1, "tproxy ip=" << addr << " ERROR CONNECT");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+#endif
diff -u -r -N squid-3.1.0.3/src/ip/IpIntercept.h squid-3.1.0.4/src/ip/IpIntercept.h
--- squid-3.1.0.3/src/ip/IpIntercept.h 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/IpIntercept.h 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,127 @@
+/*
+ * DEBUG: section 89 NAT / IP Interception
+ * AUTHOR: Robert Collins
+ * AUTHOR: Amos Jeffries
+ *
+ */
+#ifndef SQUID_IPINTERCEPTION_H
+#define SQUID_IPINTERCEPTION_H
+
+class IpAddress;
+
+/* for time_t */
+#include "SquidTime.h"
+
+/**
+ \defgroup IpInterceptAPI IP Interception and Transparent Proxy API
+ \ingroup SquidComponent
+ \par
+ * There is no formal state-machine for transparency and interception
+ * instead there is this neutral API which other connection state machines
+ * and the comm layer use to co-ordinate their own state for transparency.
+ */
+class IpIntercept
+{
+public:
+ IpIntercept() : transparent_active(0), intercept_active(0), last_reported(0) {};
+ ~IpIntercept() {};
+
+ /** Perform NAT lookups */
+ int NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IpAddress &client, IpAddress &dst);
+
+#if LINUX_TPROXY2
+ // only relevant to TPROXY v2 connections.
+ // which require the address be set specifically post-connect.
+ int SetTproxy2OutgoingAddr(int fd, const IpAddress &src);
+#endif
+
+ /**
+ \retval 0 Full transparency is disabled.
+ \retval 1 Full transparency is enabled and active.
+ */
+ inline int TransparentActive() { return transparent_active; };
+
+ /** \par
+ * Turn on fully Transparent-Proxy activities.
+ * This function should be called during parsing of the squid.conf
+ * When any option requiring full-transparency is encountered.
+ */
+ inline void StartTransparency() { transparent_active=1; };
+
+ /** \par
+ * Turn off fully Transparent-Proxy activities on all new connections.
+ * Existing transactions and connections are unaffected and will run
+ * to their natural completion.
+ \param str Reason for stopping. Will be logged to cache.log
+ */
+ void StopTransparency(const char *str);
+
+ /**
+ \retval 0 IP Interception is disabled.
+ \retval 1 IP Interception is enabled and active.
+ */
+ inline int InterceptActive() { return intercept_active; };
+
+ /** \par
+ * Turn on IP-Interception-Proxy activities.
+ * This function should be called during parsing of the squid.conf
+ * When any option requiring interception / NAT handling is encountered.
+ */
+ inline void StartInterception() { intercept_active=1; };
+
+ /** \par
+ * Turn off IP-Interception-Proxy activities on all new connections.
+ * Existing transactions and connections are unaffected and will run
+ * to their natural completion.
+ \param str Reason for stopping. Will be logged to cache.log
+ */
+ inline void StopInterception(const char *str);
+
+
+private:
+
+ /**
+ * perform Lookups on Netfilter interception targets (REDIRECT, DNAT).
+ *
+ \param silent[in] 0 if errors are to be displayed. 1 if errors are to be hidden.
+ \retval 0 Successfuly located the new address.
+ \retval -1 An error occured during NAT lookups.
+ */
+ int NetfilterInterception(int fd, const IpAddress &me, IpAddress &client, int silent);
+
+ /**
+ * perform Lookups on Netfilter fully-transparent interception targets (TPROXY).
+ *
+ \param silent[in] 0 if errors are to be displayed. 1 if errors are to be hidden.
+ \retval 0 Successfuly located the new address.
+ \retval -1 An error occured during NAT lookups.
+ */
+ int NetfilterTransparent(int fd, const IpAddress &me, IpAddress &dst, int silent);
+
+ /**
+ * perform Lookups on IPFW interception.
+ *
+ \param silent[in] 0 if errors are to be displayed. 1 if errors are to be hidden.
+ \retval 0 Successfuly located the new address.
+ \retval -1 An error occured during NAT lookups.
+ */
+ int IpfwInterception(int fd, const IpAddress &me, IpAddress &client, int silent);
+
+
+ int transparent_active;
+ int intercept_active;
+ time_t last_reported; /**< Time of last error report. Throttles NAT error display to 1 per minute */
+};
+
+#if LINUX_NETFILTER && !defined(IP_TRANSPARENT)
+/// \ingroup IpInterceptAPI
+#define IP_TRANSPARENT 19
+#endif
+
+/**
+ \ingroup IpInterceptAPI
+ * Globally available instance of the IP Interception manager.
+ */
+extern IpIntercept IpInterceptor;
+
+#endif /* SQUID_IPINTERCEPTION_H */
diff -u -r -N squid-3.1.0.3/src/ip/Makefile.am squid-3.1.0.4/src/ip/Makefile.am
--- squid-3.1.0.3/src/ip/Makefile.am 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/Makefile.am 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,53 @@
+#
+# Makefile for the Squid IP layer API
+#
+
+# Housekeeping, shared by all Squid Makefiles.
+# TODO: make this set by configure?
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
+DEFS = @DEFS@
+CLEANFILES =
+
+INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
+
+
+# IP Specific Configurations
+
+noinst_LTLIBRARIES = libip.la
+
+libip_la_SOURCES = \
+ IpAddress.h \
+ IpAddress.cc \
+ IpIntercept.h \
+ IpIntercept.cc \
+ QosConfig.h \
+ QosConfig.cc
+
+
+check_PROGRAMS= testHeaders testIpAddress
+TESTS= $(check_PROGRAMS)
+
+## Special Universal .h dependency test script
+## aborts if error encountered
+testHeaders: $(top_srcdir)/src/ip/*.h
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/ip/" || exit 1
+
+## No such file...
+testHeaders.c:
+ touch testHeaders.c
+CLEANFILES += testHeaders.c
+
+
+testIpAddress_SOURCES= \
+ testIpAddress.cc \
+ testIpAddress.h
+nodist_testIpAddress_SOURCES= \
+ ../tests/testMain.cc
+testIpAddress_LDADD= \
+ libip.la \
+ -L$(top_builddir)/lib -lmiscutil \
+ @SQUID_CPPUNIT_LA@ \
+ @SQUID_CPPUNIT_LIBS@
+testIpAddress_LDFLAGS= $(LIBADD_DL)
diff -u -r -N squid-3.1.0.3/src/ip/Makefile.in squid-3.1.0.4/src/ip/Makefile.in
--- squid-3.1.0.3/src/ip/Makefile.in 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/Makefile.in 2009-01-23 18:38:00.000000000 +1300
@@ -0,0 +1,740 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Makefile for the Squid IP layer API
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+check_PROGRAMS = testHeaders$(EXEEXT) testIpAddress$(EXEEXT)
+subdir = src/ip
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/autoconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libip_la_LIBADD =
+am_libip_la_OBJECTS = IpAddress.lo IpIntercept.lo QosConfig.lo
+libip_la_OBJECTS = $(am_libip_la_OBJECTS)
+testHeaders_SOURCES = testHeaders.c
+testHeaders_OBJECTS = testHeaders.$(OBJEXT)
+testHeaders_LDADD = $(LDADD)
+am_testIpAddress_OBJECTS = testIpAddress.$(OBJEXT)
+nodist_testIpAddress_OBJECTS = testMain.$(OBJEXT)
+testIpAddress_OBJECTS = $(am_testIpAddress_OBJECTS) \
+ $(nodist_testIpAddress_OBJECTS)
+testIpAddress_DEPENDENCIES = libip.la
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libip_la_SOURCES) testHeaders.c $(testIpAddress_SOURCES) \
+ $(nodist_testIpAddress_SOURCES)
+DIST_SOURCES = $(libip_la_SOURCES) testHeaders.c \
+ $(testIpAddress_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADAPTATION_LIBS = @ADAPTATION_LIBS@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AR_R = @AR_R@
+AUTH_LIBS = @AUTH_LIBS@
+AUTH_LINKOBJS = @AUTH_LINKOBJS@
+AUTH_MODULES = @AUTH_MODULES@
+AUTH_OBJS = @AUTH_OBJS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+CACHE_EFFECTIVE_USER = @CACHE_EFFECTIVE_USER@
+CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+CACHE_ICP_PORT = @CACHE_ICP_PORT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CGIEXT = @CGIEXT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNITCONFIG = @CPPUNITCONFIG@
+CRYPTLIB = @CRYPTLIB@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFAULT_LOG_DIR = @DEFAULT_LOG_DIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
+DISK_LIBS = @DISK_LIBS@
+DISK_LINKOBJS = @DISK_LINKOBJS@
+DISK_MODULES = @DISK_MODULES@
+DISK_PROGRAMS = @DISK_PROGRAMS@
+DSYMUTIL = @DSYMUTIL@
+ECAP_LIBS = @ECAP_LIBS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_ARP_ACL_FALSE = @ENABLE_ARP_ACL_FALSE@
+ENABLE_ARP_ACL_TRUE = @ENABLE_ARP_ACL_TRUE@
+ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@
+ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@
+ENABLE_IDENT_FALSE = @ENABLE_IDENT_FALSE@
+ENABLE_IDENT_TRUE = @ENABLE_IDENT_TRUE@
+ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@
+ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@
+ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@
+ENABLE_SSL_TRUE = @ENABLE_SSL_TRUE@
+ENABLE_UNLINKD_FALSE = @ENABLE_UNLINKD_FALSE@
+ENABLE_UNLINKD_TRUE = @ENABLE_UNLINKD_TRUE@
+ENABLE_WIN32SPECIFIC_FALSE = @ENABLE_WIN32SPECIFIC_FALSE@
+ENABLE_WIN32SPECIFIC_TRUE = @ENABLE_WIN32SPECIFIC_TRUE@
+ENABLE_XPROF_STATS_FALSE = @ENABLE_XPROF_STATS_FALSE@
+ENABLE_XPROF_STATS_TRUE = @ENABLE_XPROF_STATS_TRUE@
+EPOLL_LIBS = @EPOLL_LIBS@
+EXEEXT = @EXEEXT@
+EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
+F77 = @F77@
+FALSE = @FALSE@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+ICAP_LIBS = @ICAP_LIBS@
+INCLTDL = @INCLTDL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBADD_DL = @LIBADD_DL@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBREGEX = @LIBREGEX@
+LIBS = @LIBS@
+LIBSASL = @LIBSASL@
+LIBTOOL = @LIBTOOL@
+LIB_DB = @LIB_DB@
+LIB_LBER = @LIB_LBER@
+LIB_LDAP = @LIB_LDAP@
+LN = @LN@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_LEAKFINDER_FALSE = @MAKE_LEAKFINDER_FALSE@
+MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@
+MINGW_LIBS = @MINGW_LIBS@
+MKDIR = @MKDIR@
+MV = @MV@
+NEED_OWN_STRSEP_FALSE = @NEED_OWN_STRSEP_FALSE@
+NEED_OWN_STRSEP_TRUE = @NEED_OWN_STRSEP_TRUE@
+NEED_OWN_STRTOLL_FALSE = @NEED_OWN_STRTOLL_FALSE@
+NEED_OWN_STRTOLL_TRUE = @NEED_OWN_STRTOLL_TRUE@
+NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
+NMEDIT = @NMEDIT@
+NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
+OBJEXT = @OBJEXT@
+OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PO2HTML = @PO2HTML@
+RANLIB = @RANLIB@
+REGEXLIB = @REGEXLIB@
+REPL_LIBS = @REPL_LIBS@
+REPL_OBJS = @REPL_OBJS@
+REPL_POLICIES = @REPL_POLICIES@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SH = @SH@
+SHELL = @SHELL@
+SNMPLIB = @SNMPLIB@
+SQUID_CFLAGS = @SQUID_CFLAGS@
+SQUID_CPPUNIT_INC = @SQUID_CPPUNIT_INC@
+SQUID_CPPUNIT_LA = @SQUID_CPPUNIT_LA@
+SQUID_CPPUNIT_LIBS = @SQUID_CPPUNIT_LIBS@
+SQUID_CXXFLAGS = @SQUID_CXXFLAGS@
+SSLLIB = @SSLLIB@
+STORE_LIBS = @STORE_LIBS@
+STORE_LINKOBJS = @STORE_LINKOBJS@
+STORE_OBJS = @STORE_OBJS@
+STORE_TESTS = @STORE_TESTS@
+STRIP = @STRIP@
+TRUE = @TRUE@
+USE_ADAPTATION_FALSE = @USE_ADAPTATION_FALSE@
+USE_ADAPTATION_TRUE = @USE_ADAPTATION_TRUE@
+USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@
+USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@
+USE_AIO_WIN32_FALSE = @USE_AIO_WIN32_FALSE@
+USE_AIO_WIN32_TRUE = @USE_AIO_WIN32_TRUE@
+USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@
+USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@
+USE_DEVPOLL_FALSE = @USE_DEVPOLL_FALSE@
+USE_DEVPOLL_TRUE = @USE_DEVPOLL_TRUE@
+USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@
+USE_DNSSERVER_TRUE = @USE_DNSSERVER_TRUE@
+USE_ECAP_FALSE = @USE_ECAP_FALSE@
+USE_ECAP_TRUE = @USE_ECAP_TRUE@
+USE_EPOLL_FALSE = @USE_EPOLL_FALSE@
+USE_EPOLL_TRUE = @USE_EPOLL_TRUE@
+USE_ESI_FALSE = @USE_ESI_FALSE@
+USE_ESI_TRUE = @USE_ESI_TRUE@
+USE_ICAP_CLIENT_FALSE = @USE_ICAP_CLIENT_FALSE@
+USE_ICAP_CLIENT_TRUE = @USE_ICAP_CLIENT_TRUE@
+USE_IPC_WIN32_FALSE = @USE_IPC_WIN32_FALSE@
+USE_IPC_WIN32_TRUE = @USE_IPC_WIN32_TRUE@
+USE_KQUEUE_FALSE = @USE_KQUEUE_FALSE@
+USE_KQUEUE_TRUE = @USE_KQUEUE_TRUE@
+USE_LOADABLE_MODULES_FALSE = @USE_LOADABLE_MODULES_FALSE@
+USE_LOADABLE_MODULES_TRUE = @USE_LOADABLE_MODULES_TRUE@
+USE_POLL_FALSE = @USE_POLL_FALSE@
+USE_POLL_TRUE = @USE_POLL_TRUE@
+USE_SELECT_FALSE = @USE_SELECT_FALSE@
+USE_SELECT_SIMPLE_FALSE = @USE_SELECT_SIMPLE_FALSE@
+USE_SELECT_SIMPLE_TRUE = @USE_SELECT_SIMPLE_TRUE@
+USE_SELECT_TRUE = @USE_SELECT_TRUE@
+USE_SELECT_WIN32_FALSE = @USE_SELECT_WIN32_FALSE@
+USE_SELECT_WIN32_TRUE = @USE_SELECT_WIN32_TRUE@
+USE_SNMP_FALSE = @USE_SNMP_FALSE@
+USE_SNMP_TRUE = @USE_SNMP_TRUE@
+VERSION = @VERSION@
+WIN32_PSAPI = @WIN32_PSAPI@
+XTRA_LIBS = @XTRA_LIBS@
+XTRA_OBJS = @XTRA_OBJS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+makesnmplib = @makesnmplib@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+# Housekeeping, shared by all Squid Makefiles.
+# TODO: make this set by configure?
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
+CLEANFILES = testHeaders.c
+INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+
+# IP Specific Configurations
+noinst_LTLIBRARIES = libip.la
+libip_la_SOURCES = \
+ IpAddress.h \
+ IpAddress.cc \
+ IpIntercept.h \
+ IpIntercept.cc \
+ QosConfig.h \
+ QosConfig.cc
+
+TESTS = $(check_PROGRAMS)
+testIpAddress_SOURCES = \
+ testIpAddress.cc \
+ testIpAddress.h
+
+nodist_testIpAddress_SOURCES = \
+ ../tests/testMain.cc
+
+testIpAddress_LDADD = \
+ libip.la \
+ -L$(top_builddir)/lib -lmiscutil \
+ @SQUID_CPPUNIT_LA@ \
+ @SQUID_CPPUNIT_LIBS@
+
+testIpAddress_LDFLAGS = $(LIBADD_DL)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ip/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/ip/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libip.la: $(libip_la_OBJECTS) $(libip_la_DEPENDENCIES)
+ $(CXXLINK) $(libip_la_LDFLAGS) $(libip_la_OBJECTS) $(libip_la_LIBADD) $(LIBS)
+
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+testIpAddress$(EXEEXT): $(testIpAddress_OBJECTS) $(testIpAddress_DEPENDENCIES)
+ @rm -f testIpAddress$(EXEEXT)
+ $(CXXLINK) $(testIpAddress_LDFLAGS) $(testIpAddress_OBJECTS) $(testIpAddress_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpAddress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpIntercept.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QosConfig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testHeaders.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testIpAddress.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMain.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+.cc.o:
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+testMain.o: ../tests/testMain.cc
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.o -MD -MP -MF "$(DEPDIR)/testMain.Tpo" -c -o testMain.o `test -f '../tests/testMain.cc' || echo '$(srcdir)/'`../tests/testMain.cc; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testMain.Tpo" "$(DEPDIR)/testMain.Po"; else rm -f "$(DEPDIR)/testMain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../tests/testMain.cc' object='testMain.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.o `test -f '../tests/testMain.cc' || echo '$(srcdir)/'`../tests/testMain.cc
+
+testMain.obj: ../tests/testMain.cc
+@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT testMain.obj -MD -MP -MF "$(DEPDIR)/testMain.Tpo" -c -o testMain.obj `if test -f '../tests/testMain.cc'; then $(CYGPATH_W) '../tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/../tests/testMain.cc'; fi`; \
+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/testMain.Tpo" "$(DEPDIR)/testMain.Po"; else rm -f "$(DEPDIR)/testMain.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../tests/testMain.cc' object='testMain.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testMain.obj `if test -f '../tests/testMain.cc'; then $(CYGPATH_W) '../tests/testMain.cc'; else $(CYGPATH_W) '$(srcdir)/../tests/testMain.cc'; fi`
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+ ;; \
+ *) \
+ echo "PASS: $$tst"; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="All $$all tests passed"; \
+ else \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all tests failed"; \
+ else \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+ echo "$$dashes"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+ clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libtool \
+ clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am
+
+$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
+
+testHeaders: $(top_srcdir)/src/ip/*.h
+ $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/ip/" || exit 1
+
+testHeaders.c:
+ touch testHeaders.c
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -u -r -N squid-3.1.0.3/src/ip/QosConfig.cc squid-3.1.0.4/src/ip/QosConfig.cc
--- squid-3.1.0.3/src/ip/QosConfig.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/QosConfig.cc 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,81 @@
+#include "squid.h"
+
+#if USE_ZPH_QOS
+
+#include "QosConfig.h"
+
+QosConfig::QosConfig() :
+ tos_local_hit(0),
+ tos_sibling_hit(0),
+ tos_parent_hit(0),
+ preserve_miss_tos(1),
+ preserve_miss_tos_mask(255)
+{
+ ;
+}
+
+void
+QosConfig::parseConfigLine()
+{
+ // %i honors 0 and 0x prefixes, which are important for things like umask
+ /* parse options ... */
+ char *token;
+ while( (token = strtok(NULL, w_space)) ) {
+
+ if(strncmp(token, "local-hit=",10) == 0) {
+ sscanf(&token[10], "%i", &tos_local_hit);
+ }
+ else if(strncmp(token, "sibling-hit=",12) == 0) {
+ sscanf(&token[12], "%i", &tos_sibling_hit);
+ }
+ else if(strncmp(token, "parent-hit=",11) == 0) {
+ sscanf(&token[11], "%i", &tos_parent_hit);
+ }
+ else if(strcmp(token, "disable-preserve-miss") == 0) {
+ preserve_miss_tos = 0;
+ preserve_miss_tos_mask = 0;
+ }
+ else if(preserve_miss_tos && strncmp(token, "miss-mask=",10) == 0) {
+ sscanf(&token[10], "%i", &preserve_miss_tos_mask);
+ }
+ }
+}
+
+/**
+ * NOTE: Due to the low-level nature of the library these
+ * objects are part of the dump function must be self-contained.
+ * which means no StoreEntry refrences. Just a basic char* buffer.
+ */
+void
+QosConfig::dumpConfigLine(char *entry, const char *name) const
+{
+ char *p = entry;
+ snprintf(p, 10, "%s", name); // strlen("qos_flows ");
+ p += strlen(name);
+
+ if (tos_local_hit >0) {
+ snprintf(p, 15, " local-hit=%2x", tos_local_hit);
+ p += 15;
+ }
+
+ if (tos_sibling_hit >0) {
+ snprintf(p, 17, " sibling-hit=%2x", tos_sibling_hit);
+ p += 17;
+ }
+ if (tos_parent_hit >0) {
+ snprintf(p, 16, " parent-hit=%2x", tos_parent_hit);
+ p += 16;
+ }
+ if (preserve_miss_tos != 0) {
+ snprintf(p, 22, " disable-preserve-miss");
+ p += 22;
+ }
+ if (preserve_miss_tos && preserve_miss_tos_mask != 0) {
+ snprintf(p, 15, " miss-mask=%2x", preserve_miss_tos_mask);
+ p += 15;
+ }
+ snprintf(p, 1, "\n");
+// p += 1;
+}
+
+#endif /* USE_ZPH_QOS */
diff -u -r -N squid-3.1.0.3/src/ip/QosConfig.h squid-3.1.0.4/src/ip/QosConfig.h
--- squid-3.1.0.3/src/ip/QosConfig.h 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/QosConfig.h 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,35 @@
+#ifndef SQUID_QOSCONFIG_H
+#define SQUID_QOSCONFIG_H
+
+#include "config.h"
+
+#if USE_ZPH_QOS
+
+class QosConfig
+{
+public:
+ int tos_local_hit;
+ int tos_sibling_hit;
+ int tos_parent_hit;
+ int preserve_miss_tos;
+ int preserve_miss_tos_mask;
+
+public:
+ QosConfig();
+ ~QosConfig() {};
+
+ void parseConfigLine();
+ void dumpConfigLine(char *entry, const char *name) const;
+};
+
+/* legacy parser access wrappers */
+#define parse_QosConfig(X) (X)->parseConfigLine()
+#define free_QosConfig(X)
+#define dump_QosConfig(e,n,X) do { \
+ char temp[256]; /* random number. change as needed. max config line length. */ \
+ (X).dumpConfigLine(temp,n); \
+ storeAppendPrintf(e, "%s", temp); \
+ } while(0);
+
+#endif /* USE_ZPH_QOS */
+#endif /* SQUID_QOSCONFIG_H */
diff -u -r -N squid-3.1.0.3/src/ip/stubQosConfig.cc squid-3.1.0.4/src/ip/stubQosConfig.cc
--- squid-3.1.0.3/src/ip/stubQosConfig.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/stubQosConfig.cc 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,51 @@
+#include "squid.h"
+
+#if USE_ZPH_QOS
+
+#include "QosConfig.h"
+#include "Store.h"
+
+QosConfig::QosConfig() :
+ tos_local_hit(0),
+ tos_sibling_hit(0),
+ tos_parent_hit(0),
+ preserve_miss_tos(1),
+ preserve_miss_tos_mask(255)
+{
+ ;
+}
+
+void
+QosConfig::parseConfigLine()
+{
+ // %i honors 0 and 0x prefixes, which are important for things like umask
+ /* parse options ... */
+ char *token;
+ while( (token = strtok(NULL, w_space)) ) {
+
+ if(strncmp(token, "local-hit=",10) == 0) {
+ sscanf(&token[10], "%i", &tos_local_hit);
+ }
+ else if(strncmp(token, "sibling-hit=",12) == 0) {
+ sscanf(&token[12], "%i", &tos_sibling_hit);
+ }
+ else if(strncmp(token, "parent-hit=",11) == 0) {
+ sscanf(&token[11], "%i", &tos_parent_hit);
+ }
+ else if(strcmp(token, "disable-preserve-miss") == 0) {
+ preserve_miss_tos = 0;
+ preserve_miss_tos_mask = 0;
+ }
+ else if(preserve_miss_tos && strncmp(token, "miss-mask=",10) == 0) {
+ sscanf(&token[10], "%i", &preserve_miss_tos_mask);
+ }
+ }
+}
+
+void
+QosConfig::dumpConfigLine(char *entry, const char *name) const
+{
+ ; /* Not needed in stub */
+}
+
+#endif /* USE_ZPH_QOS */
diff -u -r -N squid-3.1.0.3/src/ip/testIpAddress.cc squid-3.1.0.4/src/ip/testIpAddress.cc
--- squid-3.1.0.3/src/ip/testIpAddress.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/testIpAddress.cc 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,756 @@
+#include "config.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "testIpAddress.h"
+#include "ip/IpAddress.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( testIpAddress );
+
+/* so that we don't break POD dependency just for the test */
+struct timeval current_time;
+double current_dtime;
+time_t squid_curtime = 0;
+
+
+void
+testIpAddress::testDefaults()
+{
+ IpAddress anIPA;
+
+ /* test stored values */
+ CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+#if USE_IPV6
+ CPPUNIT_ASSERT( anIPA.IsIPv6() );
+#else
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+#endif
+}
+
+void
+testIpAddress::testInAddrConstructor()
+{
+ struct in_addr inval;
+ struct in_addr outval;
+
+ inval.s_addr = htonl(0xC0A8640C);
+ outval.s_addr = htonl(0x00000000);
+
+ IpAddress anIPA(inval);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp(&inval, &outval, sizeof(struct in_addr)) == 0 );
+}
+
+#if USE_IPV6
+void
+testIpAddress::testInAddr6Constructor()
+{
+ struct in6_addr inval;
+ struct in6_addr outval = IN6ADDR_ANY_INIT;
+
+ inval.s6_addr32[0] = htonl(0xC0A8640C);
+ inval.s6_addr32[1] = htonl(0xFFFFFFFF);
+ inval.s6_addr32[2] = htonl(0xFFFFFFFF);
+ inval.s6_addr32[3] = htonl(0xFFFFFFFF);
+
+ IpAddress anIPA(inval);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &inval, &outval, sizeof(struct in6_addr)) == 0 );
+}
+#endif
+
+void
+testIpAddress::testSockAddrConstructor()
+{
+ struct sockaddr_in insock;
+ struct sockaddr_in outsock;
+
+ memset(&insock, 0, sizeof(struct sockaddr_in));
+ memset(&outsock, 0, sizeof(struct sockaddr_in));
+
+ insock.sin_family = AF_INET;
+ insock.sin_port = htons(80);
+ insock.sin_addr.s_addr = htonl(0xC0A8640C);
+#if HAVE_SIN_LEN_IN_SAI
+ insock.sin_len = sizeof(struct sockaddr_in);
+#endif
+
+ IpAddress anIPA((const struct sockaddr_in)insock);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 80 , anIPA.GetPort() );
+ anIPA.GetSockAddr(outsock);
+ CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in)) == 0 );
+}
+
+#if USE_IPV6
+void
+testIpAddress::testSockAddr6Constructor()
+{
+ struct sockaddr_in6 insock;
+ struct sockaddr_in6 outsock;
+
+ memset(&insock, 0, sizeof(struct sockaddr_in6));
+ memset(&outsock, 0, sizeof(struct sockaddr_in6));
+
+ insock.sin6_family = AF_INET6;
+ insock.sin6_port = htons(80);
+ insock.sin6_addr.s6_addr32[0] = htonl(0xFFFFFFFF);
+ insock.sin6_addr.s6_addr32[1] = htonl(0x00000000);
+ insock.sin6_addr.s6_addr32[2] = htonl(0x0000FFFF);
+ insock.sin6_addr.s6_addr32[3] = htonl(0xC0A8640C);
+#if HAVE_SIN6_LEN_IN_SAI
+ insock.sin6_len = sizeof(struct sockaddr_in6);
+#endif
+
+ IpAddress anIPA((const struct sockaddr_in6)insock);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 80 , anIPA.GetPort() );
+ anIPA.GetSockAddr(outsock);
+ CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in6)) == 0 );
+}
+#endif
+
+
+void
+testIpAddress::testCopyConstructor()
+{
+ struct sockaddr_in insock;
+ struct sockaddr_in outsock;
+
+ memset(&insock, 0, sizeof(struct sockaddr_in));
+ memset(&outsock, 0, sizeof(struct sockaddr_in));
+
+ insock.sin_family = AF_INET;
+ insock.sin_port = htons(80);
+ insock.sin_addr.s_addr = htonl(0xC0A8640C);
+#if HAVE_SIN_LEN_IN_SAI
+ insock.sin_len = sizeof(struct sockaddr_in);
+#endif
+
+ IpAddress inIPA(insock);
+ IpAddress outIPA(inIPA);
+
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !outIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !outIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( outIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !outIPA.IsIPv6() );
+ CPPUNIT_ASSERT( outIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 80 , outIPA.GetPort() );
+ outIPA.GetSockAddr(outsock);
+ CPPUNIT_ASSERT( memcmp( &insock, &outsock, sizeof(struct sockaddr_in)) == 0 );
+}
+
+void
+testIpAddress::testHostentConstructor()
+{
+ struct hostent *hp = NULL;
+ struct in_addr outval;
+ struct in_addr expectval;
+
+ expectval.s_addr = htonl(0xC0A8640C);
+
+ hp = gethostbyname("192.168.100.12");
+ CPPUNIT_ASSERT( hp != NULL /* gethostbyname failure.*/ );
+
+ IpAddress anIPA(*hp);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+}
+
+void
+testIpAddress::testStringConstructor()
+{
+ struct in_addr outval;
+ struct in_addr expectval;
+
+ expectval.s_addr = htonl(0xC0A8640C);
+
+ IpAddress anIPA = "192.168.100.12";
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+
+#if USE_IPV6
+ struct in6_addr expectv6;
+ struct in6_addr outval6;
+
+ expectv6.s6_addr32[0] = htonl(0x20000800);
+ expectv6.s6_addr32[1] = htonl(0x00000000);
+ expectv6.s6_addr32[2] = htonl(0x00000000);
+ expectv6.s6_addr32[3] = htonl(0x00000045);
+
+ IpAddress bnIPA = "2000:800::45";
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !bnIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !bnIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( !bnIPA.IsIPv4() );
+ CPPUNIT_ASSERT( bnIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !bnIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , bnIPA.GetPort() );
+ bnIPA.GetInAddr(outval6);
+ CPPUNIT_ASSERT( memcmp( &expectv6, &outval6, sizeof(struct in6_addr)) == 0 );
+
+ /* test IPv6 as an old netmask format. This is invalid but sometimes use. */
+ IpAddress cnIPA = "ffff:ffff:fff0::";
+
+ expectv6.s6_addr32[0] = htonl(0xFFFFFFFF);
+ expectv6.s6_addr32[1] = htonl(0xFFF00000);
+ expectv6.s6_addr32[2] = htonl(0x00000000);
+ expectv6.s6_addr32[3] = htonl(0x00000000);
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !cnIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !cnIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( !cnIPA.IsIPv4() );
+ CPPUNIT_ASSERT( cnIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !cnIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , cnIPA.GetPort() );
+ cnIPA.GetInAddr(outval6);
+ CPPUNIT_ASSERT( memcmp( &expectv6, &outval6, sizeof(struct in6_addr)) == 0 );
+#endif
+}
+
+void
+testIpAddress::testSetEmpty()
+{
+ IpAddress anIPA;
+ struct in_addr inval;
+
+ inval.s_addr = htonl(0xC0A8640C);
+
+ anIPA = inval;
+
+ /* test stored values before empty */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+
+ anIPA.SetEmpty();
+
+ /* test stored values after empty */
+ CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+#if USE_IPV6
+ CPPUNIT_ASSERT( anIPA.IsIPv6() );
+#else
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+#endif
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+}
+
+void
+testIpAddress::testBooleans()
+{
+ IpAddress lhsIPA;
+ IpAddress rhsIPA;
+ struct in_addr valLow;
+ struct in_addr valHigh;
+
+ valLow.s_addr = htonl(0xC0A8640C);
+ valHigh.s_addr = htonl(0xC0A8640F);
+
+ /* test equality */
+ lhsIPA = valLow;
+ rhsIPA = valLow;
+ CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) == 0 );
+ CPPUNIT_ASSERT( ( lhsIPA == rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA != rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA >= rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA > rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA <= rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA < rhsIPA ) );
+
+ /* test inequality (less than) */
+ lhsIPA = valLow;
+ rhsIPA = valHigh;
+ CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) < 0 );
+ CPPUNIT_ASSERT( !( lhsIPA == rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA != rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA >= rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA > rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA <= rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA < rhsIPA ) );
+
+ /* test inequality (greater than) */
+ lhsIPA = valHigh;
+ rhsIPA = valLow;
+ CPPUNIT_ASSERT( lhsIPA.matchIPAddr(rhsIPA) > 0 );
+ CPPUNIT_ASSERT( !( lhsIPA == rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA != rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA >= rhsIPA ) );
+ CPPUNIT_ASSERT( ( lhsIPA > rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA <= rhsIPA ) );
+ CPPUNIT_ASSERT( !( lhsIPA < rhsIPA ) );
+
+}
+
+void
+testIpAddress::testNtoA()
+{
+ struct in_addr inval;
+ char buf[MAX_IPSTRLEN];
+ IpAddress anIPA;
+
+ anIPA.SetAnyAddr();
+
+ /* test AnyAddr display values */
+#if USE_IPV6
+ CPPUNIT_ASSERT( memcmp("::", anIPA.NtoA(buf,MAX_IPSTRLEN), 2) == 0 );
+#else
+ CPPUNIT_ASSERT( memcmp("0.0.0.0",anIPA.NtoA(buf,MAX_IPSTRLEN), 7) == 0 );
+#endif
+
+ inval.s_addr = htonl(0xC0A8640C);
+ anIPA = inval;
+
+ /* test IP display */
+ CPPUNIT_ASSERT( memcmp("192.168.100.12",anIPA.NtoA(buf,MAX_IPSTRLEN), 14) == 0 );
+
+ anIPA.SetNoAddr();
+
+ /* test NoAddr display values */
+#if USE_IPV6
+ CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",anIPA.NtoA(buf,MAX_IPSTRLEN), 39) == 0 );
+#else
+ CPPUNIT_ASSERT( memcmp("255.255.255.255",anIPA.NtoA(buf,MAX_IPSTRLEN), 15) == 0 );
+#endif
+}
+
+void
+testIpAddress::testToURL_fromInAddr()
+{
+ char buf[MAX_IPSTRLEN];
+ buf[0] = '\0';
+ struct in_addr inval;
+
+ inval.s_addr = htonl(0xC0A8640C);
+
+ IpAddress anIPA(inval);
+
+ /* test values */
+ anIPA.ToURL(buf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( memcmp("192.168.100.12", buf, 14) == 0 );
+
+#if USE_IPV6
+
+ /* test output when constructed from in6_addr with IPv6 */
+ struct in6_addr ip6val;
+
+ ip6val.s6_addr32[0] = htonl(0xC0A8640C);
+ ip6val.s6_addr32[1] = htonl(0xFFFFFFFF);
+ ip6val.s6_addr32[2] = htonl(0xFFFFFFFF);
+ ip6val.s6_addr32[3] = htonl(0xFFFFFFFF);
+
+ IpAddress bnIPA(ip6val);
+
+ bnIPA.ToURL(buf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( memcmp("[c0a8:640c:ffff:ffff:ffff:ffff:ffff:ffff]", buf, 41) == 0 );
+
+#endif
+}
+
+void
+testIpAddress::testToURL_fromSockAddr()
+{
+ struct sockaddr_in sock;
+ sock.sin_addr.s_addr = htonl(0xC0A8640C);
+ sock.sin_port = htons(80);
+ sock.sin_family = AF_INET;
+#if HAVE_SIN_LEN_IN_SAI
+ sock.sin_len = sizeof(struct sockaddr_in);
+#endif
+
+ IpAddress anIPA(sock);
+ char buf[MAX_IPSTRLEN];
+
+ /* test values */
+ anIPA.ToURL(buf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( memcmp("192.168.100.12:80", buf, 17) == 0 );
+
+#if USE_IPV6
+
+ /* test output when constructed from in6_addr with IPv6 */
+ struct sockaddr_in6 ip6val;
+
+ ip6val.sin6_addr.s6_addr32[0] = htonl(0xC0A8640C);
+ ip6val.sin6_addr.s6_addr32[1] = htonl(0xFFFFFFFF);
+ ip6val.sin6_addr.s6_addr32[2] = htonl(0xFFFFFFFF);
+ ip6val.sin6_addr.s6_addr32[3] = htonl(0xFFFFFFFF);
+ ip6val.sin6_port = htons(80);
+ ip6val.sin6_family = AF_INET6;
+#if HAVE_SIN6_LEN_IN_SAI
+ ip6val.sin6_len = sizeof(struct sockaddr_in6);
+#endif
+
+ IpAddress bnIPA(ip6val);
+
+ bnIPA.ToURL(buf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( memcmp("[c0a8:640c:ffff:ffff:ffff:ffff:ffff:ffff]:80", buf, 44) == 0 );
+
+#endif
+
+}
+
+void
+testIpAddress::testGetReverseString()
+{
+ char buf[MAX_IPSTRLEN];
+
+ struct in_addr ipv4val;
+ ipv4val.s_addr = htonl(0xC0A8640C);
+
+ IpAddress v4IPA(ipv4val);
+
+ /* test IPv4 output */
+ v4IPA.GetReverseString(buf);
+ CPPUNIT_ASSERT( memcmp("12.100.168.192.in-addr.arpa.",buf, 28) == 0 );
+
+ v4IPA.GetReverseString(buf,AF_INET);
+ CPPUNIT_ASSERT( memcmp("12.100.168.192.in-addr.arpa.",buf, 28) == 0 );
+
+ v4IPA.GetReverseString(buf,AF_INET6);
+ CPPUNIT_ASSERT( memcmp("",buf, 1) == 0 );
+
+
+#if USE_IPV6
+ struct in6_addr ip6val;
+
+ ip6val.s6_addr32[0] = htonl(0xC0A8640C);
+ ip6val.s6_addr32[1] = htonl(0xFFFFFFFF);
+ ip6val.s6_addr32[2] = htonl(0xFFFFFFFF);
+ ip6val.s6_addr32[3] = htonl(0xFFFFFFFF);
+
+ IpAddress v6IPA(ip6val);
+
+ /* test IPv6 output */
+ v6IPA.GetReverseString(buf);
+ CPPUNIT_ASSERT( memcmp("f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.c.0.4.6.8.a.0.c.ip6.arpa.",buf,73) == 0 );
+
+#endif
+
+}
+
+void
+testIpAddress::testMasking()
+{
+ char buf[MAX_IPSTRLEN];
+ IpAddress anIPA;
+ IpAddress maskIPA;
+
+ /* Test Basic CIDR Routine */
+ anIPA.SetAnyAddr();
+ CPPUNIT_ASSERT_EQUAL( 0 ,anIPA.GetCIDR() );
+
+ anIPA.SetNoAddr();
+#if USE_IPV6
+ CPPUNIT_ASSERT_EQUAL( 128 , anIPA.GetCIDR() );
+#else
+ CPPUNIT_ASSERT_EQUAL( 32 , anIPA.GetCIDR() );
+#endif
+
+ /* Test Numeric ApplyCIDR */
+ anIPA.SetNoAddr();
+ CPPUNIT_ASSERT( !anIPA.ApplyMask(129) );
+#if !USE_IPV6
+ CPPUNIT_ASSERT( !anIPA.ApplyMask(33) );
+#endif
+ CPPUNIT_ASSERT( anIPA.ApplyMask(31) );
+ CPPUNIT_ASSERT_EQUAL( 31 , anIPA.GetCIDR() );
+
+ anIPA.SetNoAddr();
+ anIPA.ApplyMask(31, AF_INET);
+#if USE_IPV6
+ CPPUNIT_ASSERT_EQUAL( 127 , anIPA.GetCIDR() );
+#else
+ CPPUNIT_ASSERT_EQUAL( 31 , anIPA.GetCIDR() );
+#endif
+
+#if USE_IPV6
+ anIPA.SetNoAddr();
+ anIPA.ApplyMask(80,AF_INET6);
+ CPPUNIT_ASSERT_EQUAL( 80 , anIPA.GetCIDR() );
+ /* BUG Check: test values by display. */
+ CPPUNIT_ASSERT( anIPA.NtoA(buf,MAX_IPSTRLEN) != NULL );
+ CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff::", buf, 26) == 0 );
+#endif
+
+ /* Test Network Bitmask from IpAddress */
+ anIPA.SetNoAddr();
+ maskIPA = "255.255.240.0";
+ CPPUNIT_ASSERT_EQUAL( 20 , maskIPA.GetCIDR() );
+ anIPA.ApplyMask(maskIPA);
+ CPPUNIT_ASSERT_EQUAL( 20 , anIPA.GetCIDR() );
+
+ /* BUG Check: test values memory after masking. */
+ struct in_addr btest;
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ anIPA.GetInAddr(btest);
+ CPPUNIT_ASSERT_EQUAL( (uint32_t)htonl(0xFFFFF000) , btest.s_addr );
+
+ /* BUG Check failing test. Masked values for display. */
+ CPPUNIT_ASSERT( memcmp("255.255.240.0",anIPA.NtoA(buf,MAX_IPSTRLEN), 13) == 0 );
+
+
+#if USE_IPV6
+ anIPA.SetNoAddr();
+ maskIPA.SetNoAddr();
+
+ /* IPv6 masks MUST be CIDR representations. */
+ /* however as with IPv4 they can technically be represented as a bitmask */
+ maskIPA = "ffff:ffff:fff0::";
+ CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
+ anIPA.ApplyMask(maskIPA);
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT_EQUAL( 44 , anIPA.GetCIDR() );
+
+ anIPA.SetNoAddr();
+ maskIPA.SetNoAddr();
+
+ /* IPv4 masks represented in IPv6 as IPv4 bitmasks. */
+ maskIPA = "::ffff:ffff:f000";
+ CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( maskIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !maskIPA.IsIPv6() );
+ anIPA.ApplyMask(maskIPA);
+ CPPUNIT_ASSERT( !maskIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !maskIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( maskIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !maskIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( 20 , anIPA.GetCIDR() );
+#endif
+
+}
+
+void
+testIpAddress::testAddrInfo()
+{
+ struct addrinfo *expect;
+ struct addrinfo *ipval = NULL;
+ struct addrinfo hints;
+
+ memset(&hints, 0, sizeof(struct addrinfo));
+
+ hints.ai_flags = AI_NUMERICHOST;
+
+ IpAddress anIP = "127.0.0.1";
+
+ /* assert this just to check that getaddrinfo is working properly */
+ CPPUNIT_ASSERT( xgetaddrinfo("127.0.0.1", NULL, &hints, &expect ) == 0 );
+
+ anIP.GetAddrInfo(ipval);
+
+#if 0
+ /* display a byte-by-byte hex comparison of the addr cores */
+ unsigned int *p;
+ p = (unsigned int*)expect;
+ printf("\nSYS-ADDRINFO: %2x %2x %2x %2x %2x %2x",
+ p[0],p[1],p[2],p[3],p[4],p[5]);
+
+ p = (unsigned int*)ipval;
+ printf("\nSQD-ADDRINFO: %2x %2x %2x %2x %2x %2x",
+ p[0],p[1],p[2],p[3],p[4],p[5] );
+ printf("\n");
+#endif /*0*/
+
+ // check the addrinfo object core. (BUT not the two ptrs at the tail)
+ // details
+ CPPUNIT_ASSERT_EQUAL( expect->ai_flags, ipval->ai_flags );
+ CPPUNIT_ASSERT_EQUAL( expect->ai_family, ipval->ai_family );
+ // check the sockaddr it points to.
+ CPPUNIT_ASSERT_EQUAL( expect->ai_addrlen, ipval->ai_addrlen );
+
+#if 0
+ p = (unsigned int*)(expect->ai_addr);
+ printf("\nSYS-ADDR: (%d) %x %x %x %x %x %x %x %x ...",
+ expect->ai_addrlen,
+ p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
+
+ p = (unsigned int*)(ipval->ai_addr);
+ printf("\nSQD-ADDR: (%d) %x %x %x %x %x %x %x %x ...",
+ ipval->ai_addrlen,
+ p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7] );
+ printf("\n");
+#if HAVE_SS_LEN_IN_SS
+ printf("\nSYS SS_LEN=%d\nSQD SS_LEN=%d\n",((struct sockaddr_storage*)expect->ai_addr)->ss_len,
+ ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
+#endif
+#endif /*0*/
+
+#if USE_IPV6
+#if HAVE_SS_LEN_IN_SS
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_storage*)expect->ai_addr)->ss_len,
+ ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
+ CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_storage*)ipval->ai_addr)->ss_len, ipval->ai_addrlen );
+#endif
+#if HAVE_SIN6_LEN_IN_SAI
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_len,
+ ((struct sockaddr_in6*)ipval->ai_addr)->sin6_len );
+ CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in6*)ipval->ai_addr)->sin6_len, ipval->ai_addrlen );
+#endif
+#if HAVE_SIN_LEN_IN_SAI
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_len,
+ ((struct sockaddr_in*)ipval->ai_addr)->sin_len );
+ CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in*)ipval->ai_addr)->sin_len, ipval->ai_addrlen );
+#endif
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_family,
+ ((struct sockaddr_in6*)ipval->ai_addr)->sin6_family );
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in6*)expect->ai_addr)->sin6_port,
+ ((struct sockaddr_in6*)ipval->ai_addr)->sin6_port );
+#else
+#if HAVE_SS_LEN_IN_SS
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_storage*)expect->ai_addr)->ss_len,
+ ((struct sockaddr_storage*)ipval->ai_addr)->ss_len );
+ CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_storage*)ipval->ai_addr)->ss_len, ipval->ai_addrlen );
+#endif
+#if HAVE_SIN_LEN_IN_SAI
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_len,
+ ((struct sockaddr_in*)ipval->ai_addr)->sin_len );
+ CPPUNIT_ASSERT_EQUAL( (socklen_t)((struct sockaddr_in*)ipval->ai_addr)->sin_len, ipval->ai_addrlen );
+#endif
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_family,
+ ((struct sockaddr_in*)ipval->ai_addr)->sin_family );
+ CPPUNIT_ASSERT_EQUAL( ((struct sockaddr_in*)expect->ai_addr)->sin_port,
+ ((struct sockaddr_in*)ipval->ai_addr)->sin_port );
+#endif /* USE_IPV6 */
+
+ CPPUNIT_ASSERT( memcmp( expect->ai_addr, ipval->ai_addr, expect->ai_addrlen ) == 0 );
+
+ xfreeaddrinfo(expect);
+}
+
+void
+testIpAddress::testBugNullingDisplay()
+{
+ // Weird Bug: address set to empty during string conversion somewhere.
+ // initial string gets created and returned OK.
+ // but at the end of the process m_SocketAddr is left NULL'ed
+
+ char ntoabuf[MAX_IPSTRLEN];
+ char hostbuf[MAX_IPSTRLEN];
+ char urlbuf[MAX_IPSTRLEN];
+
+ struct in_addr outval;
+ struct in_addr expectval;
+
+ expectval.s_addr = htonl(0xC0A8640C);
+
+ IpAddress anIPA = "192.168.100.12";
+
+
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+
+
+ /* POKE NtoA display function to see what it is doing */
+ anIPA.NtoA(ntoabuf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+
+
+
+ /* POKE ToHostname display function to see what it is doing */
+ anIPA.ToHostname(hostbuf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+
+
+ /* POKE ToURL display function to see what it is doing */
+ anIPA.ToURL(urlbuf,MAX_IPSTRLEN);
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ /* test stored values */
+ CPPUNIT_ASSERT( !anIPA.IsAnyAddr() );
+ CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+ CPPUNIT_ASSERT( anIPA.IsIPv4() );
+ CPPUNIT_ASSERT( !anIPA.IsIPv6() );
+ CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
+ CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
+ anIPA.GetInAddr(outval);
+ CPPUNIT_ASSERT( memcmp( &expectval, &outval, sizeof(struct in_addr)) == 0 );
+
+}
diff -u -r -N squid-3.1.0.3/src/ip/testIpAddress.h squid-3.1.0.4/src/ip/testIpAddress.h
--- squid-3.1.0.3/src/ip/testIpAddress.h 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.1.0.4/src/ip/testIpAddress.h 2009-01-23 18:37:37.000000000 +1300
@@ -0,0 +1,70 @@
+#ifndef SQUID_SRC_TEST_IPADDRESS_H
+#define SQUID_SRC_TEST_IPADDRESS_H
+
+#include
+
+/*
+ * test the IP storage type
+ */
+
+class testIpAddress : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( testIpAddress );
+ CPPUNIT_TEST( testDefaults );
+ CPPUNIT_TEST( testInAddrConstructor );
+#if USE_IPV6
+ CPPUNIT_TEST( testInAddr6Constructor );
+#endif
+ CPPUNIT_TEST( testSockAddrConstructor );
+#if USE_IPV6
+ CPPUNIT_TEST( testSockAddr6Constructor );
+#endif
+ CPPUNIT_TEST( testHostentConstructor );
+ CPPUNIT_TEST( testStringConstructor );
+ CPPUNIT_TEST( testCopyConstructor );
+ CPPUNIT_TEST( testSetEmpty );
+ CPPUNIT_TEST( testBooleans );
+ CPPUNIT_TEST( testAddrInfo );
+ CPPUNIT_TEST( testNtoA );
+ CPPUNIT_TEST( testToURL_fromInAddr );
+ CPPUNIT_TEST( testToURL_fromSockAddr );
+ CPPUNIT_TEST( testGetReverseString );
+ CPPUNIT_TEST( testMasking );
+
+ CPPUNIT_TEST( testBugNullingDisplay );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+
+protected:
+ void testDefaults();
+
+ void testInAddrConstructor();
+#if USE_IPV6
+ void testInAddr6Constructor();
+#endif
+ void testSockAddrConstructor();
+#if USE_IPV6
+ void testSockAddr6Constructor();
+#endif
+ void testHostentConstructor();
+ void testStringConstructor();
+ void testCopyConstructor();
+
+ void testSetEmpty();
+ void testBooleans();
+
+ void testAddrInfo();
+
+ void testNtoA();
+ void testToURL_fromInAddr();
+ void testToURL_fromSockAddr();
+ void testGetReverseString();
+ void testMasking();
+
+ // bugs.
+ void testBugNullingDisplay();
+
+};
+
+#endif /* SQUID_SRC_TEST_IPADDRESS_H */
diff -u -r -N squid-3.1.0.3/src/ipcache.cc squid-3.1.0.4/src/ipcache.cc
--- squid-3.1.0.3/src/ipcache.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/ipcache.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: ipcache.cc,v 1.269 2008/02/26 21:49:35 amosjeffries Exp $
- *
* DEBUG: section 14 IP Cache
* AUTHOR: Harvest Derived
*
@@ -40,7 +37,7 @@
#include "SquidTime.h"
#include "Store.h"
#include "wordlist.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
/**
\defgroup IPCacheAPI IP Cache API
@@ -420,7 +417,7 @@
if (ipcount > 0) {
int j, k;
- i->addrs.in_addrs = (IPAddress *)xcalloc(ipcount, sizeof(IPAddress));
+ i->addrs.in_addrs = (IpAddress *)xcalloc(ipcount, sizeof(IpAddress));
for (int l = 0; l < ipcount; l++)
i->addrs.in_addrs[l].SetEmpty(); // perform same init actions as constructor would.
i->addrs.bad_mask = (unsigned char *)xcalloc(ipcount, sizeof(unsigned char));
@@ -555,7 +552,7 @@
return 0;
}
- i->addrs.in_addrs = (IPAddress *)xcalloc(na, sizeof(IPAddress));
+ i->addrs.in_addrs = (IpAddress *)xcalloc(na, sizeof(IpAddress));
for (int l = 0; l < na; l++)
i->addrs.in_addrs[l].SetEmpty(); // perform same init actions as constructor would.
i->addrs.bad_mask = (unsigned char *)xcalloc(na, sizeof(unsigned char));
@@ -780,8 +777,8 @@
memset(&lru_list, '\0', sizeof(lru_list));
memset(&static_addrs, '\0', sizeof(ipcache_addrs));
- static_addrs.in_addrs = (IPAddress *)xcalloc(1, sizeof(IPAddress));
- static_addrs.in_addrs->SetEmpty(); // properly setup the IPAddress!
+ static_addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IpAddress));
+ static_addrs.in_addrs->SetEmpty(); // properly setup the IpAddress!
static_addrs.bad_mask = (unsigned char *)xcalloc(1, sizeof(unsigned char));
ipcache_high = (long) (((float) Config.ipcache.size *
(float) Config.ipcache.high) / (float) 100);
@@ -855,11 +852,11 @@
ipcacheStatPrint(ipcache_entry * i, StoreEntry * sentry)
{
int k;
- int count = i->addrs.count;
char buf[MAX_IPSTRLEN];
if (!sentry) {
debugs(14, 0, HERE << "CRITICAL: sentry is NULL!");
+ return;
}
if (!i) {
@@ -868,6 +865,8 @@
return;
}
+ int count = i->addrs.count;
+
storeAppendPrintf(sentry, " %-32.32s %c%c %6d %6d %2d(%2d)",
hashKeyStr(&i->hash),
i->flags.fromhosts ? 'H' : ' ',
@@ -950,7 +949,7 @@
#if DNS_CNAME
/**
- * Takes two IPAddress arrays and merges them into a single array
+ * Takes two IpAddress arrays and merges them into a single array
* which is allocated dynamically to fit the number of unique addresses
*
\param aaddrs One list to merge
@@ -961,22 +960,22 @@
\param outlen Size of list out
*/
void
-ipcacheMergeIPLists(const IPAddress *aaddrs, const int alen,
- const IPAddress *baddrs, const int blen,
- IPAddress **out, int &outlen )
+ipcacheMergeIPLists(const IpAddress *aaddrs, const int alen,
+ const IpAddress *baddrs, const int blen,
+ IpAddress **out, int &outlen )
{
int fc=0, t=0, c=0;
- IPAddress const *ip4ptrs[255];
+ IpAddress const *ip4ptrs[255];
#if USE_IPV6
- IPAddress const *ip6ptrs[255];
+ IpAddress const *ip6ptrs[255];
#endif
int num_ip4 = 0;
int num_ip6 = 0;
- memset(ip4ptrs, 0, sizeof(IPAddress*)*255);
+ memset(ip4ptrs, 0, sizeof(IpAddress*)*255);
#if USE_IPV6
- memset(ip6ptrs, 0, sizeof(IPAddress*)*255);
+ memset(ip6ptrs, 0, sizeof(IpAddress*)*255);
#endif
// for each unique address in list A - grab ptr
@@ -1039,7 +1038,7 @@
debugs(14, 5, "ipcacheMergeIPLists: Merge " << alen << "+" << blen << " into " << fc << " unique IPs.");
// copy the old IPs into the new list buffer.
- (*out) = (IPAddress*)xcalloc(fc, sizeof(IPAddress));
+ (*out) = (IpAddress*)xcalloc(fc, sizeof(IpAddress));
outlen=0;
assert(out != NULL);
@@ -1070,7 +1069,7 @@
#if DNS_CNAME
ipcache_entry *i = NULL;
char *pname = NULL;
- IPAddress *tmpbuf = NULL;
+ IpAddress *tmpbuf = NULL;
int fc = 0;
int ttl = 0;
generic_cbdata* gcb = (generic_cbdata*)cbdata;
@@ -1206,7 +1205,7 @@
ipcacheCheckNumeric(const char *name)
{
- IPAddress ip;
+ IpAddress ip;
/* check if it's already a IP address in text form. */
/* it may be IPv6-wrapped */
@@ -1309,7 +1308,7 @@
\param addr specific addres to be marked bad
*/
void
-ipcacheMarkBadAddr(const char *name, IPAddress &addr)
+ipcacheMarkBadAddr(const char *name, IpAddress &addr)
{
ipcache_entry *i;
ipcache_addrs *ia;
@@ -1344,7 +1343,7 @@
/// \ingroup IPCacheAPI
void
-ipcacheMarkGoodAddr(const char *name, IPAddress &addr)
+ipcacheMarkGoodAddr(const char *name, IpAddress &addr)
{
ipcache_entry *i;
ipcache_addrs *ia;
@@ -1427,7 +1426,7 @@
{
ipcache_entry *i;
- IPAddress ip;
+ IpAddress ip;
if (!(ip = ipaddr)) {
#if USE_IPV6
@@ -1459,7 +1458,7 @@
i->addrs.cur = 0;
i->addrs.badcount = 0;
- i->addrs.in_addrs = (IPAddress *)xcalloc(1, sizeof(IPAddress));
+ i->addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IpAddress));
i->addrs.bad_mask = (unsigned char *)xcalloc(1, sizeof(unsigned char));
i->addrs.in_addrs[0] = ip;
i->addrs.bad_mask[0] = FALSE;
diff -u -r -N squid-3.1.0.3/src/ipc.cc squid-3.1.0.4/src/ipc.cc
--- squid-3.1.0.3/src/ipc.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/ipc.cc 2009-01-23 18:37:37.000000000 +1300
@@ -1,7 +1,4 @@
-
/*
- * $Id: ipc.cc,v 1.48 2008/02/13 00:01:47 rousskov Exp $
- *
* DEBUG: section 54 Interprocess Communication
* AUTHOR: Duane Wessels
*
@@ -36,7 +33,7 @@
#include "squid.h"
#include "comm.h"
#include "fde.h"
-#include "IPAddress.h"
+#include "ip/IpAddress.h"
static const char *hello_string = "hi there\n";
#define HELLO_BUF_SZ 32
@@ -75,11 +72,11 @@
}
pid_t
-ipcCreate(int type, const char *prog, const char *const args[], const char *name, IPAddress &local_addr, int *rfd, int *wfd, void **hIpc)
+ipcCreate(int type, const char *prog, const char *const args[], const char *name, IpAddress &local_addr, int *rfd, int *wfd, void **hIpc)
{
pid_t pid;
- IPAddress ChS;
- IPAddress PaS;
+ IpAddress ChS;
+ IpAddress PaS;
struct addrinfo *AI = NULL;
int crfd = -1;
int prfd = -1;
diff -u -r -N squid-3.1.0.3/src/ipc_win32.cc squid-3.1.0.4/src/ipc_win32.cc
--- squid-3.1.0.3/src/ipc_win32.cc 2008-12-05 16:09:35.000000000 +1300
+++ squid-3.1.0.4/src/ipc_win32.cc 2009-01-23 18:37:37.000000000 +1300
@@ -47,7 +47,7 @@
int type;
int crfd;
int cwfd;
- IPAddress local_addr;
+ IpAddress local_addr;
struct addrinfo PS;
const char *prog;
char **args;
@@ -105,7 +105,7 @@
}
pid_t
-ipcCreate(int type, const char *prog, const char *const args[], const char *name, IPAddress &local_addr, int *rfd, int *wfd, void **hIpc)
+ipcCreate(int type, const char *prog, const char *const args[], const char *name, IpAddress &local_addr, int *rfd, int *wfd, void **hIpc)
{
unsigned long thread;
@@ -115,7 +115,7 @@
DWORD ecode = 0;
pid_t pid;
- IPAddress tmp_addr;
+ IpAddress tmp_addr;
struct addrinfo *aiCS = NULL;
struct addrinfo *aiPS = NULL;
@@ -252,7 +252,7 @@
return ipcCloseAllFD(prfd, pwfd, crfd, cwfd);
}
- /* NP: tmp_addr was left with eiether empty or aiCS in IPAddress format */
+ /* NP: tmp_addr was left with eiether empty or aiCS in IpAddress format */
if (comm_connect_addr(pwfd, tmp_addr) == COMM_ERROR) {
CloseHandle((HANDLE) thread);
return ipcCloseAllFD(prfd, pwfd, -1, -1);
@@ -377,8 +377,8 @@
int prfd_ipc = -1, pwfd_ipc = -1, crfd_ipc = -1, cwfd_ipc = -1;
char *prog = NULL, *buf1 = NULL;
- IPAddress PS_ipc;
- IPAddress CS_ipc;
+ IpAddress PS_ipc;
+ IpAddress CS_ipc;
struct addrinfo *aiPS_ipc = NULL;
struct addrinfo *aiCS_ipc = NULL;
@@ -388,8 +388,8 @@
int cwfd = params->cwfd;
char **args = params->args;
- IPAddress PS = params->PS;
- IPAddress local_addr = params->local_addr;
+ IpAddress PS = params->PS;
+ IpAddress local_addr = params->local_addr;
buf1 = (char *)xcalloc(1, 8192);
strcpy(buf1, params->prog);
diff -u -r -N squid-3.1.0.3/src/IPInterception.cc squid-3.1.0.4/src/IPInterception.cc
--- squid-3.1.0.3/src/IPInterception.cc 2008-12-05 16:09:34.000000000 +1300
+++ squid-3.1.0.4/src/IPInterception.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,439 +0,0 @@
-/*
- * $Id: IPInterception.cc,v 1.20 2008/02/05 22:38:24 amosjeffries Exp $
- *
- * DEBUG: section 89 NAT / IP Interception
- * AUTHOR: Robert Collins
- * AUTHOR: Amos Jeffries
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- */
-#include "config.h"
-#include "IPInterception.h"
-#include "fde.h"
-
-#if 0
-#include "squid.h"
-#include "clientStream.h"
-#endif
-
-#if IPF_TRANSPARENT
-
-#if HAVE_SYS_IOCTL_H
-#include
-#endif
-#if HAVE_NETINET_TCP_H
-#include
-#endif
-#if HAVE_NET_IF_H
-#include
-#endif
-#ifdef HAVE_IPL_H
-#include
-#elif HAVE_NETINET_IPL_H
-#include
-#endif
-#if HAVE_IP_FIL_COMPAT_H
-#include
-#elif HAVE_NETINET_IP_FIL_COMPAT_H
-#include
-#elif HAVE_IP_COMPAT_H
-#include
-#elif HAVE_NETINET_IP_COMPAT_H
-#include
-#endif
-#if HAVE_IP_FIL_H
-#include
-#elif HAVE_NETINET_IP_FIL_H
-#include
-#endif
-#if HAVE_IP_NAT_H
-#include
-#elif HAVE_NETINET_IP_NAT_H
-#include
-#endif
-
-#endif /* IPF_TRANSPARENT required headers */
-
-#if PF_TRANSPARENT
-#include
-#include
-#include 