--------------------- PatchSet 9692 Date: 2007/06/30 09:09:59 Author: amosjeffries Branch: ipv6 Tag: (none) Log: Removing Legacy content of ipv6 branch (from 2.5 attempt at IPv6). Patch against current HEAD kept for archival in IPv6 website content. Members: .cvsignore:1.1.20.1->1.1.20.2 CONTRIBUTORS:1.4.2.5->1.4.2.6 CREDITS:1.2.6.1->1.2.6.2 ChangeLog:1.5.2.3->1.5.2.4 Makefile.am:1.4.16.2->1.4.16.3 SPONSORS:1.3.16.3->1.3.16.4 acinclude.m4:1.6.2.1->1.6.2.2 bootstrap.sh:1.5.8.2->1.5.8.3 configure.in:1.5.2.6->1.5.2.7 mkrelease.sh:1.7.18.1->1.7.18.2 mksnapshot.sh:1.6.18.1->1.6.18.2 doc/Makefile.am:1.4.4.1->1.4.4.2 doc/Programming-Guide/prog-guide.sgml:1.3.6.5->1.3.6.6 doc/release-notes/Makefile:1.4.6.1->1.4.6.2 errors/Makefile.am:1.2.26.2->1.2.26.3 errors/Czech/ERR_SHUTTING_DOWN:1.1.1.2.32.1->1.1.1.2.32.2 errors/English/ERR_CONNECT_FAIL:1.1.1.2.32.1->1.1.1.2.32.2 errors/Italian/ERR_CONNECT_FAIL:1.1.1.1.42.1->1.1.1.1.42.2 errors/Italian/ERR_TOO_BIG:1.1.1.1.32.1->1.1.1.1.32.2 errors/Portuguese/ERR_CANNOT_FORWARD:1.1.1.1.42.1->1.1.1.1.42.2 errors/Romanian/ERR_ACCESS_DENIED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_CACHE_ACCESS_DENIED:1.1.1.1.32.2->1.1.1.1.32.3 errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_CANNOT_FORWARD:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_CONNECT_FAIL:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_DNS_FAIL:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FORWARDING_DENIED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_DISABLED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_FAILURE:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_FORBIDDEN:1.2.8.1->1.2.8.2 errors/Romanian/ERR_FTP_NOT_FOUND:1.2.8.1->1.2.8.2 errors/Romanian/ERR_FTP_PUT_CREATED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_PUT_ERROR:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_PUT_MODIFIED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_FTP_UNAVAILABLE:1.2.8.1->1.2.8.2 errors/Romanian/ERR_INVALID_REQ:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_INVALID_RESP:1.1.10.1->1.1.10.2 errors/Romanian/ERR_INVALID_URL:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_LIFETIME_EXP:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_NO_RELAY:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_ONLY_IF_CACHED_MISS:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_READ_ERROR:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_READ_TIMEOUT:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_SHUTTING_DOWN:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_SOCKET_FAILURE:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_TOO_BIG:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_UNSUP_REQ:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_URN_RESOLVE:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_WRITE_ERROR:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/ERR_ZERO_SIZE_OBJECT:1.1.1.1.32.1->1.1.1.1.32.2 errors/Romanian/README:1.1.1.1->1.1.1.1.32.1 errors/Spanish/ERR_CACHE_ACCESS_DENIED:1.1.1.1.32.2->1.1.1.1.32.3 errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED:1.1.1.1.32.1->1.1.1.1.32.2 errors/Spanish/ERR_CANNOT_FORWARD:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_DNS_FAIL:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_FORWARDING_DENIED:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_FTP_DISABLED:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_FTP_NOT_FOUND:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_INVALID_REQ:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_INVALID_RESP:1.1.10.1->1.1.10.2 errors/Spanish/ERR_INVALID_URL:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_NO_RELAY:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_ONLY_IF_CACHED_MISS:1.1.1.1.32.1->1.1.1.1.32.2 errors/Spanish/ERR_SHUTTING_DOWN:1.1.1.2.32.1->1.1.1.2.32.2 errors/Spanish/ERR_TOO_BIG:1.1.1.1.32.1->1.1.1.1.32.2 errors/Spanish/ERR_UNSUP_REQ:1.1.1.2.32.1->1.1.1.2.32.2 errors/Traditional_Chinese/ERR_ACCESS_DENIED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED:1.1.1.1.42.2->1.1.1.1.42.3 errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_CANNOT_FORWARD:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_CONNECT_FAIL:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_DNS_FAIL:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FORWARDING_DENIED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FTP_DISABLED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FTP_FAILURE:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FTP_PUT_CREATED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FTP_PUT_ERROR:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_INVALID_REQ:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_INVALID_URL:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_LIFETIME_EXP:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_NO_RELAY:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_READ_ERROR:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_READ_TIMEOUT:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_SHUTTING_DOWN:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_SOCKET_FAILURE:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_UNSUP_REQ:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_URN_RESOLVE:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_WRITE_ERROR:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT:1.1.1.1.42.1->1.1.1.1.42.2 errors/Traditional_Chinese/generic:1.1.1.1.42.1->1.1.1.1.42.2 helpers/Makefile.am:1.3.42.1->1.3.42.2 helpers/basic_auth/Makefile.am:1.2.54.1->1.2.54.2 helpers/basic_auth/LDAP/Makefile.am:1.3.32.1->1.3.32.2 helpers/basic_auth/LDAP/squid_ldap_auth.8:1.2.54.1->1.2.54.2 helpers/basic_auth/LDAP/squid_ldap_auth.c:1.5.20.1->1.5.20.2 helpers/basic_auth/MSNT/rfcnb-util.c:1.2.54.1->1.2.54.2 helpers/basic_auth/MSNT/smbencrypt.c:1.2.54.1->1.2.54.2 helpers/basic_auth/MSNT/smblib-util.c:1.2.54.1->1.2.54.2 helpers/basic_auth/MSNT/smblib.c:1.2.54.1->1.2.54.2 helpers/basic_auth/MSNT/smblib.h:1.2.54.1->1.2.54.2 helpers/basic_auth/NCSA/Makefile.am:1.3.32.1->1.3.32.2 helpers/basic_auth/NCSA/ncsa_auth.c:1.3.32.1->1.3.32.2 helpers/basic_auth/YP/nis_support.c:1.2.54.1->1.2.54.2 helpers/basic_auth/YP/yp_auth.c:1.3.32.1->1.3.32.2 helpers/basic_auth/getpwnam/getpwnam_auth.c:1.3.32.1->1.3.32.2 helpers/digest_auth/Makefile.am:1.2.54.1->1.2.54.2 helpers/digest_auth/password/Makefile.am:1.2.54.1->1.2.54.2 helpers/digest_auth/password/digest_pw_auth.c:1.3.6.1->1.3.6.2 helpers/external_acl/Makefile.am:1.2.52.1->1.2.52.2 helpers/external_acl/ip_user/Makefile.am:1.2.36.1->1.2.36.2 helpers/external_acl/ip_user/main.c:1.2.46.1->1.2.46.2 helpers/external_acl/ldap_group/ChangeLog:1.1.18.1->1.1.18.2 helpers/external_acl/ldap_group/Makefile.am:1.3.2.1->1.3.2.2 helpers/external_acl/ldap_group/squid_ldap_group.8:1.2.4.1->1.2.4.2 helpers/external_acl/ldap_group/squid_ldap_group.c:1.5.2.1->1.5.2.2 helpers/external_acl/unix_group/Makefile.am:1.2.32.1->1.2.32.2 helpers/external_acl/unix_group/check_group.c:1.2.6.1->1.2.6.2 helpers/external_acl/unix_group/squid_unix_group.8:1.1.56.1->1.1.56.2 helpers/external_acl/wbinfo_group/wbinfo_group.pl:1.1.56.1->1.1.56.2 helpers/ntlm_auth/Makefile.am:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/libntlmssp.c:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/ntlm.h:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/ntlm_auth.c:1.3.32.1->1.3.32.2 helpers/ntlm_auth/SMB/smbval/rfcnb-util.c:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/smbval/smblib-priv.h:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/smbval/smblib-util.c:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/smbval/smblib.c:1.2.54.1->1.2.54.2 helpers/ntlm_auth/SMB/smbval/std-includes.h:1.3.6.1->1.3.6.2 helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.6.1->1.3.6.2 helpers/ntlm_auth/fakeauth/ntlm.h:1.2.54.1->1.2.54.2 helpers/ntlm_auth/no_check/no_check.pl:1.2.54.1->1.2.54.2 include/Array.h:1.2.6.2->1.2.6.3 include/cache_snmp.h:1.2.6.1->1.2.6.2 include/config.h:1.4.2.2->1.4.2.3 include/md5.h:1.2.6.5->1.2.6.6 include/ntlmauth.h:1.4.2.4->1.4.2.5 include/radix.h:1.2.6.3->1.2.6.4 include/rfc1035.h:1.3.6.5->1.3.6.6 include/squid_types.h:1.1.26.3->1.1.26.4 include/util.h:1.4.4.4->1.4.4.5 lib/Array.c:1.3.6.1->1.3.6.2 lib/GNUregex.c:1.2.6.2->1.2.6.3 lib/Makefile.am:1.2.26.2->1.2.26.3 lib/Stack.c:1.3.6.1->1.3.6.2 lib/hash.c:1.4.6.2->1.4.6.3 lib/heap.c:1.3.10.1->1.3.10.2 lib/html_quote.c:1.2.16.2->1.2.16.3 lib/md5.c:1.2.6.5->1.2.6.6 lib/ntlmauth.c:1.3.14.3->1.3.14.4 lib/radix.c:1.3.6.3->1.3.6.4 lib/rfc1035.c:1.4.6.8->1.4.6.9 lib/rfc1123.c:1.4.4.2->1.4.4.3 lib/rfc1738.c:1.3.6.2->1.3.6.3 lib/rfc2617.c:1.5.12.4->1.5.12.5 lib/safe_inet_addr.c:1.2.6.4->1.2.6.5 lib/splay.c:1.3.6.1->1.3.6.2 lib/stub_memaccount.c:1.2.6.1->1.2.6.2 lib/util.c:1.3.6.4->1.3.6.5 scripts/Makefile.am:1.2.26.1->1.2.26.2 snmplib/asn1.c:1.1.1.1.42.1->1.1.1.1.42.2 snmplib/coexistance.c:1.1.1.1.42.2->1.1.1.1.42.3 snmplib/mib.c:1.1.1.1.42.4->1.1.1.1.42.5 snmplib/parse.c:1.1.1.2.42.1->1.1.1.2.42.2 snmplib/snmp_api.c:1.1.1.1.42.3->1.1.1.1.42.4 snmplib/snmp_msg.c:1.1.1.1.42.2->1.1.1.1.42.3 snmplib/snmp_pdu.c:1.1.1.1.42.3->1.1.1.1.42.4 snmplib/snmp_vars.c:1.1.1.2.32.1->1.1.1.2.32.2 src/CacheDigest.c:1.3.6.1->1.3.6.2 src/HttpHdrCc.c:1.4.4.1->1.4.4.2 src/HttpHdrContRange.c:1.3.6.2->1.3.6.3 src/HttpHdrRange.c:1.4.6.2->1.4.6.3 src/HttpHeader.c:1.3.6.4->1.3.6.5 src/HttpHeaderTools.c:1.3.6.3->1.3.6.4 src/HttpMsg.c:1.4.2.2->1.4.2.3 src/HttpReply.c:1.4.2.4->1.4.2.5 src/HttpRequest.c:1.3.6.3->1.3.6.4 src/HttpStatusLine.c:1.4.2.3->1.4.2.4 src/Makefile.am:1.6.2.2->1.6.2.3 src/MemBuf.c:1.3.6.3->1.3.6.4 src/MemPool.c:1.4.6.3->1.4.6.4 src/Packer.c:1.3.6.1->1.3.6.2 src/StatHist.c:1.3.6.2->1.3.6.3 src/String.c:1.3.6.1->1.3.6.2 src/access_log.c:1.5.2.6->1.5.2.7 src/acl.c:1.4.6.13->1.4.6.14 src/asn.c:1.4.4.5->1.4.4.6 src/authenticate.c:1.4.6.8->1.4.6.9 src/cache_cf.c:1.4.2.10->1.4.2.11 src/cache_diff.c:1.4.6.1->1.4.6.2 src/cache_manager.c:1.4.2.1->1.4.2.2 src/carp.c:1.3.6.2->1.3.6.3 src/cbdata.c:1.4.6.4->1.4.6.5 src/cf.data.pre:1.4.6.6->1.4.6.7 src/cf_gen.c:1.3.6.3->1.3.6.4 src/cf_gen_defines:1.2.8.3->1.2.8.4 src/client_db.c:1.4.6.4->1.4.6.5 src/client_side.c:1.7.2.9->1.7.2.10 src/comm.c:1.4.6.8->1.4.6.9 src/comm_select.c:1.3.6.4->1.3.6.5 src/debug.c:1.3.6.3->1.3.6.4 src/defines.h:1.3.6.8->1.3.6.9 src/delay_pools.c:1.3.6.3->1.3.6.4 src/disk.c:1.4.6.4->1.4.6.5 src/dns.c:1.3.6.5->1.3.6.6 src/dns_internal.c:1.5.6.7->1.5.6.8 src/dnsserver.c:1.3.6.5->1.3.6.6 src/enums.h:1.5.4.6->1.5.4.7 src/errorpage.c:1.5.2.6->1.5.2.7 src/event.c:1.3.6.2->1.3.6.3 src/external_acl.c:1.12.2.1->1.12.2.2 src/fd.c:1.3.6.4->1.3.6.5 src/filemap.c:1.3.6.2->1.3.6.3 src/forward.c:1.4.6.6->1.4.6.7 src/fqdncache.c:1.4.6.5->1.4.6.6 src/ftp.c:1.5.2.7->1.5.2.8 src/globals.h:1.4.4.5->1.4.4.6 src/gopher.c:1.4.4.5->1.4.4.6 src/helper.c:1.3.6.5->1.3.6.6 src/htcp.c:1.4.6.4->1.4.6.5 src/http.c:1.5.2.5->1.5.2.6 src/icmp.c:1.3.6.4->1.3.6.5 src/icp_v2.c:1.3.6.4->1.3.6.5 src/icp_v3.c:1.3.6.2->1.3.6.3 src/ident.c:1.4.6.4->1.4.6.5 src/internal.c:1.5.2.2->1.5.2.3 src/ipc.c:1.3.6.3->1.3.6.4 src/ipcache.c:1.4.6.11->1.4.6.12 src/logfile.c:1.2.8.3->1.2.8.4 src/main.c:1.5.4.6->1.5.4.7 src/mem.c:1.3.6.3->1.3.6.4 src/mib.txt:1.3.6.1->1.3.6.2 src/mime.c:1.4.2.4->1.4.2.5 src/mk-string-arrays.pl:1.2->1.2.6.1 src/multicast.c:1.3.6.3->1.3.6.4 src/neighbors.c:1.5.4.7->1.5.4.8 src/net_db.c:1.6.2.5->1.6.2.6 src/pconn.c:1.4.6.3->1.4.6.4 src/peer_digest.c:1.3.6.5->1.3.6.6 src/peer_select.c:1.3.6.6->1.3.6.7 src/pinger.c:1.3.6.3->1.3.6.4 src/protos.h:1.5.2.11->1.5.2.12 src/recv-announce.c:1.3.6.2->1.3.6.3 src/redirect.c:1.3.6.4->1.3.6.5 src/refresh.c:1.5.4.3->1.5.4.4 src/send-announce.c:1.3.6.3->1.3.6.4 src/snmp_agent.c:1.3.6.3->1.3.6.4 src/snmp_core.c:1.3.6.7->1.3.6.8 src/squid.h:1.3.6.4->1.3.6.5 src/ssl.c:1.3.6.6->1.3.6.7 src/ssl_support.c:1.1.8.3->1.1.8.4 src/ssl_support.h:1.1.8.2->1.1.8.3 src/stat.c:1.4.6.5->1.4.6.6 src/stmem.c:1.4.6.2->1.4.6.3 src/store.c:1.5.2.4->1.5.2.5 src/store_client.c:1.4.6.5->1.4.6.6 src/store_digest.c:1.5.2.4->1.5.2.5 src/store_dir.c:1.4.6.6->1.4.6.7 src/store_io.c:1.2.8.1->1.2.8.2 src/store_key_md5.c:1.4.6.2->1.4.6.3 src/store_log.c:1.4.6.2->1.4.6.3 src/store_rebuild.c:1.5.4.3->1.5.4.4 src/store_swapin.c:1.4.6.1->1.4.6.2 src/store_swapmeta.c:1.4.6.3->1.4.6.4 src/store_swapout.c:1.4.6.4->1.4.6.5 src/structs.h:1.7.2.9->1.7.2.10 src/tools.c:1.4.2.9->1.4.2.10 src/typedefs.h:1.4.2.5->1.4.2.6 src/unlinkd.c:1.3.6.3->1.3.6.4 src/url.c:1.3.6.4->1.3.6.5 src/urn.c:1.4.2.4->1.4.2.5 src/wccp.c:1.3.6.3->1.3.6.4 src/whois.c:1.3.6.3->1.3.6.4 src/win32.c:1.2.16.3->1.2.16.4 src/auth/Makefile.am:1.2.26.1->1.2.26.2 src/auth/basic/auth_basic.c:1.9.12.5->1.9.12.6 src/auth/basic/auth_basic.h:1.2.26.3->1.2.26.4 src/auth/digest/auth_digest.c:1.4.12.4->1.4.12.5 src/auth/digest/auth_digest.h:1.2.20.4->1.2.20.5 src/auth/ntlm/auth_ntlm.c:1.7.14.4->1.7.14.5 src/auth/ntlm/auth_ntlm.h:1.3.18.3->1.3.18.4 src/fs/Makefile.am:1.2.26.2->1.2.26.3 src/fs/aufs/aiops.c:1.3.4.4->1.3.4.5 src/fs/aufs/async_io.c:1.3.4.3->1.3.4.4 src/fs/aufs/store_asyncufs.h:1.3.4.3->1.3.4.4 src/fs/aufs/store_dir_aufs.c:1.5.4.5->1.5.4.6 src/fs/aufs/store_io_aufs.c:1.3.4.4->1.3.4.5 src/fs/coss/async_io.c:1.3.4.2->1.3.4.3 src/fs/coss/async_io.h:1.2.14.1->1.2.14.2 src/fs/coss/coss-notes.txt:1.2.26.2->1.2.26.3 src/fs/coss/store_coss.h:1.2.8.3->1.2.8.4 src/fs/coss/store_dir_coss.c:1.3.6.5->1.3.6.6 src/fs/coss/store_io_coss.c:1.2.8.5->1.2.8.6 src/fs/diskd/diskd.c:1.4.2.1->1.4.2.2 src/fs/diskd/store_dir_diskd.c:1.4.4.5->1.4.4.6 src/fs/diskd/store_diskd.h:1.2.8.1->1.2.8.2 src/fs/diskd/store_io_diskd.c:1.2.8.4->1.2.8.5 src/fs/null/store_null.c:1.2.24.2->1.2.24.3 src/fs/ufs/store_dir_ufs.c:1.4.4.5->1.4.4.6 src/fs/ufs/store_io_ufs.c:1.2.8.4->1.2.8.5 src/fs/ufs/store_ufs.h:1.2.8.1->1.2.8.2 src/repl/Makefile.am:1.2.26.2->1.2.26.3 src/repl/heap/store_heap_replacement.c:1.3.6.2->1.3.6.3 test-suite/pconn-banger.c:1.1.1.1.42.1->1.1.1.1.42.2 Index: squid/.cvsignore =================================================================== RCS file: /cvsroot/squid-sf//squid/.cvsignore,v retrieving revision 1.1.20.1 retrieving revision 1.1.20.2 diff -u -r1.1.20.1 -r1.1.20.2 --- squid/.cvsignore 25 Oct 2001 18:24:53 -0000 1.1.20.1 +++ squid/.cvsignore 30 Jun 2007 09:09:59 -0000 1.1.20.2 @@ -5,3 +5,4 @@ aclocal.m4 configure merge.log +autom4te.cache Index: squid/CONTRIBUTORS =================================================================== RCS file: /cvsroot/squid-sf//squid/CONTRIBUTORS,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -r1.4.2.5 -r1.4.2.6 --- squid/CONTRIBUTORS 10 Feb 2005 02:40:00 -0000 1.4.2.5 +++ squid/CONTRIBUTORS 30 Jun 2007 09:09:59 -0000 1.4.2.6 @@ -71,18 +71,19 @@ Pedro Ribeiro John Dilley Adrian Chadd - Robert Collins + Robert Collins Brian Degenhardt Evan Jones Scott Schram - Francesco Chemolli + Francesco Chemolli Georgy Salnikov Glenn Chisholm Alex Rousskov Sergio Rabellino Ian Turner Moez Mahfoudh - Guido Serassio + Guido Serassio + Andrey Shorin Miquel van Smoorenburg Brian Ian Castle @@ -90,5 +91,16 @@ Jerry Murdock Glen Gibb Michael Pomraning + Flavio Pescuma + Paul Armstrong + Steven Wilton + Felix Meschberger + Mark Bergsma + Tim Starling + Reuben Farrelly + Alan Barrett + Przemek Czerkas + Pawel Worach + Andrew Atangulov Duane Wessels Index: squid/CREDITS =================================================================== RCS file: /cvsroot/squid-sf//squid/CREDITS,v retrieving revision 1.2.6.1 retrieving revision 1.2.6.2 diff -u -r1.2.6.1 -r1.2.6.2 --- squid/CREDITS 10 Feb 2005 02:40:01 -0000 1.2.6.1 +++ squid/CREDITS 30 Jun 2007 09:09:59 -0000 1.2.6.2 @@ -1,4 +1,4 @@ -$Id: CREDITS,v 1.2.6.1 2005/02/10 02:40:01 hno Exp $ +$Id: CREDITS,v 1.2.6.2 2007/06/30 09:09:59 amosjeffries Exp $ ============================================================================== @@ -167,25 +167,29 @@ lib/md5.c: /* - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights - * reserved. - * - * License to copy and use this software is granted provided that it is - * identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" - * in all material mentioning or referencing this software or this function. - * - * License is also granted to make and use derivative works provided that such - * works are identified as "derived from the RSA Data Security, Inc. MD5 - * Message-Digest Algorithm" in all material mentioning or referencing the - * derived work. - * - * RSA Data Security, Inc. makes no representations concerning either the - * merchantability of this software or the suitability of this software for - * any particular purpose. It is provided "as is" without express or implied - * warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * MD5Context structure, pass it to MD5Init, call MD5Update as + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. + * + * Changed so as no longer to depend on Colin Plumb's `usual.h' header + * definitions; now uses stuff from dpkg's config.h. + * - Ian Jackson . + * Still in the public domain. + * + * Changed MD5Update to take a void * for easier use and some other + * minor cleanup. - Henrik Nordstrom . + * Still in the public domain. */ ============================================================================== @@ -337,3 +341,25 @@ License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. +============================================================================== + +lib/strsep.c: + +/* Copyright (C) 2004 Free Software Foundation, Inc. + * Written by Yoann Vandoorselaere + * + * The file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This file 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + */ Index: squid/ChangeLog =================================================================== RCS file: /cvsroot/squid-sf//squid/ChangeLog,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -u -r1.5.2.3 -r1.5.2.4 --- squid/ChangeLog 10 Feb 2005 02:40:01 -0000 1.5.2.3 +++ squid/ChangeLog 30 Jun 2007 09:09:59 -0000 1.5.2.4 @@ -1,10 +1,630 @@ -Changes to squid-2.5.STABLE8 () + - new logformat tag for logging the outgoing IP address + (tcp_outgoing_address) + - Rename cache_dir option read-only to no-store + - Bug #1130: min-size option for cache_dir + - act-as-origin http_port option, making Squid act as if it was + the origin server + - Always use xisxxxx() Squid defined macros instead of ctype + functions. + - Use the client's DNS lookup if our DNS lookup fails on + transparent requests + - Clean up X-Forwarded-For acl_uses_indirect_client to make most + acls behave + - Change cachemgr filedescriptors timeout column to seconds + - Strengthen the HTTP protocol parser further wrt integer errors + - Simplified epoll comm loop + - Clean up use of httpReplySetHeaders to be consistent across the + code, and remove the unneeded http_version argument. + - Kill the psuedo-support for wais. Was never really implemented. + - Optimization to only parse response headers once, reusing the + already parsed headers when building the client reply. + - Simple perl library and script for processing access.log files + - General code tidyups of HTTP parser and related optimizations + +Changes to squid-2.6.STABLE13 (11 May 2007) + + - Make sure reply headers gets sent even if there is no body available + yet, fixing RealMedia streaming over HTTP issues. + - Undo an accidental name change of storeUnregisterAbort. + - Kill an ancient malplaced storeUnregisterAbort call from ftp.c + - Bug #1814: SSL memory leak on persistent SSL connections + - Don't log ECONNREFUSED/ECONNABORTED accept failures in cache.log + - Cosmetic fix: added missing newline in WCCPv2 configuration dump. + - Ukrainan error messages + - Convert various error pages from DOS to UNIX text format + - Bug #1820: COSS assertion failure t->length == MD5_DIGEST_CHARS + - Clarify the max-conn=n cache_peer option syntax slightly + - Bug #1892: COSS segfault on shutdown + - Windows port: fix undefined ECONNABORTED + - Make refreshIsCachable handle ETag as a cache validator, not + only last-modified + - in_port_t is not portable, use unsigned short instead + - Fix fs / auth / snmp dependencies + - Portability: statfs() may reqire #include + +Changes to squid-2.6.STABLE12 (20 Mar 2007) + + - Assertion error on TRACE + +Changes to squid-2.6.STABLE11 (17 Mar 2007) + + - Bug #1915: assertion failed: client_side.c:4055: "buf != NULL || + !conn->body.request" + - Handle garbage helper responses better in concurrent protocol format + - Fix kqueue when overflowing the changes queue + - Make sure the child worker process commits suicide if it could + not start up + - Don't log short responses at debug level 1 + - Fix bswap16 & bwsap32 error on NetBSD + - Fix collapsed_forwarding for non-GET requests + +Changes to squid-2.6.STABLE10 (4 Mar 2007) + + - Upgrade HTTP/0.9 responses to our HTTP version (HTTP/1.0) + - various diskd bugfixes + - In the access.log hierarchy field log the unique peer name + instead of the host name + - unlinkdClose() should be called after (not before) storeDirSync() + - CLEAN_BUF_SZ was defined, but never used anywhere + - logging HTTP-request size + - Fix icmp pinger communication on FreeBSD and other not supporing + large dgram AF_UNIX sockets + - Release objects on swapin failure + - Bug #1787: Objects stuck in cache if origin server clock in future + - Bug #1420: 302 responses with an Expires header is always cached + - Primitive support for HTTP/1.1 chunked encoding, working around + broken servers + - Clean up relations between TCP probing and DNS checks of peers with + no known addresses. + - Fix a minor HTML coding error in ftp directory listings with // in + the path + - Bug #1875, #1420. Cleanup of refresh logics when dealing with + non-refreshable content + - Gopher cleanups and bugfixes + - Negotiate authentication fixed again. Broken since STABLE7 by the + patch for Bug #1792. + - Bug #1892: COSS tries to shut down the same directory twice on exit + - Bug #1908: store*DirRebuildFromSwapLog() ignores some SWAP_LOG_DEL + entries + - Added support for Subversion HTTP request methods MKACTIVITY, + CHECKOUT and MERGE. + +Changes to squid-2.6.STABLE9 (24 Jan 2007) + + - Bug #1878: If-Modified-Since broken in 2.6.STABLE8 + - Bug #1877 diskd bug in storeDiskdIOCallback() + +Changes to squid-2.6.STABLE8 (21 Jan 2007) + + - Bug #1873: authenticateNTLMFixErrorHeader: state 4. + - Document the https_port vhost option, useful in combination with + a wildcard certificate + - Document the existence of connection pinning / forwarding of NTLM + auth and a few other features overlooked in the release notes. + - Spelling correction of the ssl cache_peer option + - Add back the optional "accel" http_port option. Makes accelerator + mode configurations easier to read. + - Bug #1872: Date parsing error causing objects to get unexpectedly + cached. + - Cleanup to have the access.log tags autogenerated from enums.h + - Bug #1783: STALE: Entry's timestamp greater than check time. Clock + going backwards? + - Don't update object timestamps on a failed revalidation. + - Fix how ftp://user@host URLs is rendered when Squid is built with + leak checking enabled + +Changes to squid-2.6.STABLE7 (13 Jan 2007) + + - Windows port: Fix intermittent build error using Visual Studio + - Add missing tproxy info from the dump of http port configuration + - Bug #1853: Support for ARP ACL on NetBSD + - clientNatLookup(): fix wrong function name in debug messages + - Convert ncsa_auth man page from DOS to Unix text format. + - Bug #1858: digest_ldap_auth had some remains of old hash format + - Correct the select_loops counter when using select(). Was counted twice + - Clarify the http_port vhost option a bit + - Fix cache-control: max-stale without value or bad value + - Bug #1857: Segmentation fault on certain types of ftp:// requests + - Bug #1848: external_acl crashes with an infinite loop under high load + - Bug #1792: max_user_ip not working with NTLM authentication + - Bug #1865: deny_info redirection with authentication related acls + - Small example on how to use the squid_session helper + - Bug #1863: cache_peer monitorurl, monitorsize and monitorinterval not working properly + - Clarify the transparent http_port option a bit more + - Bug #1828: squid.conf docutemtation error for proxy_auth digest + - Bug #1867: squid.pid isn't removed on shutdown + +Changes to squid-2.6.STABLE6 (12 Dec 2006) + + - Bug #1817: Assertion failure assert(buflen >= copy_sz) in htcp.c htcpBuildAuth() + - Add client source port logformat tag >p + - Cleanup of transparent & accelerator mode request parsing to untangle the firewall dependencies a bit + - Bug #1799: Harmless 1 byte buffer overflow on long host names in /etc/hosts + - automake no longer recommends mkinstalldirs. Removed. + - Only use crypt() if it's available, allowing ncsa_auth to be built + on platofms without crypt() support. + - Windows port documentation updates + - Bug #1818: Assertion failure assert(e->swap_dirn >= 0) in fs/coss/store_dir_coss.c storeCoss_DeleteStoreEntry + - Bug #1117: assertion failed: aufs/store_dir_aufs.c:642: "rb->flags.need_to_validate" + - Remove extra newline in redirect message sent by deny_info http://... aclname + - Bug #1805: assertion failed: StatHist.c:195: "D[i] >= 0" + - Clarify the external_acl_type helper format specification and some defaults + - Add support for the weight= parameter to round-robin peers + - Bug #1832: Error building squid-2.6.STABLE5 using --enable-truncate + - Convert snmpDebugOid to use a temporary String object instead of strcat + - Document that proxy_auth also accepts -i for case-insensitive operation + - Remove malloc/free of temporary buffer in time parsing routines. + - Reduce memory allocator pressure by not continually allocating client-side read buffers + - Accept large dates >2^31 on 64-bit platformst. Seen for example in the Google logo. + - Convert the connStateData->chr single link list to a normal dlink_list for clarity. + - Bug #1584: Unable to register with multiple WCCP2 routers + - Fix the WCCPv2 mask assignment code to not crash as the value assignments are built. + - Bug #439: Multicast ICP peering is unstable and considers most peers dead + - Bug #1801: NTLM authentication ends up in a loop if the server responds with a retriable error + - Bug #1839: Cosmetic debug message cleanup in peerHandleHtcpReply. + - Bug #1840: Disable digest and netdb queries to multicast peers + - Bug #1641: assertion failed: stmem.c:149: "size > 0" while processing certain Vary objects + - Fix build errors when using latest MinGW Windows environment + +Changes to squid-2.6.STABLE5 (3 Now 2006) + + - Bug #1776: 2.6.STABLE4 aufs fails to compile if coss isn't enabled + - COSS improvements and cleanups + - SNMP linking issue resolved, enabling SNMP support to be build in all platforms + - Bug #1784: access_log syslog results in blanks syslog lines between every entry + - Bug #1719: Incorrect error message on invalid cache_peer specifications + - Bug #1785: Memory leak in handling of negatively cached objects + - Bug #1780: Incorrect Vary processing in combination with collapsed_forwarding + - Bug #1782: Memory leak in ncsa_auth on password changes + - Suppress some annoying coss startup messages raising the debug level to 2. + - Clarify the external_acl_helper concurrency= change. + - aioDone() could be called twice from aufs and from coss (when using AIOPS) during shutdown. + - Bug #1794: Accept 00:00-24:00 as a valid time specification even if redundand and the same as 00:00-23:59 + - Bug #1795: Theoretical memory leak in storeSetPublicKey + - Removing port 563 from the default SSL_ports and Safe_ports ACLs + - Bug #1724: Automatically enable Linux Netfilter support with --enable-linux-tproxy. + - Bug #1800: squid -k reconfigure crash when using req/rep_header acls + - Clarify the select/poll/kqueue/epoll configure --enable/disable options + - Bug #1779: Delay pools fairness when multiple connections compete for bandwidth + - Bug #1802: Crash on exit in certain conditions where cache.log is not writeable + - Bug #1796: Assertion error HttpHeader.c:914: "str" + - Bug #1790: Crash on wccp2 + mask assignement + standard wccp service + - Silence harmless gcc compile warning. + - Clean up poll memory on shutdown + - Ported select, poll and win32 to new comm event framework + - Windows port: Correctly identify Windows Vista and Windows Server Longhorn + - Added a basic comm_select_simple comm loop only requiring minimal POSIX compliance. + - Safeguard from kb_t counter overflows on 32-bit platforms + +Changes to squid-2.6.STABLE4 (23 Sep 2006) + + - Bug #1736: Missing Italian translation of ERR_TOO_BIG error page + - Windows port enhancement: added native exception handler with signal emulation + - Fix the %un log_format tag again. Got broken in 2.6.STABLE2 + - Fix Squid crash when using %a in ERR_INVALID_REQ and ERR_INVALID_URL error messages. + - Bug #212: variable %i always 0.0.0.0 in many error pages + - Bug #1708: Ports in ACL accepts characters and out of range + - Bug #1706: Squid time acl accepts invalid time range. + - Fix another harmless fake_auth compiler warning on gcc 4.1.1 x86 + - Fix an harmless snmp_core.c compiler warning on gcc 4.1.1 x86 + - Bug #1744: squid-2.6.STABLE3 - fakeauth_auth crashing on certain requests + - Bug #1746: Harmless off by one overrun in ncsa_auth md5 password validation + - Bug #1598: start_announce cannot be disabled + - Periodically flush cache.log to disk when "buffered_logs on" is set + - Numerous COSS improvements and fixes + - Windows port: merge of MinGW support + - Windows port: Merged Windows threads support into aufs + - Bug #1759: Windows port cachemgr.cgi attempts to write to file system root directory + - Numerous portability fixes + - Various minor statistics cleanup on 64-bit hosts with more than 4GB of memory + - Bug #1758: HEAD on ftp:// URLs always returned 200 OK. + - Bug #1760: FTP related memory leak + - Bug #1770: WCCP2 weighted assignment + - Bug #1768: Redundant DNS PTR lookups + - Bug #1696: Add support for wccpv2 mask assignment + - Bug #1774: ncsa_auth support for cramfs timestamps + - Bug #1769: near-hit and filedescriptor usage missing in SNMP MIB + - Bug #1725: cache_peer login=PASS documentation somewhat confusing + - Bug #1590: Silence those ETag loop warnings + - Bug #1740: Squid crashes on certain malformed HTTP responses + - Bug #1699: assertion failed: authenticate.c:836: "auth_user_request != NULL" + - Improve error reporting on unexpected CONNECT requests in accelerator mode + - Cosmetic change to increase cache.log detail level on invalid requests + - Bug #1229: http_port and other directives accept invalid ports + - Reject http_port specifications using both transparent and accelerator options + - Cosmetic cleanup to not dump stacktraces on configuration errors + + +Changes to squid-2.6.STABLE3 (18 Aug 2006) + + - Bug #1577: assertion failed "fm->max_n_files <= (1 << 24)" on + very large cache_dir. Limit number of objects stored to slightly + less to avoid this. + - Bug #1705: Correct error message on invalid time weekday specification + - Don't attempt to guess netmask in src/dst acl specifications + if none was provided. Assume it's an IP even if it ends in 0 + - Bug #1665: log_format %ue, %us tags for external or ssl user id + - Bug #1707: delay pools often ignored the set limit + - Bug #1716: Support for recent OpenSSL 0.9.7 versions + (0.9.8 always worked) + - COSS fixes and performance improvements + - Memory leak when reading configuration files with overlapping + ACL data where squid -k parse complains. + - Memory leak related to pinned connections + - Show include acls unexpanded in cachemgr configuration dumps + - Fixed WARNING defer handler for HTTP Socket does not call commDeferFD + - Bug #1304: Downloads may hang when using the cache_dir max-size option + - Optimization of network I/O + - Bug #1730: make problem with --enable-follow-x-forwarded-for on Solaris + - Fixed a memory leak on certain invalid requests + - Bug #1733: ERR_CANNOT_FORWARD Portuguese translation update + - Bug #582: ntlm fake_auth not handles non-ascii login names + - New startup message indicating the type of event loop used + - Bug #1602: TCP fallback on truncated DNS responses + - Bug #1667: assertion failed: store.c:1081: "e->store_status == STORE_PENDING" + - Bug #1723: cachemgr now works in accelerator mode + +Changes to squid-2.6.STABLE2 (31 Jul 2006) + + - WCCP2 doesn't update statCounter.syscalls.sock.sendtos counter. + - Releasenotes Table of contents should use relative links without + filename. + - Reject HTTP/0.9 formatted CONNECT requests. + - Cosmetic cleanup to use safe_free instead of xfree + manual + assign to NULL + - Bug #1650: transparent interception "Unable to forward this + request at this time" + - Bug #1658: Memory corruption when using client-side SSL certificates + - Add storeRecycle; a storeIO method to delete a StoreEntry w/out + deleting the underlying object. + - Many COSS fixes and new coss data dumper utility for diagnostics + - Bug #1669: SEGV in storeAddVaryReadOld + - Many fixes in debug sections and spelling of debug messages + - Don't keep client connection persistent if there was a mismatch in + the response size. + - Move eventCleanup debug messages to debug level 2 (was 0) + - Add the missing concurrency parameters to basic and digest auth + schemes + - Bug #1670: assertion failure: i->prefix_size > 0 in client_side.c:2509 + - Log SSL user id in the custom log User name format (%un) + - Bug #1653: Username info not logged into Cachemgr active_requests + statistics + - Added to the redirectors interface the support for SSL client + certificate + - squid.conf.default cleanup to remove references to old options + - Fix many filedescriptors in combination with TPROXY + - Fix connection pinning in transparently intercepted connections + - Bug #1679: LDFLAGS not honored in some programs. + - Minor cleanup of port numbers in transparent interception or + vhost + vport + - Bug #1671: transparent interception fails with FreeBSD ipfw or + Linux-2.2 ipchains + - Bug #1660: Accept-Encoding related memory corruption + - Bug #1651: Odd results if url_rewriter defined multiple times + - Bug #1655: Squid does not produce coredumps under linux when + started as root + - Bug #1673: cache digests not served to other caches + - Cleanup of Linux capability code used by tproxy + - Bug #1684: xstrdup: tried to dup a NULL pointer! + - Bug #1668: unchecked vsnprintf() return code could lead to log + corruption + - Bug #1688: Assertion failure in HttpHeader.c in some header_access + configurations + - Cygwin support fir --disable-internal-dns + - Silence those annoying sslReadServer: Connection reset by peer + errors. + - Bug #1693: persistent connections broken in transparent + interception mode + - Bug #1691: multicast peering issues + - Bug #1696: Correct WCCP2 processing of router capability info + segments + - Bug #1694: Assertion failure in mgr:config if using + access_log_format %2GB (Bug #437) + - [Cosmetic] Segmentation fault on empty proxy_auth ACLs (Bug #1414) + - [Minor] Ident access lists don't work in delay_access statements + (Bug #1428) + - [Minor] Some clients support NTLM even if not initially negotiating + persistent connections (Bug #1447) + - [Medium] 504 Gateway Time-out on FTP uploads (Bug #1459) + - [Medium] delay pools given too much bandwidht after "-k reconfigure" + (Bug #1481) + - [Cosmetic] New persistent_connection_after_error configuration + directive (Bug #1482) + - [Cosmetic] Hangs at 100% CPU if /dev/null is not accessible (Bug + #1484) + - [Minor] Fails to compile on Fedora Core 5 test 2 x86_64 (Bug #1492) + - [Cosmetic] Typo in ftp.c (Bug #1507) + - [Cosmetic] Error in FTP listings of files with -> in their name + (Bug #1508) + - [Cosmetic] With Squid-2.5 there is no more the DUPLICATE IP logging + in cache.log (Bug #779) + - [Minor] Fails to process long host names (Bug #1434) + - [Cosmetic] Azerbaijani errors translation (Bug #1454) + - [Cosmetic] misleading error message message for bad/unresolveable + cache_peer name (Bug #1504) + - [Cosmetic] confusing statistics on stateful helpers (NTLM auth) + (Bug #1506) + - [Major] connstate memory leak (Bug #1522) + +Changes to squid-2.5.STABLE12 (22 Oct 2005) + + - [Major] Error introduced in 2.5.STABLE11 causing truncated responses + when using delay pools (Bug #1405) + - [Cosmetic] Document that tcp_outgoing_* works badly in combination + with server_persistent_connections (Bug #454) + - [Cosmetic] Add additinal tracing to squid_ldap_auth making + diagnostics easier on squid_ldap_auth configuration errors + (Bug #1395) + - [Minor] $HOME not set when started as root (Bug #1401) + - [Minor] httpd_accel_single_host breaks in combination with + server_persistent_connections (Bug #1402) + - [Cosmetic] Setting CACHE_HTTP_PORT to configure was only partially + implemented, effectively ignored. (Bug #1403) + - [Minor] CNAME based DNS addresses could get cached for longer + than intended (Bug #1404) + - [Minor] Incorrect handling of squid-internal-dynamic/netdb exchanges + in transparently intercepting proxies (Bug #1410). + - [Minor] Cache revalidations on HEAD requests causing poor cache + hit ratio (Bug #1411). + - [Minor] Not possible to send 302 redirects via a redirector in + response to CONNECT requests (bug #1412) + - [Minor] Incorrect handling of Set-Cookie on cache refreshes (Bug + #1419) + - [Major] Segmentation fault crash in rfc1738_do_escape (Bug #1426) + - [Minor] Delay pools class 3 fails on clients in network 255 + (Bug #1431) + +Changes to squid-2.5.STABLE11 (22 Sep 2005) + + - [Minor] Workaround for servers sending double content-length headers + (Bug #1305) + - [Cosmetic] Updated Spanish error messages by Nicolas Ruiz + - [Cosmetic] Date header corrected on internal objects (icons etc) + (Bug #1275) + - [Minor] squid -k fails in combination with chroot after patch for + bug 1157 (Bug #1307) + - [Cosmetic] Segmentation fault if compiled with + --enable-ipf-transparent but denied access to the NAT device. + (Bug #1313) + - [Minor] httpd_accel_signle_host incompatible with redireection + (Bug #1314) + - [Minor] squid -k reconfigure internal corruption if the type of + a cache_dir is changed (Bug #1308) + - [Minor] SNMP GETNEXT fails if the given OID is outside the Squid MIB + (Bug #1317) + - [Minor] Title in FTP listings somewhat messed up after previous + patch for bug 1220 (Bug #1220) + - [Minor] FTP listings uses "BASE HREF" much more than it needs to, + confusing authentication. (Bug #1204) + - [Minor] winfo_group.pl only looked for the first group if multiple + groups were defined in the same acl. (Bug #1333) + - [Cosmetic] Compiler warnings on some 64-bit platforms (Bug #1316) + - [Cosmetic] Removed some debug output from wb_ntlm_atuh (Bug #518) + - [Cosmetic] The new --with-build-environment=... option doesn't work + - [Cosmetic] New 'mail_program' configuration option in squid.conf + - [Minor] Fails to compile with ip-filter and ARP support on Solaris + x86 (Bug #199) + - [Major] Segmentation fault in sslConnectTimeout (Bug #1355) + - [Medium] assertion failed in StatHist.c:93 (Bug #1325) + - [Minor] More chroot_dir and squid -k reconfigure issues (Bug #1331) + - [Cosmetic] Invalid URLs in error messages when failing to connect + to peer, and a few other inconsistent error messages (Bug #1342) + - [Cosmetic] Fails to compile with glibc -D_FORTIFY_SOURCE=2 + (Bug #1344) + - [Minor] Some odd FTP servers respond with 250 where 226 is expected + (Bug #1348) + - [Cosmetic] Greek translation of error messages (Bug #1351) + - [Major] Assertion failed store_status == STORE_PENDING (Bug #1368) + - [Minor] squid_ldap_auth -U does not work (Bug #1370) + - [Minor] SNMP cacheClientTable fails on "long" IP addresses + (Bug #1375) + - [Minor] Solaris Sparc + IP-Filter compile error (Bug #1374) + - [Minor] E-mail sent when cache dies is blocked from many antispam + rules (Bug #1380) + - [Minor] LDAP helpers does not work with TLS (-Z option) (Bug #1389) + - [Cosmetic] Incorrect store dir selection debug message on objects + larger than 2Gigabyte (Bug #1343) + - [Cosmetic] header_id enum misused as an signed integer (Bug #1343) + - [Cosmetic] Allow leaving core dumps when started as root (Bug #1335) + - [Medium] Clients could bypass delay_pool settings by faking a cache + hit request (Bug #500) + - [Minor] IP-Filter 4.X support (Bug #1378) + - [Medium] Odd results on pipelined CONNECT requests + - [Major] Squid crashing with "FATAL: Incorrect scheme in auth header" + when using NTLM authentication. + - [Cosmetic] Odd results when pipeline_prefetch is combined with NTLM + authentication (bug #1396) + - [Minor] invalid host was processed as IP 255.255.255.255 in dst acl + (Bug #1394) + - [Cosmetic] New --with-maxfd=N configure option to override build + time filedescriptor limit test + - [Minor] Added support for Windows code name "Longhorn" on Cygwin. + +Changes to squid-2.5.STABLE10 (17 May 2005) + + - [Minor Security] Fix race condition in relation to old Netscape + Set-Cookie specifications + - [Minor] Fails to parse D.J. Bernstein's FTP EPLF ftp listing + format and PASV resposes (Bug #1252) + - [Medium] BASE HREF missing on ftp directory URLs without / + (Bug #1253) + - [Minor security] confusing http_access results on configuration + error (Bug #1255) + - [Cosmetic] More robust Date parser (Bug #321) + - [Minor] reload_with_ims fails to refresh negatively cached objects + (Bug #1159) + - [Cosmetic] delay_access description clarification (Bug #1245) + - [Cosmetic] Check for integer overflow in size specifications in + squid.conf (Bug #1247) + - [Cosmetic] bzero is a non-standard function not available on all + platforms (Bug #1256) + - [Cosmetic] Compiler warnings if pid_t is not an int (Bug #1257) + - [Cosmetic] Incorrect use of ctype functions (Bug #1259) + - [Cosmetic] Defer digest fetch if the peer is not allowed to be used + (Bug #1261) + - [Minor] Duplicate content-length headers logged incorrectly or + not cleaned up properly (Bug #1262) + - [Cosmetic] Extend relaxed_header_parser to work around "excess + data from" errors from many major web servers. (Bug #1265) + - [Minor] Add HTTP headers to a netdb error messages + - [Minor] Multiple minor aufs issues (Bug #671) + - [Minor] Basic authentication fails with very long logins or + password (Bug #1171) + - [Minor] CONNECT requests truncated if client side disconnects first + (Bug #1269) + - [Minor] --disable-hostname-checks configure option did not work + - [Cosmetic] LDAP helpers adjusted to compile with SUN LDAP SDK + - [Cosmetic] aufs warning about open event filedescriptors on shutdown + - [Medium] Failed to process requests for files larger than 2GB in size + - [Cosmetic] rename() related cleanup + - [Cosmetic] New cachemgr pending_objects and client_objects actions + - [Cosmetic] external acls requiring authentication did not request + new credentials on access denials like proxy_auth does. + - [Cosmetic] Syslog facility now configurable via command line options. + - [Cosmetic] New %a error page template code expanding into the + authenticated user name. (Bug #798) + - [Minor] IP-Filter 4.0 support in --enable-ipf-transparent + - [Minor] Support interception of multiple ports + - [Cosmetic] Allow "squid -k ..." to run even if the local hostname + can not be determined (Bug #1196) + - [Cosmetic] Configuration file parser now handles DOS/Windows formatted + configuration files with CRLF lineendings proper. + - [Minor] Unrecognized Cache-Control directives now forwarded properly + (Bug #414) + - [Minor] Authentication helpers now returns useable information + in the %m error page macro on failed authentication (Bug #1223) + - [Minor] pid file management corrected in chroot use (Bug #1157) + - [Minor Security] Fix for CVE-1999-0710: cachemgr malicouse use. + cachemgr.cgi now reads a config file telling which proxy servers + it can administer. + - [Minor] aufs statistics improvements + - [Minor] SNMP bugfixes and support for SNMPv2(c) (Bug #1288, #1299) + - [Minor] ARP acl documentation and cachemgr config dump corrections + - [Minor] dstdomain/dstdom_regex acls now allow matching of numeric + hostnames in addition to the reverse lookup of the domain name. + - [Security] Internal DNS client hardened against spoofing + +Changes to squid-2.5.STABLE9 (24 Feb 2005) + + - [Medium] Don't retry requests on 403 errors (Bug #1210) + - [Minor] Ignore invalid FQDN DNS responses (Bug #1222) + - [Minor] cache_peer related memory leaks on reconfigure (Bug #1246) + - [Cosmetic] Adjusted to build cleanly with GCC-4 (Bug #1211) + - [Minor] relaxed_header_parser extended to work around even more + broken web servers (Bug #1242) + - [Minor] FTP gatewaying URLs cleaned up slightly, mainly to work + better with Mozilla but also to improve security slightly on + non-anonymous FTP. + - [Minor] High characters allowed un-encoded in FTP and Gopher + listings to allow the user-agent to display data in non-iso8859-1 + charsets. (Bug #1220) + - [Cosmetic] format fixes to silence compiler warnings on many + platforms. + - [Major] Assertion failures on certain odd DNS responses (Bug #1234) + +Changes to squid-2.5.STABLE8 (11 Feb 2005) - [Minor] 100% CPU usage on half-closed PUT/POST requests (Bug #354, #1096) - [Cosmetic] Document -v (protocol version) option to LDAP helpers - [Minor] The new req_header and resp_header acls segfaults - immediately on parse of squid.conf + immediately on parse of squid.conf (Bug #961) - [Minor] Failure to shut down busy helpers on -k rotate/reconfigure (Bug #1118) - [Minor] Don't use O_NONBLOCK on disk files. (Bug #1102) @@ -13,6 +633,7 @@ - [Minor security] Random error messages in response to malformed host name (Bug #1143) - [Minor] PURGE should not be able to delete internal objects + (Bug #1112) - [Minor] httpd_accel_port 0 (virtual) not working correctly (Bug #1121) - [Minor] cachemgr vm_objects segfault (Bug #1149) @@ -30,10 +651,10 @@ - [Minor] Internal DNS sometimes truncates host names in reverse (PTR) lookups (Bug #1136) - [Minor Security] Add sanity checks on LDAP user names (Bug #1187) - - [Security] Harden Squid agains HTTP request smuggling attacks + - [Security] Harden Squid against HTTP request smuggling attacks - [Minor] Icon URLs fails in non-anonymous FTP directory listings is short_icon_urls is on (Bug #1203) - - [Security] Harden Squid agains HTTP response splitting attacks + - [Security] Harden Squid against HTTP response splitting attacks (Bug #1200) - [Medium security] Buffer overflow in WCCP recvfrom() call (Bug #1217) @@ -44,7 +665,10 @@ - [Major] Segmentation fault on failed PUT/POST requests (Bug #1224) - [Medium] Persistent connection mismatch on failed PUT/POST request (Bug #1122) - - [Minor] WCCP easily disturbed by forged packets + - [Minor] WCCP easily disturbed by forged packets (Bug #1225) + - [Minor] Password management in ftp:// gatewaying improved (Bug #1226) + - [Major] HTTP reply data corruption in certain situations involving + reply headers split over multiple packets (Bug #1233) Changes to squid-2.5.STABLE7 (11 Oct 2004) @@ -73,7 +697,7 @@ - [Medium] Segfaults and other strange crashes when using heap policies. (Bug #1009) - [Minor] Supplementary group memberships not set (Bug #1021) - - [Cosmetic] ERR_TOO_BIG Portugese translation + - [Cosmetic] ERR_TOO_BIG Portuguese translation - [Minor] external_acl does not handle newlines (Bug #1038) - [Major] NTLM authentication denial of service when using msnt_auth or fake_auth (Bug #1045) @@ -93,7 +717,7 @@ (Bug #1074) - [Cosmetic] Limit internal send/receive buffer sizes (Bug #1075) - [Medium] New acl types to match arbitrary HTTP headers. In addition - the http_header_access & replace directivess now support arbitrary + the http_header_access & replace directives now support arbitrary headers and not only the well known ones. (Bug #961) - [Cosmetic] ncsa_auth now accepts Window formatted password files (Bug #1078) @@ -115,7 +739,7 @@ - Bug #937: NTLM assertion error "srv->flags.reserved" - Bug #935: squid_ldap_auth can be confused by the use of reserved characters - - Helper queue warnings inprecice on the number of helpers required + - Helper queue warnings imprecise on the number of helpers required - squid_ldap_auth TLS mode works correctly again - Bug #940, #305: pkg-config support for finding correct OpenSSL compile flags @@ -175,7 +799,7 @@ - Bug #812: Mozilla/Netscape plugins mime type defined (.xpi) - Bug #817: maximum_object_size too large causes squid not to cache - Bug #824: 100% CPU loop if external_acl combined with separate - authentication acl in the same http_access line + authentication acl in the same http_access line - squid_ldap_group updated to version 2.12 with support for ldaps:// (LDAPv2 over SSL) and a numer of other improvements. - Bug #799: positive_dns_ttl ignored when using internal DNS. @@ -327,7 +951,7 @@ - Bug #598: squid_ldap_auth could segfault if LDAP server is unavailable - Bug #609,#612: msntauth helper fixes in dealing with large - or non-existing allow/deny user files. + or non-existing allow/deny user files. - Bug #620: acl ident REQUIRED matches even if the ident lookup fails - Bug #432: reply_body_max_size fails with ident or proxy_auth acls and also fails to block large objects where the content-length @@ -346,7 +970,7 @@ - Bug #587: smb_auth fails on complex logins involving domain names or other odd characters - Bug #558, #587: smb_auth.pl fails on complex logins involving - domain names or other odd characters + domain names or other odd characters - Bug #643: external_acl fails with ttl=0 due to a change introduced by the patch for Bug #553 in 2.5.STABLE2. - Bug #630: minor issues in digest authantication causing random @@ -495,7 +1119,7 @@ browsers know which HTML specification the document uses. In addition to that they have a new look (background-color, font) and are valid according to the HTML standards at www.w3.org. - (Clemens Löser) + (Clemens L ser) - Login and password send to Basic auth helpers is now URL escaped to allow for spaces and other "odd" characters in logins and passwords @@ -1012,7 +1636,7 @@ - Added --heap-replacement configure option. This enables the alternative cache replacement policies, such as GDSF, and LFUDA. - - WCCP establishes and registers with the router faster. + - WCCP establishes and registers with the router faster. - Added 'maxconn' acl type to limit the number of established connections from a single client IP address. Submitted by Vadim Kolontsov. @@ -1199,7 +1823,7 @@ - Removed view-based access crontrol - Cleaned up and simplified SNMP section of squid.conf - Changed the SNMP code to use a tree stucture. - - Added objects to MIB: + - Added objects to MIB: Request Hit Ratio's Byte Hit Ratio's Number of Clients @@ -2210,7 +2834,7 @@ - Changed "-d" command line option to take debugging level as argument. Debugging equal-to or less-than the argument will be written to stderr. - - Removed unused urlClean() function from url.c. + - Removed unused urlClean() function from url.c. - Fixed a bug that allowed '?' parts of urls to be recorded in store.log. Logged urls are now "clean". - Cache Manager got new Web interface (cachemgr.cgi). New .cgi @@ -2586,7 +3210,7 @@ - Removed xmalloc() return check in uudeocde.c - Added 'ifdef' support to cf_gen.c for optional code (e.g. SNMP) - Changed 'client' program to provide easier cache manager access, - e.g.: 'client mgr:info' + e.g.: 'client mgr:info' - Fixed 'client' to send 'Connection' instead of 'Proxy-Connection' for simulated keep-alive requests. - Removed 'fd' arg from clientProcess* functions. Index: squid/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/Makefile.am,v retrieving revision 1.4.16.2 retrieving revision 1.4.16.3 diff -u -r1.4.16.2 -r1.4.16.3 --- squid/Makefile.am 10 Feb 2005 02:40:01 -0000 1.4.16.2 +++ squid/Makefile.am 30 Jun 2007 09:09:59 -0000 1.4.16.3 @@ -4,14 +4,14 @@ # AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 -DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers -SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers +DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers tools +SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers tools DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` dist-hook: - @ for subdir in include include/samba/nsswitch; do \ + @ for subdir in include; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -24,7 +24,7 @@ @if [ -f $(top_srcdir)/RELEASENOTES.html ]; then \ cp -p $(top_srcdir)/RELEASENOTES.html $(distdir)/RELEASENOTES.html; \ else \ - cp $(top_srcdir)/doc/release-notes/release-2.5.html $(distdir)/RELEASENOTES.html; \ + cp $(top_srcdir)/doc/release-notes/release-2.6.html $(distdir)/RELEASENOTES.html; \ fi EXTRA_DIST = \ @@ -37,9 +37,11 @@ QUICKSTART \ README \ SPONSORS \ - bootstrap.sh \ - include/samba/README.txt + bootstrap.sh install-pinger: chown root $(DEFAULT_PINGER) chmod 4711 $(DEFAULT_PINGER) + +distuninstallcheck_listfiles = \ + find . -name squid.conf -prune -o -name cachemgr.conf -prune -type f -print Index: squid/SPONSORS =================================================================== RCS file: /cvsroot/squid-sf//squid/SPONSORS,v retrieving revision 1.3.16.3 retrieving revision 1.3.16.4 diff -u -r1.3.16.3 -r1.3.16.4 --- squid/SPONSORS 10 Feb 2005 02:40:02 -0000 1.3.16.3 +++ squid/SPONSORS 30 Jun 2007 09:09:59 -0000 1.3.16.4 @@ -12,11 +12,9 @@ MARA Systems AB - http://www.marasystems.com/ - MARA systems is a key player in current Squid developments, - being the home of one of the core Squid developers. MARA Systems - continuously enhances Squid to meet their and their customers - demands, and takes an active role in the general development - process. + MARA systems has sponsored the bug fixing and maintentnance for + most Squid-2.5 releases, and a number of new features to be found + in Squid-3. Swell Technology - http://www.swelltech.com/ @@ -43,3 +41,12 @@ webwasher AG paid for improvements to Squid's iCAP client implementation. You can find the results of this work at http://devel.squid-cache.org/icap/ + +iiNet Ltd - http://www.iinet.net.au/ + + iiNet Ltd contributed significant development resources to + Squid during its early stages and was instrumental in its + early adoption in the local internet community. iiNet has also + recently supplied equipment to help develop and test the WCCPv2 + implementation in Squid-2.6 and Squid-3. + Index: squid/acinclude.m4 =================================================================== RCS file: /cvsroot/squid-sf//squid/acinclude.m4,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- squid/acinclude.m4 10 Feb 2005 02:40:02 -0000 1.6.2.1 +++ squid/acinclude.m4 30 Jun 2007 09:09:59 -0000 1.6.2.2 @@ -7,16 +7,11 @@ dnl (it at least makes use of , and ) dnl AC_CHECK_SIZEOF_SYSTYPE(TYPE [, CROSS-SIZE]) -AC_DEFUN(AC_CHECK_SIZEOF_SYSTYPE, -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN([ +AC_DEFUN([AC_CHECK_SIZEOF_SYSTYPE], +[ +AC_REQUIRE([AC_HEADER_STDC])dnl +AC_CHECK_SIZEOF($1, , +[ #include #if STDC_HEADERS #include @@ -31,29 +26,15 @@ #if HAVE_SYS_BITYPES_H #include #endif -int main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) return(1); - fprintf(f, "%d\n", sizeof($1)); - return(0); -} -], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl ]) +])dnl dnl AC_CHECK_SYSTYPE(TYPE, DEFAULT) -AC_DEFUN(AC_CHECK_SYSTYPE, +AC_DEFUN([AC_CHECK_SYSTYPE], [AC_REQUIRE([AC_HEADER_STDC])dnl -AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(ac_cv_type_$1, -[AC_EGREP_CPP(dnl -changequote(<<,>>)dnl -<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl -changequote([,]), [ +AC_CHECK_TYPE($1, , +[AC_DEFINE_UNQUOTED($1, $2, [Define to '$2' if not defined])], +[ /* What a mess.. many systems have added the (now standard) bit types * in their own ways, so we need to scan a wide variety of headers to * find them.. @@ -72,10 +53,5 @@ #if HAVE_SYS_BITYPES_H #include #endif -], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl -AC_MSG_RESULT($ac_cv_type_$1) -if test $ac_cv_type_$1 = no; then - AC_DEFINE($1, $2) -fi ]) - +])dnl Index: squid/bootstrap.sh =================================================================== RCS file: /cvsroot/squid-sf//squid/bootstrap.sh,v retrieving revision 1.5.8.2 retrieving revision 1.5.8.3 diff -u -r1.5.8.2 -r1.5.8.3 --- squid/bootstrap.sh 10 Feb 2005 02:40:02 -0000 1.5.8.2 +++ squid/bootstrap.sh 30 Jun 2007 09:09:59 -0000 1.5.8.3 @@ -7,9 +7,9 @@ # Autotool versions preferred. To override either edit the script # to match the versions you want to use, or set the variables on # the command line like "env acver=.. amver=... ./bootstrap.sh" - -acversions="${acver:-2.13}" -amversions="${amver:-1.5}" +acversions="${acver}" # ${acver:-2.59 2.57 2.53 2.52}" +amversions="${amver}" # ${amver:-1.9 1.8 1.7 1.6}" +SUBDIRS="" check_version() { @@ -22,6 +22,9 @@ found="NOT_FOUND" shift versions="$*" + if [ -z "$versions" ]; then + found="" + fi for version in $versions; do for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do if check_version $tool ${tool}${variant} $version; then @@ -52,17 +55,59 @@ fi } -# Make sure cfgaux exists -mkdir -p cfgaux - # Adjust paths of required autool packages amver=`find_version automake ${amversions}` acver=`find_version autoconf ${acversions}` -# Bootstrap the autotool subsystems -bootstrap aclocal$amver -bootstrap autoheader$acver -bootstrap automake$amver --foreign --add-missing -bootstrap autoconf$acver +# Set environment variable to tell automake which autoconf to use. +AUTOCONF="autoconf${acver}" ; export AUTOCONF + +echo "automake : $amver" +echo "autoconfg: $acver" + +for dir in "" $SUBDIRS; do + if [ -z "$dir" ] || [ -d $dir ]; then + if ( + echo "Bootstrapping $dir" + cd ./$dir + if [ -n "$dir" ] && [ -f bootstrap.sh ]; then + ./bootstrap.sh + elif [ ! -f $dir/configure ]; then + # Make sure cfgaux exists + mkdir -p cfgaux + + # Bootstrap the autotool subsystems + bootstrap aclocal$amver + bootstrap autoheader$acver + bootstrap automake$amver --foreign --add-missing --copy -f + bootstrap autoconf$acver --force + fi ); then + : # OK + else + exit 1 + fi + fi +done + +# Fixup autoconf recursion using --silent/--quiet option +# autoconf should inherit this option whe recursing into subdirectories +# but it currently doesn't for some reason. +if grep ac_sub_configure_args configure >/dev/null; then + if grep "ac_sub_configure_args" configure | grep quiet >/dev/null; then + : # OK + else + echo "Fixing configure recursion" + ed -s configure <<'EOS' >/dev/null || true +/ac_sub_configure_args=/ ++1 +i + # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" +. +w +EOS + fi +fi echo "Autotool bootstrapping complete." Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -u -r1.5.2.6 -r1.5.2.7 --- squid/configure.in 10 Feb 2005 02:40:02 -0000 1.5.2.6 +++ squid/configure.in 30 Jun 2007 09:09:59 -0000 1.5.2.7 @@ -1,27 +1,27 @@ dnl dnl Configuration input file for Squid dnl -dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) +dnl $Id: configure.in,v 1.5.2.7 2007/06/30 09:09:59 amosjeffries Exp $ dnl -dnl $Id: configure.in,v 1.5.2.6 2005/02/10 02:40:02 hno Exp $ dnl dnl -dnl -AC_INIT(src/main.c) -AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 2.5.STABLE8-RC4-CVS) +AC_INIT(Squid Web Proxy, 2.HEAD-CVS, http://www.squid-cache.org/bugs/, squid) +AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.5.2.6 $)dnl +AC_CONFIG_AUX_DIR(cfgaux) +AM_INIT_AUTOMAKE +AC_REVISION($Revision: 1.5.2.7 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE +PRESET_CFLAGS="$CFLAGS" +PRESET_LDFLAGS="$LDFLAGS" + dnl Set default LDFLAGS if test -z "$LDFLAGS"; then - LDFLAGS="-g" + LDFLAGS="-g" fi -PRESET_CFLAGS="$CFLAGS" - dnl Check for GNU cc AC_PROG_CC AM_PROG_CC_C_O @@ -50,14 +50,32 @@ dnl this should be expanded to a list of platform sensible support requirements. dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001 case "$host_os" in -cygwin|cygwin32) - AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, true) +mingw|mingw32|cygwin|cygwin32) + AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, true) ;; *) AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, false) ;; esac +case "$host_os" in +mingw|mingw32) + AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, true) + AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none) + CFLAGS="$CFLAGS -mthreads" + if test "$ac_cv_path_WIN32_PSAPI" = "none"; then + echo "PSAPI.DLL is recommended to run Squid on Windows Platform" + echo "Please see PSAPI.DLL section on doc/release-notes/release-2.6.html." + else + AC_DEFINE(HAVE_WIN32_PSAPI,1,[Define if you have PSAPI.DLL on Windows systems]) + LIBS="$LIBS -lpsapi" + fi + ;; +*) + AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, false) + ;; +esac + if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" fi @@ -66,12 +84,14 @@ fi dnl Substitutions -AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT) -AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT) +AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT, [What default TCP port to use for HTTP listening?]) +AC_SUBST(CACHE_HTTP_PORT) +AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT, [What default UDP port to use for ICP listening?]) +AC_SUBST(CACHE_ICP_PORT) -AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host") +AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host", [Host type from configure]) -AC_DEFINE_UNQUOTED(SQUID_CONFIGURE_OPTIONS, "$ac_configure_args") +AC_DEFINE_UNQUOTED(SQUID_CONFIGURE_OPTIONS, "$ac_configure_args", [configure command line used to configure Squid]) dnl Gerben Wierda case "$host" in @@ -83,34 +103,34 @@ dnl Set Default CFLAGS if test -z "$PRESET_CFLAGS"; then if test "$GCC" = "yes"; then - case "$host" in + case "$host" in *-sun-sunos*) - # sunos has too many warnings for this to be useful + # sunos has too many warnings for this to be useful # motorola too - ;; + ;; *m88k*-openbsd*) ;; *m88k*) # Motorola cc/ld does not like -02 but is ok on -O CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]/-O/'` ;; - *) - CFLAGS="$CFLAGS -Wall" - ;; - esac + *) + CFLAGS="-Wall $CFLAGS" + ;; + esac else case "$host" in *mips-sgi-irix6.*) # suggested by Rafael Seidl - CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \ + CFLAGS="-O3 -OPT:Olimit=0:space=OFF \ -woff 1009,1014,1110,1116,1185,1188,1204,1230,1233 \ -Wl,-woff,85,-woff,84,-woff,134 \ - -nostdinc -I/usr/include -D_BSD_SIGNALS" + -nostdinc -I/usr/include -D_BSD_SIGNALS $CFLAGS" ;; alpha-dec-osf4.*) # Mogul says DEC compilers take both -g and -O2 CFLAGS=`echo $CFLAGS | sed -e 's/-g/-g3/'` - CFLAGS="$CFLAGS -O2" + CFLAGS="-O2 $CFLAGS" ;; *) ;; @@ -121,16 +141,19 @@ dnl Set LDFLAGS if test -z "$PRESET_LDFLAGS"; then if test "$GCC" = "yes"; then - case "$host" in - *) - # nothing + case "$host" in + *mips-sgi-irix6.*) + # Silence Linker warnings 84, 85 and 134 + LDFLAGS="-Wl,-woff,85 -Wl,-woff,84 -Wl,-woff,134 $LDFLAGS" + ;; + *) + # nothing ;; - esac + esac else case "$host" in - *mips-sgi-irix6.*) - # suggested by Rafael Seidl - LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32" + *) + # nothing ;; esac fi @@ -218,7 +241,11 @@ AC_SUBST(LIB_MALLOC) AC_ARG_ENABLE(gnuregex, -[ --enable-gnuregex Compile GNUregex], +[ --enable-gnuregex Compile GNUregex. Unless you have reason to use this + option, you should not enable it. This library file + is usually only required on Windows and very old + Unix boxes which do not have their own regex library + built in.], [USE_GNUREGEX=$enableval]) dnl This is a developer only option.. developers know how to set defines @@ -227,7 +254,7 @@ dnl [ --enable-xmalloc-debug Do some simple malloc debugging], dnl [ if test "$enableval" = "yes" ; then dnl echo "Malloc debugging enabled" -dnl AC_DEFINE(XMALLOC_DEBUG) +dnl AC_DEFINE(XMALLOC_DEBUG, 1, [Define to do simple malloc debugging]) dnl fi dnl ]) @@ -238,34 +265,65 @@ dnl Detailed trace of memory allocations], dnl [ if test "$enableval" = "yes" ; then dnl echo "Malloc debug trace enabled" -dnl AC_DEFINE(XMALLOC_TRACE) -dnl AC_DEFINE(XMALLOC_DEBUG) +dnl AC_DEFINE(XMALLOC_TRACE, 1, [Define to have a detailed trace of memory allocations]) +dnl AC_DEFINE(XMALLOC_DEBUG, 1, [Define to do simple malloc debugging]) dnl fi dnl ]) +AC_ARG_WITH(valgrind-debug, +[ --with-valgrind-debug Include debug instrumentation for use with valgrind], +[ case $withval in + yes) + valgrind=1 + ;; + no) + valgrind= + ;; + *) + CPPFLAGS="$CPPFLAGS -I${enableval}/include" + valgrind=1 + ;; + esac + if test $valgrind; then + AC_DEFINE(WITH_VALGRIND, 1, [Valgrind memory debugger support]) + echo "Valgrind debug support enabled" + fi +]) + +AC_ARG_ENABLE(mempool-debug, +[ --enable-mempool-debug Include MemPool debug verifications]) +if test "$enable_mempool_debug" = yes; then + AC_DEFINE(DEBUG_MEMPOOL, 1, [MemPool debug verifications]) + echo "Mempool debug checks enabled" +fi + AC_ARG_ENABLE(xmalloc-statistics, [ --enable-xmalloc-statistics - Show malloc statistics in status page], + Show malloc statistics in status page], [ if test "$enableval" = "yes" ; then echo "Malloc statistics enabled" - AC_DEFINE(XMALLOC_STATISTICS) + AC_DEFINE(XMALLOC_STATISTICS, 1, [Define to have malloc statistics]) fi ]) +USE_CARP=1 AC_ARG_ENABLE(carp, -[ --enable-carp Enable CARP support], -[ if test "$enableval" = "yes" ; then - echo "CARP support enabled" - AC_DEFINE(USE_CARP) +[ --disable-carp Disable CARP support], +[ if test "$enableval" = "no" ; then + echo "CARP disabled" + USE_CARP=0 fi -]) +]) +if test $USE_CARP = 1; then + AC_DEFINE(USE_CARP, 1, [Cache Array Routing Protocol]) +fi AC_ARG_ENABLE(async-io, [ --enable-async-io[=N_THREADS] - Shorthand for - --with-aufs-threads=N_THREADS - --with-pthreads - --enable-storeio=ufs,aufs], + Shorthand for + --with-aufs-threads=N_THREADS + --with-pthreads + --enable-storeio=ufs,aufs], [ case $enableval in yes) with_pthreads="yes" @@ -274,7 +332,7 @@ no) ;; *) - aufs_io_threads=$enableval + aufs_io_threads=$enableval with_pthreads="yes" STORE_MODULES="ufs aufs" ;; @@ -283,8 +341,8 @@ AC_ARG_WITH(aufs-threads, [ --with-aufs-threads=N_THREADS - Tune the number of worker threads for the aufs object - store.], + Tune the number of worker threads for the aufs object + store.], [ case $withval in [[0-9]]*) aufs_io_threads=$withval @@ -297,7 +355,7 @@ ]) if test "$aufs_io_threads"; then echo "With $aufs_io_threads aufs threads" - AC_DEFINE_UNQUOTED(AUFS_IO_THREADS,$aufs_io_threads) + AC_DEFINE_UNQUOTED(AUFS_IO_THREADS, $aufs_io_threads, [Defines how many threads aufs uses for I/O]) fi AC_ARG_WITH(pthreads, @@ -319,22 +377,29 @@ fi AC_ARG_ENABLE(storeio, -[ --enable-storeio=\"list of modules\" - Build support for the list of store I/O modules. - The default is only to build the "ufs" module. - See src/fs for a list of available modules, or - Programmers Guide section - for details on how to build your custom store module], +[ --enable-storeio="list of modules" + Build support for the list of store I/O modules. + The default is only to build the "ufs" module. + See src/fs for a list of available modules, or + Programmers Guide section + for details on how to build your custom store module], [ case $enableval in yes) for module in $srcdir/src/fs/*; do - if test -f $module/Makefile.in; then - STORE_MODULES="$STORE_MODULES `basename $module`" - fi + name="`basename $module`" + case $name in + CVS) # Ignore + ;; + *) + if test -d $module; then + STORE_MODULES="$STORE_MODULES $name" + fi + ;; + esac done - ;; + ;; no) - ;; + ;; *) STORE_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" ;; esac @@ -344,25 +409,36 @@ fi ]) echo "Store modules built: $STORE_MODULES" +NEED_DISKD=0 +USE_AIOPS_WIN32=0 +NEED_COSSDUMP=0 STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" AC_SUBST(STORE_OBJS) STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" AC_SUBST(STORE_LIBS) -dnl remove all but diskd - its the only module that needs to recurse -dnl into the sub directory +dnl some store implementations need additional stuff built like diskd_daemon STORE_MODULE_SUBDIRS= for fs in $STORE_MODULES none; do case "$fs" in diskd) - STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs" + NEED_DISKD=1 ;; aufs) if test -z "$with_pthreads"; then - echo "aufs store used, pthreads support automatically enabled" - with_pthreads=yes + case "$host_os" in + mingw|mingw32) + USE_AIOPS_WIN32=1 + echo "aufs store used, Windows threads support automatically enabled" + ;; + *) + echo "aufs store used, pthreads support automatically enabled" + with_pthreads=yes + ;; + esac fi ;; coss) + NEED_COSSDUMP=1 if test -z "$with_aio"; then echo "coss store used, aio support automatically enabled" with_aio=yes @@ -371,12 +447,14 @@ esac done AC_SUBST(STORE_MODULES) -AC_SUBST(STORE_MODULE_SUBDIRS) +AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1]) +AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1]) +AM_CONDITIONAL([NEED_COSSDUMP], [test "$NEED_COSSDUMP" = 1]) dnl --enable-heap-replacement compatibility option AC_ARG_ENABLE(heap-replacement, [ --enable-heap-replacement - Backwards compatibility option. Please use the + Backwards compatibility option. Please use the new --enable-removal-policies directive instead.], [ if test "$enableval" = "yes" ; then echo "--enable-heap-replacement is obsolete. please use the new" @@ -387,22 +465,29 @@ ]) AC_ARG_ENABLE(removal-policies, -[ --enable-removal-policies=\"list of policies\" - Build support for the list of removal policies. - The default is only to build the "lru" module. - See src/repl for a list of available modules, or - Programmers Guide section 9.9 for details on how +[ --enable-removal-policies="list of policies" + Build support for the list of removal policies. + The default is only to build the "lru" module. + See src/repl for a list of available modules, or + Programmers Guide section 9.9 for details on how to build your custom policy], [ case $enableval in yes) for module in $srcdir/src/repl/*; do - if test -f $module/Makefile.in; then - REPL_POLICIES="$REPL_POLICIES `basename $module`" - fi + name="`basename $module`" + case $name in + CVS) # Ignore + ;; + *) + if test -d $module; then + REPL_POLICIES="$REPL_POLICIES $name" + fi + ;; + esac done - ;; + ;; no) - ;; + ;; *) REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" ;; esac @@ -423,7 +508,14 @@ [ --enable-icmp Enable ICMP pinging], [ if test "$enableval" = "yes" ; then echo "ICMP enabled" - AC_DEFINE(USE_ICMP) + AC_DEFINE(USE_ICMP, 1, [If you want to use Squid's ICMP features (highly recommended!) then + define this. When USE_ICMP is defined, Squid will send ICMP pings + to origin server sites. This information is used in numerous ways: + - Sent in ICP replies so neighbor caches know how close + you are to the source. + - For finding the closest instance of a URN. + - With the 'test_reachability' option. Squid will return + ICP_OP_MISS_NOFETCH for sites which it cannot ping.]) AM_CONDITIONAL(ENABLE_PINGER, true) fi ]) @@ -433,7 +525,7 @@ [ --enable-delay-pools Enable delay pools to limit bandwidth usage], [ if test "$enableval" = "yes" ; then echo "Delay pools enabled" - AC_DEFINE(DELAY_POOLS) + AC_DEFINE(DELAY_POOLS, 1, [Traffic management via "delay pools".]) AM_CONDITIONAL(USE_DELAY_POOLS, true) fi ]) @@ -444,7 +536,7 @@ dnl [ --enable-mem-gen-trace Do trace of memory stuff], dnl [ if test "$enableval" = "yes" ; then dnl echo "Memory trace (to file) enabled" -dnl AC_DEFINE(MEM_GEN_TRACE) +dnl AC_DEFINE(MEM_GEN_TRACE, 1, [Define for log file trace of mem alloc/free]) dnl fi dnl ]) @@ -452,7 +544,8 @@ [ --enable-useragent-log Enable logging of User-Agent header], [ if test "$enableval" = "yes" ; then echo "User-Agent logging enabled" - AC_DEFINE(USE_USERAGENT_LOG) + AC_DEFINE(USE_USERAGENT_LOG, 1, [If you want to log User-Agent request header values, define this. + By default, they are written to useragent.log in the Squid log directory.]) fi ]) @@ -460,36 +553,69 @@ [ --enable-referer-log Enable logging of Referer header], [ if test "$enableval" = "yes" ; then echo "Referer logging enabled" - AC_DEFINE(USE_REFERER_LOG) + AC_DEFINE(USE_REFERER_LOG, 1, [If you want to log Referer request header values, define this. + By default, they are written to referer.log in the Squid log directory.]) fi ]) +USE_WCCP=1 AC_ARG_ENABLE(wccp, -[ --disable-wccp Disable Web Cache Coordination Protocol], +[ --disable-wccp Disable Web Cache Coordination V1 Protocol], [ if test "$enableval" = "no" ; then - echo "Web Cache Coordination Protocol disabled" - AC_DEFINE(USE_WCCP, 0) - else - AC_DEFINE(USE_WCCP, 1) + echo "Web Cache Coordination V1 Protocol disabled" + USE_WCCP=0 fi ]) +if test $USE_WCCP = 1; then + AC_DEFINE(USE_WCCP, 1, [Define to enable WCCP]) +fi + +USE_WCCPv2=1 +AC_ARG_ENABLE(wccpv2, +[ --disable-wccpv2 Disable Web Cache Coordination V2 Protocol], +[ if test "$enableval" = "no" ; then + echo "Web Cache Coordination V2 Protocol disabled" + USE_WCCPv2=0 + fi +]) +if test $USE_WCCPv2 = 1; then + AC_DEFINE(USE_WCCPv2, 1, [Define to enable WCCP V2]) +fi + AC_ARG_ENABLE(kill-parent-hack, [ --enable-kill-parent-hack - Kill parent on shutdown], + Kill parent on shutdown], [ if test "$enableval" = "yes" ; then echo "Kill parent on shutdown" - AC_DEFINE(KILL_PARENT_OPT) + AC_DEFINE(KILL_PARENT_OPT, 1, [A dangerous feature which causes Squid to kill its parent process + (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. Use with caution.]) fi ]) +AC_ARG_ENABLE(forward-log, +[ --enable-forward-log Enable experimental forward_log directive], +[ if test "$enableval" = "yes" ; then + echo "forward_log enabled" + AC_DEFINE(WIP_FWD_LOG, 1, [Define to enable experimental forward_log directive]) + fi +]) + +AC_ARG_ENABLE(multicast-miss, +[ --enable-multicast-miss Enable experimental multicast notification of cachemisses], +[ if test "$enableval" = "yes" ; then + echo "multicast of cache miss URLs enabled" + AC_DEFINE(MULTICAST_MISS_STREAM, 1, [Define to enable experimental multicast of cache miss URLs]) + fi +]) + AM_CONDITIONAL(USE_SNMP, false) AC_ARG_ENABLE(snmp, [ --enable-snmp Enable SNMP monitoring], [ if test "$enableval" = "yes" ; then echo "SNMP monitoring enabled" - AC_DEFINE(SQUID_SNMP) - SNMPLIB='-L../snmplib -lsnmp' + AC_DEFINE(SQUID_SNMP, 1, [Define to enable SNMP monitoring of Squid]) + SNMPLIB='../snmplib/libsnmp.a' AM_CONDITIONAL(USE_SNMP, true) SNMP_MAKEFILE=./snmplib/Makefile makesnmplib=snmplib @@ -498,31 +624,21 @@ AC_SUBST(SNMPLIB) AC_SUBST(makesnmplib) -dnl This do not work well.. disable for now so people do not -dnl enable it and thereby cause problems.. (tired of seeing people -dnl having enabled this, and then complaining...) -dnl -dnl AC_ARG_ENABLE(time-hack, -dnl [ --enable-time-hack Update internal timestamp only once per second], -dnl [ if test "$enableval" = "yes" ; then -dnl echo "Update internal timestamp only once per second" -dnl AC_DEFINE(ALARM_UPDATES_TIME) -dnl fi -dnl ]) - AC_ARG_ENABLE(cachemgr-hostname, [ --enable-cachemgr-hostname[=hostname] - Make cachemgr.cgi default to this host], + Make cachemgr.cgi default to this host], [ case $enableval in yes) - AC_DEFINE(CACHEMGR_HOSTNAME,[getfullhostname()]) + AC_DEFINE(CACHEMGR_HOSTNAME, [getfullhostname()], [If you are upset that the cachemgr.cgi form comes up with the hostname + field blank, then define this to getfullhostname()]) echo "Cachemgr default hostname == host where cachemgr runs" ;; no) : # Nothing to do.. ;; *) - AC_DEFINE_UNQUOTED(CACHEMGR_HOSTNAME,"${enableval}") + AC_DEFINE_UNQUOTED(CACHEMGR_HOSTNAME, "${enableval}", [If you are upset that the cachemgr.cgi form comes up with the hostname + field blank, then define this to getfullhostname()]) echo "Cachemgr default hostname set to ${enableval}" ;; esac @@ -535,16 +651,28 @@ case "$host" in *-linux-*) ;; - *-solaris-*) + *-solaris*) ;; *-freebsd*) ;; + *-netbsd*) + ;; + *-openbsd*) + ;; + *-cygwin*) + LIBS="$LIBS -liphlpapi" + ;; + *-mingw*) + LIBS="$LIBS -liphlpapi" + ;; *) echo "WARNING: ARP ACL support probably won't work on $host." sleep 10 ;; esac - AC_DEFINE(USE_ARP_ACL) + AC_DEFINE(USE_ARP_ACL, 1, [Define this to include code which lets you specify access control + elements based on ethernet hardware addresses. This code uses + functions found in 4.4 BSD derviations (e.g. FreeBSD, ?).]) fi ]) @@ -553,7 +681,7 @@ [ --enable-htcp Enable HTCP protocol], [ if test "$enableval" = "yes" ; then echo "HTCP enabled" - AC_DEFINE(USE_HTCP) + AC_DEFINE(USE_HTCP, 1, [Define this to include code for the Hypertext Cache Protocol (HTCP)]) AM_CONDITIONAL(ENABLE_HTCP, true) fi ]) @@ -567,9 +695,16 @@ [ --enable-ssl Enable ssl gatewaying support using OpenSSL], [ if test "$enableval" != "no"; then echo "SSL gatewaying using OpenSSL enabled" - AC_DEFINE(USE_SSL) + AC_DEFINE(USE_SSL, 1, [Define this to include code for SSL encryption.]) AM_CONDITIONAL(ENABLE_SSL, true) - SSLLIB='-lssl -lcrypto' + case "$host_os" in + mingw|mingw32) + SSLLIB='-lssleay32 -leay32 -lgdi32' + ;; + *) + SSLLIB='-lssl -lcrypto' + ;; + esac USE_OPENSSL=1 fi ]) @@ -578,7 +713,7 @@ AC_ARG_WITH(openssl, [ --with-openssl[=prefix] - Compile with the OpenSSL libraries. The path to + Compile with the OpenSSL libraries. The path to the OpenSSL development libraries and headers installation can be specified if outside of the system standard directories], @@ -601,7 +736,9 @@ if test -n "$USE_OPENSSL"; then echo "Using OpenSSL MD5 implementation" - AC_DEFINE(USE_OPENSSL) + AC_DEFINE(USE_OPENSSL, 1, [Define this to make use of the OpenSSL libraries for + MD5 calculation rather than Squid's own MD5 implementation + or if building with SSL encryption (USE_SSL)]) AM_CONDITIONAL(NEED_OWN_MD5, false) if test -z "$SSLLIB"; then SSLLIB="-lcrypto" # for MD5 routines @@ -618,24 +755,25 @@ [ --enable-forw-via-db Enable Forw/Via database], [ if test "$enableval" = "yes" ; then echo "FORW-VIA enabled" - AC_DEFINE(FORW_VIA_DB) + AC_DEFINE(FORW_VIA_DB, 1, [Enable Forw/Via database]) fi ]) AC_ARG_ENABLE(cache-digests, [ --enable-cache-digests Use Cache Digests - see http://www.squid-cache.org/FAQ/FAQ-16.html], + see http://www.squid-cache.org/FAQ/FAQ-16.html], [ if test "$enableval" = "yes" ; then echo "USE_CACHE_DIGESTS enabled" - AC_DEFINE(USE_CACHE_DIGESTS) + AC_DEFINE(USE_CACHE_DIGESTS, 1, [Use Cache Digests for locating objects in neighbor caches. This + code is still semi-experimental.]) fi ]) dnl Select Default Error language AC_ARG_ENABLE(default-err-language, [ --enable-default-err-language=lang - Select default language for Error pages (see - errors directory) ], + Select default language for Error pages (see + errors directory) ], [ if test -d $srcdir/errors/$enableval; then ERR_DEFAULT_LANGUAGE=$enableval @@ -649,11 +787,11 @@ dnl Select languages to be installed AC_ARG_ENABLE(err-languages, [ --enable-err-languages=\"lang1 lang2..\" - Select languages to be installed. (All will be - installed by default) ], + Select languages to be installed. (All will be + installed by default) ], [ for l in $enableval; do - if test -d $srcdir/errors/$l; then :; else + if test -d $srcdir/errors/$l; then :; else echo "ERROR! Unknown language $$l, see errors/" exit 1 fi @@ -662,8 +800,8 @@ ],[ ERR_LANGUAGES= for l in $srcdir/errors/*; do - if test -f $l/ERR_ACCESS_DENIED; then - ERR_LANGUAGES="$ERR_LANGUAGES `basename $l`" + if test -f $l/ERR_ACCESS_DENIED; then + ERR_LANGUAGES="$ERR_LANGUAGES `basename $l`" fi done ]) @@ -674,22 +812,73 @@ [ --with-coss-membuf-size COSS membuf size (default 1048576 bytes) ], [ if test "$with_coss_membuf_size"; then echo "Setting COSS membuf size to $with_coss_membuf_size bytes" - AC_DEFINE_UNQUOTED(COSS_MEMBUF_SZ, $with_coss_membuf_size) + AC_DEFINE_UNQUOTED(COSS_MEMBUF_SZ, $with_coss_membuf_size, [Define if you want to set the COSS membuf size]) fi ]) +dnl COSS I/O method +AC_ARG_ENABLE(coss-aio-ops, +[ --enable-coss-aio-ops Enable COSS I/O with Posix AIO (default is aufs I/O) ]) +if test "$enable_coss_aio_ops" = "yes"; then + echo "Using Posix AIO method for COSS disk I/O" + AC_DEFINE(USE_AUFSOPS, 0, [ Define this if you would like to use the aufs I/O method for + disk I/O instead of the POSIX AIO method.]) +else + AC_DEFINE(USE_AUFSOPS, 1, [ Define this if you would like to use the aufs I/O method for + disk I/O instead of the POSIX AIO method.]) +fi + +dnl Enable select() +AC_ARG_ENABLE(select, +[ --enable-select Force the use of select support. + Normally configure automatically selects a better + alternative if available. + --disable-select Disable select support, causing configure to fail + if a better alternative is not available], + +[ + case "$enableval" in + yes) + echo "Forcing select() to be enabled" + SELECT_TYPE="select" + ac_cv_func_select='yes' + ;; + no) + echo "Forcing select() to be disabled" + ac_cv_func_select='no' + ;; + esac +]) + +dnl Enable select() +AC_ARG_ENABLE(select-simple, +[ --enable-select-simple Force the use of select support (POSIX). + Useful if your system only supports the bare minium + POSIX select requirements without fds_bits.], +[ + case "$enableval" in + yes) + echo "Forcing select() to be enabled in simple POSIX mode" + SELECT_TYPE="select_simple" + ac_cv_func_select='yes' + ;; + no) + echo "Forcing select() to be disabled" + ac_cv_func_select='no' + ;; + esac +]) + dnl Enable poll() AC_ARG_ENABLE(poll, -[ --enable-poll Enable poll() instead of select(). Normally poll - is preferred over select, but configure knows poll - is broken on some platforms. If you think you are - smarter than the configure script, you may enable - poll with this option. - --disable-poll Disable the use of poll().], +[ --enable-poll Force the use of poll even if automatic checks + indicate poll may be broken on your plaform. + --disable-poll Disable the use of poll.], [ case "$enableval" in yes) echo "Forcing poll() to be enabled" + SELECT_TYPE="poll" ac_cv_func_poll='yes' ;; no) @@ -699,217 +888,397 @@ esac ]) +dnl Enable epoll() +AC_ARG_ENABLE(epoll, +[ --enable-epoll Force the use of epoll even if automatic checks + indicate epoll may not be supported. + --disable-epoll Disable the use of epoll.], +[ + case "$enableval" in + yes) + echo "Forcing epoll() to be enabled" + SELECT_TYPE="epoll" + force_epoll='yes' + ;; + no) + echo "Forcing epoll() to be disabled" + ac_cv_func_epoll_ctl='no' + ;; + esac +]) + +dnl Enable kqueue +AC_ARG_ENABLE(kqueue, +[ --enable-kqueue Force the use of kqueue even if automatic checks + indicate kqueue may not be supported. + --disable-kqueue Disable kqueue support. ], + +[ + case "$enableval" in + yes) + echo "Forcing kqueue to be enabled" + SELECT_TYPE="kqueue" + ac_cv_func_kqueue='yes' + ;; + no) + echo "Forcing kqueue to be disabled" + ac_cv_func_kqueue='no' + ;; + esac +]) + +dnl Enable devpoll +AC_ARG_ENABLE(devpoll, +[ --enable-devpoll Use Solaris /dev/poll instead of poll], +[ + case "$enableval" in + yes) + echo "Forcing devpoll to be enabled" + SELECT_TYPE="devpoll" + ;; + no) + echo "Forcing devpoll to be disabled" + ;; + esac +]) + + dnl Disable HTTP violations +HTTP_VIOLATIONS=1 AC_ARG_ENABLE(http-violations, [ --disable-http-violations - This allows you to remove code which is known to - violate the HTTP protocol specification.], + This allows you to remove code which is known to + violate the HTTP protocol specification.], [ if test "$enableval" = "no" ; then echo "Disabling HTTP Violations" - AC_DEFINE(HTTP_VIOLATIONS, 0) - else - AC_DEFINE(HTTP_VIOLATIONS, 1) + HTTP_VIOLATIONS=0 fi ]) +if test $HTTP_VIOLATIONS = 1; then + AC_DEFINE(HTTP_VIOLATIONS, 1, [By default (for now anyway) Squid includes options which allows the cache administrator to violate the HTTP protocol specification in terms of cache behaviour. Setting this to '0' will disable such code.]) +fi dnl Enable IP-Filter Transparent Proxy AC_ARG_ENABLE(ipf-transparent, [ --enable-ipf-transparent - Enable Transparent Proxy support for systems - using IP-Filter network address redirection.], + Enable Transparent Proxy support for systems + using IP-Filter network address redirection.], [ if test "$enableval" = "yes" ; then echo "IP-Filter Transparent Proxy enabled" - AC_DEFINE(IPF_TRANSPARENT) + AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter + address redirection. This provides "masquerading" support for non + Linux system.]) IPF_TRANSPARENT="yes" + dnl On Solaris Ipfilter includes expect that SOLARIS2 is defined with the + dnl Solaris minor version (8, 9, 10, ...) + case "$host" in + *-solaris*) + solrev=`uname -r | sh -c 'IFS=. read j n x; echo $n'` + CFLAGS="-DSOLARIS2=$solrev $CFLAGS" + ;; + *) + ;; + esac + fi ]) dnl Enable PF Transparent Proxy AC_ARG_ENABLE(pf-transparent, [ --enable-pf-transparent - Enable Transparent Proxy support for systems - using PF network address redirection.], + Enable Transparent Proxy support for systems + using PF network address redirection.], [ if test "$enableval" = "yes" ; then echo "PF Transparent Proxy enabled" - AC_DEFINE(PF_TRANSPARENT) + AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address + redirection. This provides "masquerading" support for OpenBSD.]) PF_TRANSPARENT="yes" fi ]) -dnl Enable Linux Netfilter (2.4) Transparent Proxy +dnl Enable Linux Netfilter Transparent Proxy AC_ARG_ENABLE(linux-netfilter, [ --enable-linux-netfilter - Enable Transparent Proxy support for Linux 2.4.], + Enable Transparent Proxy support for Linux 2.4 and later], [ if test "$enableval" = "yes" ; then echo "Linux-Netfilter Transparent Proxy enabled" - AC_DEFINE(LINUX_NETFILTER) + AC_DEFINE(LINUX_NETFILTER, 1, [Enable support for Transparent Proxy on Linux 2.4 and later]) LINUX_NETFILTER="yes" fi ]) +dnl Enable Large file support +buildmodel="" +needlargefiles= + +AC_ARG_WITH(large-files, +[ --with-large-files Enable support for large files (logs etc).], +[ if test "$withval" = yes; then + needlargefiles=1 + fi +]) + +AC_ARG_ENABLE(large-cache-files, +[ --enable-large-cache-files + Enable support for large cache files (>2GB). + WARNING: on-disk cache format is changed by this option], +[ if test "$enableval" = "yes" ; then + echo "Large cache file support enabled" + AC_DEFINE(LARGE_CACHE_FILES, 1, [Support large cache files > 2GB]) +dnl needlargefiles=1 + fi +]) + +dnl UNIX Build environment +AC_ARG_WITH(build-environment, +[ --with-build-environment=model + The build environment to use. Normally one of + POSIX_V6_ILP32_OFF32 32 bits + POSIX_V6_ILP32_OFFBIG 32 bits with large file support + POSIX_V6_LP64_OFF64 64 bits + POSIX_V6_LPBIG_OFFBIG large pointers and files + XBS5_ILP32_OFF32 32 bits (legacy) + XBS5_ILP32_OFFBIG 32 bits with large file support (legacy) + XBS5_LP64_OFF64 64 bits (legacy) + XBS5_LPBIG_OFFBIG large pointers and files (legacy) + default The default for your OS], +[ case "$withval" in + yes|no) + echo "--with-build-environment expects a build environment string as used by getconf" + exit 1 + ;; + *) + buildmodel="$withval" + ;; + esac +]) + +if test $needlargefiles && test -z "$buildmodel"; then + for model in POSIX_V6_ILP32_OFFBIG XBS5_ILP32_OFFBIG POSIX_V6_LP64_OFF64 XBS5_LP64_OFF64 POSIX_V6_LPBIG_OFFBIG XBS5_LPBIG_OFFBIG; do + if test "`getconf _$model 2>/dev/null || true`" = 1 || test "`getconf $model 2>/dev/null || true`" ; then + buildmodel=$model + break + fi + done + if test -z "$buildmodel"; then + echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64" + sleep 1 + CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS" + fi +fi +if test -n "$buildmodel" && test "$buildmodel" != "default"; then + echo "Using $buildmodel build environment" + if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then + : # All fine + else + echo "ERROR: Build environment $buildmodel not known to getconf." + exit 1 + fi + CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS" + LIBS="`getconf ${buildmodel}_LIBS` $LIBS" + LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS" + case "$host" in +dnl +dnl On Solaris getconf returns for CFLAGS -Xa and -Usun options, but: +dnl -Xa is supported only by Sun cc, so we need to remove it when using gcc +dnl The 'sun' define is needed by ipfilter includes, so we must remove -Usun + *-solaris*) + if test "$GCC" = "yes"; then + echo "Removing -Xa for gcc on $host" + CFLAGS="`echo $CFLAGS | sed -e 's/-Xa//'`" + fi + echo "Removing -Usun on $host" + CFLAGS="`echo $CFLAGS | sed -e 's/-Usun//'`" + ;; +dnl +dnl On Irix 6.x getconf returns options valid only for the SGI MipsPRO compiler, +dnl so we must adjust something to avoid gcc errors. +dnl On Irix 6.x 32/64 bit we must replace "-n32" with "-mabi=n32" in CFLAGS and +dnl remove "-n32" from LDFLAGS +dnl On Irix 6.x 64 bit we must replace "-64" with "-mabi=64" in CFLAGS and remove +dnl "-64" from LDFLAGS + *-sgi-irix6.*) + if test "$GCC" = "yes"; then + CFLAGS="`echo $CFLAGS | sed -e 's/-n32/-mabi=n32/'`" + LDFLAGS="`echo $LDFLAGS | sed -e 's/-n32//'`" + CFLAGS="`echo $CFLAGS | sed -e 's/-64/-mabi=64/'`" + LDFLAGS="`echo $LDFLAGS | sed -e 's/-64//'`" + fi + ;; + *) + ;; + esac +fi + +dnl Enable Linux transparent proxy support +AC_ARG_ENABLE(linux-tproxy, +[ --enable-linux-tproxy + Enable real Transparent Proxy support for Netfilter TPROXY.], +[ if test "$enableval" = "yes" ; then + echo "Linux Netfilter/TPROXY enabled" + AC_DEFINE(LINUX_TPROXY, 1, [Enable real Transparent Proxy support for Netfilter TPROXY.]) + LINUX_TPROXY="yes" + if test -z "$LINUX_NETFILTER"; then + echo "Linux-Netfilter Transparent Proxy automatically enabled" + LINUX_NETFILTER="yes" + fi + fi +]) + AM_CONDITIONAL(MAKE_LEAKFINDER, false) dnl Enable Leak Finding Functions AC_ARG_ENABLE(leakfinder, [ --enable-leakfinder - Enable Leak Finding code. Enabling this alone - does nothing; you also have to modify the source + Enable Leak Finding code. Enabling this alone + does nothing; you also have to modify the source code to use the leak finding functions. Probably Useful for hackers only.], [ if test "$enableval" = "yes" ; then echo "Leak-Finding enabled" - AC_DEFINE(USE_LEAKFINDER) + AC_DEFINE(USE_LEAKFINDER, 1, [Enable code for assiting in finding memory leaks. Hacker stuff only.]) USE_LEAKFINDER="yes" AM_CONDITIONAL(MAKE_LEAKFINDER, true) fi ]) +USE_IDENT=1 AC_ARG_ENABLE(ident-lookups, [ --disable-ident-lookups - This allows you to remove code that performs - Ident (RFC 931) lookups.], + This allows you to remove code that performs + Ident (RFC 931) lookups.], [ if test "$enableval" = "no" ; then echo "Disabling Ident Lookups" - AC_DEFINE(USE_IDENT, 0) - else - AC_DEFINE(USE_IDENT, 1) + USE_IDENT=0 fi ]) +if test $USE_IDENT = 1; then + AC_DEFINE(USE_IDENT, 1, [Compile in support for Ident (RFC 931) lookups? Enabled by default.]) +fi AM_CONDITIONAL(USE_DNSSERVER, false) use_dnsserver= AC_ARG_ENABLE(internal-dns, [ --disable-internal-dns This prevents Squid from directly sending and - receiving DNS messages, and instead enables the - old external 'dnsserver' processes.], + receiving DNS messages, and instead enables the + old external 'dnsserver' processes.], [ if test "$enableval" = "no" ; then echo "Disabling Internal DNS queries" use_dnsserver="yes" fi ]) if test "$use_dnsserver" = "yes"; then - AC_DEFINE(USE_DNSSERVERS) + AC_DEFINE(USE_DNSSERVERS, 1, [If --disable-internal-dns was given to configure, then we'll use + the dnsserver processes instead.]) AM_CONDITIONAL(USE_DNSSERVER, true) + dnl Some platforms need -lresolv when using --disable-internal-dns + case "$host" in + *-solaris*) + LIBS="$LIBS -lresolv" + ;; + *-cygwin*) + LIBS="$LIBS -lresolv" + ;; + esac fi AC_ARG_ENABLE(truncate, [ --enable-truncate This uses truncate() instead of unlink() when - removing cache files. Truncate gives a little - performance improvement, but may cause problems - when used with async I/O. Truncate uses more - filesystem inodes than unlink..], + removing cache files. Truncate gives a little + performance improvement, but may cause problems + when used with async I/O. Truncate uses more + filesystem inodes than unlink..], [ if test "$enableval" = "yes" ; then echo "Enabling truncate instead of unlink" - AC_DEFINE(USE_TRUNCATE) + AC_DEFINE(USE_TRUNCATE, 1, [Do we want to use truncate(2) or unlink(2)?]) fi ]) -dnl Disable hostname checks -enable_hostname_checks=1 -AC_ARG_ENABLE(hostname_checks, -[ --disable-hostname-checks - Squid by default rejects any host names with - odd characters in their name to conform with - internet standards. If you disagree with this - you may use this switch to turn off any such - checks, provided that the resolver used by - Squid does not reject such host names.. This - may be required to participate in testbeds for - international domain names.], -[ if test "$enableval" = "no"; then - echo "Disabling hostname sanity checks" - enable_hostname_checks=0 - fi -]) -if test "$enable_hostname_checks" = 1; then - AC_DEFINE(CHECK_HOSTNAMES, 1, [Enable hostname sanity checks]) -fi - -dnl Enable underscore in hostnames -AC_ARG_ENABLE(underscores, -[ --enable-underscores Squid by default rejects any host names with _ - in their name to conform with internet standards. - If you disagree with this you may allow _ in - hostnames by using this switch, provided that - the resolver library on the host where Squid runs - does not reject _ in hostnames...], +dnl Select Default hosts file location +AC_ARG_ENABLE(default-hostsfile, +[ --enable-default-hostsfile=path + Select default location for hosts file. + See hosts_file directive in squid.conf for details], +[ + if test "$enableval" != "none" ; then + if test -f $enableval; then + OPT_DEFAULT_HOSTS=$enableval + else + echo "Warning Unable to find $enableval" + sleep 5 + fi + else + OPT_DEFAULT_HOSTS="none" + fi + echo "Default hosts file set to: $enableval" +],[OPT_DEFAULT_HOSTS="/etc/hosts"]) +AC_SUBST(OPT_DEFAULT_HOSTS) + + +dnl Enable WIN32 Service compile mode +AC_ARG_ENABLE(win32-service, +[ --enable-win32-service Compile Squid as a WIN32 Service + Works only on Windows NT and Windows 2000 Platforms.], [ if test "$enableval" = "yes" ; then - echo "Enabling the use of underscores in host names" - AC_DEFINE(ALLOW_HOSTNAME_UNDERSCORES, 1) + echo "Enabling WIN32 run service mode" + AC_DEFINE(USE_WIN32_SERVICE,1,[Define Windows NT & Windows 2000 run service mode]) fi ]) - dnl Select auth schemes modules to build AC_ARG_ENABLE(auth, -[ --enable-auth=\"list of auth scheme modules\" - Build support for the list of authentication schemes. - The default is to build support for the Basic scheme. - See src/auth for a list of available modules, or - Programmers Guide section authentication schemes - for details on how to build your custom auth scheme - module], +[ --enable-auth="list of auth scheme modules" + Build support for the list of authentication schemes. + The default is to build support for the Basic scheme. + See src/auth for a list of available modules, or + Programmers Guide section authentication schemes + for details on how to build your custom auth scheme + module], [ case $enableval in yes) - for module in $srcdir/src/auth/*; do - if test -f $module/Makefile.in; then - AUTH_MODULES="$AUTH_MODULES `basename $module`" - fi - done - ;; + for module in $srcdir/src/auth/*; do + name="`basename $module`" + case $name in + CVS) # Ignore + ;; + *) + if test -d $module; then + AUTH_MODULES="$AUTH_MODULES $name" + fi + ;; + esac + done + ;; no) - ;; + ;; *) AUTH_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" - ;; + ;; esac ], [ if test -z "$AUTH_MODULES"; then AUTH_MODULES="basic" fi ]) -echo "Auth scheme modules built: $AUTH_MODULES" +if test -z "$AUTH_MODULES"; then + echo "Auth scheme modules built: None" +else + echo "Auth scheme modules built: $AUTH_MODULES" + AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" + AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" +fi AC_SUBST(AUTH_MODULES) -AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" AC_SUBST(AUTH_OBJS) -AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" AC_SUBST(AUTH_LIBS) -dnl Select basic auth scheme helpers to build -BASIC_AUTH_HELPERS="" -AC_ARG_ENABLE(auth-modules, -[ --enable-auth-modules=\"list of helpers\" - Backwards compatibility alias for - --enable-basic-auth-helpers], -[ echo "--enable-auth-modules is obsolete. Please use the new" - echo "option --enable-basic-auth-helpers" - sleep 5 - case "$enableval" in - yes) - for helper in $srcdir/helpers/basic_auth/*; do - if test -f $helper/Makefile.in; then - BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" - fi - done - ;; - no) - ;; - *) - BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" - esac -]) AC_ARG_ENABLE(basic-auth-helpers, -[ --enable-basic-auth-helpers=\"list of helpers\" - This option selects which basic scheme proxy_auth - helpers to build and install as part of the normal - build process. For a list of available - helpers see the helpers/basic_auth directory.], +[ --enable-basic-auth-helpers="list of helpers" + This option selects which basic scheme proxy_auth + helpers to build and install as part of the normal + build process. For a list of available + helpers see the helpers/basic_auth directory.], [ case "$enableval" in yes) - BASIC_AUTH_HELPERS="" - for helper in $srcdir/helpers/basic_auth/*; do - if test -f $helper/Makefile.in; then - BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" - fi - done + echo "ERROR: --enable-basic-auth-helpers requires an argument" + exit 1 ;; no) ;; @@ -935,18 +1304,15 @@ dnl Select ntlm auth helpers to build NTLM_AUTH_HELPERS= AC_ARG_ENABLE(ntlm-auth-helpers, -[ --enable-ntlm-auth-helpers=\"list of helpers\" - This option selects which proxy_auth ntlm helpers - to build and install as part of the normal build - process. For a list of available helpers see - the helpers/ntlm_auth directory.], +[ --enable-ntlm-auth-helpers="list of helpers" + This option selects which proxy_auth ntlm helpers + to build and install as part of the normal build + process. For a list of available helpers see + the helpers/ntlm_auth directory.], [ case "$enableval" in yes) - for helper in $srcdir/helpers/ntlm_auth/*; do - if test -f $helper/Makefile.in; then - NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS `basename $helper`" - fi - done + echo "ERROR: --enable-ntlm-auth-helpers requires an argument" + exit 1 ;; no) ;; @@ -970,18 +1336,15 @@ dnl Select digest auth scheme helpers to build DIGEST_AUTH_HELPERS= AC_ARG_ENABLE(digest-auth-helpers, -[ --enable-digest-auth-helpers=\"list of helpers\" - This option selects which digest scheme authentication - helpers to build and install as part of the normal build - process. For a list of available helpers see the - helpers/digest_auth directory.], +[ --enable-digest-auth-helpers="list of helpers" + This option selects which digest scheme proxy_auth + helpers to build and install as part of the normal + build process. For a list of available helpers see the + helpers/digest_auth directory.], [ case "$enableval" in yes) - for helper in $srcdir/helpers/digest_auth/*; do - if test -f $helper/Makefile.in; then - DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS `basename $helper`" - fi - done + echo "ERROR: --enable-digest-auth-helpers requires an argument" + exit 1 ;; no) ;; @@ -1002,31 +1365,60 @@ fi AC_SUBST(DIGEST_AUTH_HELPERS) +dnl Select negotiate auth scheme helpers to build +NEGOTIATE_AUTH_HELPERS= +AC_ARG_ENABLE(negotiate-auth-helpers, +[ --enable-negotiate-auth-helpers="list of helpers" + This option selects which negotiate scheme authentication + helpers to build and install as part of the normal build + process. For a list of available helpers see the + helpers/negotiate_auth directory.], +[ case "$enableval" in + yes) + echo "ERROR: --enable-negotiate-auth-helpers requires an argument" + exit 1 + ;; + no) + ;; + *) + NEGOTIATE_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + esac +]) +if test -n "$NEGOTIATE_AUTH_HELPERS"; then + for helper in $NEGOTIATE_AUTH_HELPERS; do + if test -f $srcdir/helpers/negotiate_auth/$helper/Makefile.in; then + : + else + echo "ERROR: negotiate auth helper $helper does not exists" + exit 1 + fi + done + echo "Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS" +fi +AC_SUBST(NEGOTIATE_AUTH_HELPERS) + dnl Enable "NTLM fail open" AC_ARG_ENABLE(ntlm-fail-open, [ --enable-ntlm-fail-open Enable NTLM fail open, where a helper that fails one of the - Authentication steps can allow squid to still authenticate - the user.], + Authentication steps can allow squid to still authenticate + the user.], [ if test "$enableval" = "yes" ; then - AC_DEFINE(NTLM_FAIL_OPEN) + AC_DEFINE(NTLM_FAIL_OPEN, 1, [Define if NTLM is allowed to fail gracefully when a helper has problems]) fi ]) dnl Select external_acl helpers to build EXTERNAL_ACL_HELPERS= AC_ARG_ENABLE(external-acl-helpers, -[ --enable-external-acl-helpers=\"list of helpers\" - This option selects which external_acl helpers to - build and install as part of the normal build - process. For a list of available helpers see the - helpers/external_acl directory.], +[ --enable-external-acl-helpers="list of helpers" + This option selects which external_acl helpers to + build and install as part of the normal build + process. For a list of available helpers see the + helpers/external_acl directory.], [ case "$enableval" in yes) - for helper in $srcdir/helpers/external_acl/*; do - if test -f $helper/Makefile.in; then - EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS `basename $helper`" - fi - done + echo "ERROR: --enable-external-acl-helpers requires an argument" + exit 1 ;; no) ;; @@ -1048,23 +1440,6 @@ AC_SUBST(EXTERNAL_ACL_HELPERS) -SAMBASOURCES='$(top_srcdir)/include/samba' -AC_ARG_WITH(samba-sources, -[ --with-samba-sources=/path/to/samba-source-tree - Path where the correct Samba source files can be - found while building winbind helpers. (defaults to - use internal copies of the headers from Samba-2.2.7) - ], -[ if test -f $withval/source/nsswitch/winbind_nss_config.h; then - echo "Using Samba sources from $withval" - SAMBASOURCES="$withval/source" - else - echo "ERROR: Cannot find Samba sources at $withval" - exit 1 - fi -]) -AC_SUBST(SAMBASOURCES) - dnl Check for Cyrus SASL if test "$require_sasl" = "yes"; then AC_CHECK_HEADERS(sasl/sasl.h sasl.h) @@ -1098,7 +1473,8 @@ ]) if test "$use_unlinkd" = "yes"; then echo "unlinkd enabled" - AC_DEFINE(USE_UNLINKD) + AC_DEFINE(USE_UNLINKD, 1, [Define this if unlinkd is required + (strongly recommended for ufs storage type)]) AM_CONDITIONAL(ENABLE_UNLINKD, true) else echo "unlinkd disabled" @@ -1110,21 +1486,37 @@ [ --enable-stacktraces Enable automatic call backtrace on fatal errors], [ if test "$enableval" = "yes" ; then echo "Enabling automatic stack backtraces on fatal errors" - AC_DEFINE(PRINT_STACK_TRACE, 1) + AC_DEFINE(PRINT_STACK_TRACE, 1, [Print stacktraces on fatal errors]) + if test "$GCC" = "yes"; then + LDFLAGS="$LDFLAGS -rdynamic" + fi fi ]) dnl Enable X-Accelerator-Vary for Vary support within an accelerator setup AC_ARG_ENABLE(x_accelerator_vary, [ --enable-x-accelerator-vary - Enable support for the X-Accelerator-Vary - HTTP header. Can be used to indicate - variance within an accelerator setup. - Typically used together with other code - that adds custom HTTP headers to the requests.], + Enable support for the X-Accelerator-Vary + HTTP header. Can be used to indicate + variance within an accelerator setup. + Typically used together with other code + that adds custom HTTP headers to the requests.], [ if test "$enableval" = "yes" ; then echo "Enabling support for X-Accelerator-Vary" - AC_DEFINE(X_ACCELERATOR_VARY, 1) + AC_DEFINE(X_ACCELERATOR_VARY, 1, [Enable support for the X-Accelerator-Vary HTTP header]) + fi +]) + +AC_ARG_ENABLE(follow-x-forwarded-for, +[ --enable-follow-x-forwarded-for + Enable support for following the X-Forwarded-For + HTTP header to try to find the IP address of the + original or indirect client when a request has + been forwarded through other proxies.], +[ if test "$enableval" = "yes" ; then + echo "follow X-Forwarded-For enabled" + AC_DEFINE(FOLLOW_X_FORWARDED_FOR, 1, [Enable following X-Forwarded-For headers]) + AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems don't have this in libc fi ]) @@ -1148,172 +1540,8 @@ esac dnl Check for programs +AC_PROG_EGREP AC_PROG_CPP - -AC_MSG_CHECKING([whether to enable ipv6]) -AC_ARG_ENABLE(ipv6, -[ --enable-ipv6 Enable ipv6 (with ipv4) support - --disable-ipv6 Disable ipv6 support], -[ case "$enableval" in - no) - AC_MSG_RESULT(no) - ipv6=no - ;; - *) AC_MSG_RESULT(yes) - AC_DEFINE(INET6) - ipv6=yes - ;; - esac ], - - AC_TRY_RUN([ /* AF_INET6 avalable check */ -#include -#include -main() -{ - if (socket(AF_INET6, SOCK_STREAM, 0) < 0) - exit(1); - else - exit(0); -} -], - AC_MSG_RESULT(yes) - AC_DEFINE(INET6) - ipv6=yes, - AC_MSG_RESULT(no) - ipv6=no, - AC_MSG_RESULT(no) - ipv6=no -)) - -ipv6type=unknown -ipv6lib=none - -if test "$ipv6" = "yes"; then - AC_MSG_CHECKING([ipv6 stack type]) - for i in inria freebsd kame linux-glibc linux-inet6 toshiba v6d zeta; do - case $i in - inria) - dnl http://www.kame.net/ - AC_EGREP_CPP(yes, [dnl -#include -#ifdef IPV6_INRIA_VERSION -yes -#endif], - [ipv6type=$i; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - freebsd) - dnl http://www.freebsd.org/ - dnl Check before Kame since FreeBSD uses Kame natively - dnl but doesn't have extra libs - AC_EGREP_CPP(yes, [dnl -#include -#include -#if defined(__KAME__) && defined(__FreeBSD_version) && (__FreeBSD_version > 400000) -yes -#endif], - [ipv6type=$i; - ipv6lib=none; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - kame) - dnl http://www.kame.net/ - AC_EGREP_CPP(yes, [dnl -#include -#ifdef __KAME__ -yes -#endif], - [ipv6type=$i; - ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - linux-glibc) - dnl http://www.linux-ipv6.org/ - AC_EGREP_CPP(yes, [dnl -#include -#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) -yes -#endif], - [ipv6type=$i; - ipv6lib=none; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - linux-inet6) - dnl http://www.linux-ipv6.org/ - if test -d /usr/inet6; then - ipv6type=$i - ipv6lib=inet6 - ipv6libdir=/usr/inet6/lib - CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS" - fi - ;; - toshiba) - AC_EGREP_CPP(yes, [dnl -#include -#ifdef _TOSHIBA_INET6 -yes -#endif], - [ipv6type=$i; - ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - v6d) - AC_EGREP_CPP(yes, [dnl -#include -#ifdef __V6D__ -yes -#endif], - [ipv6type=$i; - ipv6lib=v6; - ipv6libdir=/usr/local/v6/lib; - CFLAGS="-I/usr/local/v6/include $CFLAGS"]) - ;; - zeta) - AC_EGREP_CPP(yes, [dnl -#include -#ifdef _ZETA_MINAMI_INET6 -yes -#endif], - [ipv6type=$i; - ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - CFLAGS="-DINET6 $CFLAGS"]) - ;; - esac - if test "$ipv6type" != "unknown"; then - break - fi - done - AC_MSG_RESULT($ipv6type) -fi - -if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then - if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then - LIBS="-L$ipv6libdir -l$ipv6lib $LIBS" - else - echo 'Fatal: no $ipv6lib library found. cannot continue.' - echo "You need to fetch lib$ipv6lib.a from appropriate" - echo 'ipv6 kit and compile beforehand.' - exit 1 - fi -fi - - -AC_MSG_CHECKING([whether struct sockaddr_storage has __ss_family]) -AC_TRY_COMPILE([ -#include -#include -],[ -struct sockaddr_storage ss; -int i = ss.__ss_family; -], -[AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -Dss_family=__ss_family -Dss_len=__ss_len" - ], -AC_MSG_RESULT(no), AC_MSG_RESULT(no)) - AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_LN_S @@ -1354,7 +1582,16 @@ AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS( \ +dnl Check for headers. sys/types.h and stddef.h and limits must be first (see below) +AC_CHECK_HEADERS( + sys/types.h \ + stddef.h \ + limits.h \ + sys/param.h \ + sys/socket.h \ + netinet/in.h \ + stdio.h \ + stdlib.h \ arpa/inet.h \ arpa/nameser.h \ assert.h \ @@ -1364,16 +1601,13 @@ errno.h \ execinfo.h \ fcntl.h \ + fnmatch.h \ getopt.h \ gnumalloc.h \ grp.h \ - ip_compat.h \ - ip_fil_compat.h \ - ip_fil.h \ - ip_nat.h \ libc.h \ - limits.h \ linux/netfilter_ipv4.h \ + linux/netfilter_ipv4/ip_tproxy.h \ malloc.h \ math.h \ memory.h \ @@ -1382,15 +1616,12 @@ net/pfvar.h \ netdb.h \ netinet/if_ether.h \ - netinet/in.h \ netinet/tcp.h \ - netinet/ip_compat.h \ - netinet/ip_fil_compat.h \ - netinet/ip_fil.h \ - netinet/ip_nat.h \ openssl/err.h \ openssl/md5.h \ openssl/ssl.h \ + openssl/engine.h \ + paths.h \ poll.h \ pwd.h \ regex.h \ @@ -1398,9 +1629,6 @@ sched.h \ signal.h \ stdarg.h \ - stddef.h \ - stdio.h \ - stdlib.h \ string.h \ strings.h \ sys/bitypes.h \ @@ -1408,19 +1636,20 @@ sys/ioctl.h \ sys/mount.h \ sys/msg.h \ - sys/param.h \ + sys/prctl.h \ sys/resource.h \ - sys/select.h\ - sys/socket.h \ + sys/poll.h \ + sys/select.h \ sys/stat.h \ + sys/statfs.h \ sys/statvfs.h \ syscall.h \ sys/syscall.h \ sys/time.h \ - sys/types.h \ sys/un.h \ sys/vfs.h \ sys/wait.h \ + sys/event.h \ syslog.h \ time.h \ unistd.h \ @@ -1432,11 +1661,101 @@ inttypes.h \ grp.h \ nss_common.h \ - nss.h -) + nss.h \ + db.h \ + db_185.h \ + aio.h \ +,,,[ +#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_STDDEF_H +#include +#endif +#if HAVE_LIMITS_H +#include +#endif +#if HAVE_SYS_PARAM_H +#include +#endif +#if HAVE_SYS_SOCKET_H +#include +#endif +#if HAVE_STDIO_H +#include +#endif +#if HAVE_STDLIB_H +#include +#endif +#if HAVE_NETINET_IN_H +#include +#endif +#if HAVE_NET_IF_H +#include +#endif +#if HAVE_NETINET_IF_ETHER_H +#include +#endif +]) + +dnl Check for IP-Filter headers. These are a bit nasty.. +AC_CHECK_HEADERS( \ + ip_compat.h \ + ip_fil_compat.h \ + ip_fil.h \ + ip_nat.h \ + ipl.h \ + netinet/ip_compat.h \ + netinet/ip_fil_compat.h \ + netinet/ip_fil.h \ + netinet/ip_nat.h \ + netinet/ipl.h \ +,,,[ +#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_STDDEF_H +#include +#endif +#if HAVE_LIMITS_H +#include +#endif +#if HAVE_SYS_PARAM_H +#include +#endif +#if HAVE_SYS_SOCKET_H +#include +#endif +#if HAVE_STDIO_H +#include +#endif +#if HAVE_STDLIB_H +#include +#endif +#if HAVE_NETINET_IN_H +#include +#endif +#if HAVE_NET_IF_H +#include +#endif +#if HAVE_NETINET_IF_ETHER_H +#include +#endif +#if 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 +]) AC_C_CONST AC_C_BIGENDIAN +AC_C_INLINE AC_CACHE_CHECK(if ANSI prototypes work,ac_cv_have_ansi_prototypes, [ AC_TRY_COMPILE([int foo(char *); int foo (char *bar) {return 1;}], @@ -1445,7 +1764,7 @@ ac_cv_have_ansi_prototypes="no") ]) if test $ac_cv_have_ansi_prototypes = "yes" ; then - AC_DEFINE(HAVE_ANSI_PROTOTYPES) + AC_DEFINE(HAVE_ANSI_PROTOTYPES, 1, [Define if your compiler supports prototyping]) fi AC_CACHE_CHECK(for tm->tm_gmtoff,ac_cv_have_tm_gmoff, [ @@ -1457,7 +1776,7 @@ ac_cv_have_tm_gmoff="no") ]) if test $ac_cv_have_tm_gmoff = "yes" ; then - AC_DEFINE(HAVE_TM_GMTOFF) + AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has tm_gmtoff member]) fi AC_CACHE_CHECK(for struct mallinfo,ac_cv_have_struct_mallinfo, [ @@ -1478,7 +1797,7 @@ ac_cv_have_struct_mallinfo="no") ]) if test $ac_cv_have_struct_mallinfo = "yes" ; then - AC_DEFINE(HAVE_STRUCT_MALLINFO) + AC_DEFINE(HAVE_STRUCT_MALLINFO, 1, [we check for the existance of struct mallinfo]) fi AC_CACHE_CHECK(for extended mallinfo,ac_cv_have_ext_mallinfo, [ @@ -1490,24 +1809,33 @@ ac_cv_have_ext_mallinfo="no") ]) if test $ac_cv_have_ext_mallinfo = "yes" ; then - AC_DEFINE(HAVE_EXT_MALLINFO) + AC_DEFINE(HAVE_EXT_MALLINFO, 1, [Define if struct mallinfo has mxfast member]) fi -AC_CACHE_CHECK(for struct rusage,ac_cv_have_struct_rusage, [ - AC_TRY_COMPILE([ +case "$host_os" in + mingw|mingw32) + AC_DEFINE(HAVE_STRUCT_RUSAGE) + ac_cv_func_getrusage='yes' + echo "Using own rusage on Windows." + ;; + *) + AC_CACHE_CHECK(for struct rusage,ac_cv_have_struct_rusage, [ + AC_TRY_COMPILE([ #if HAVE_SYS_TIME_H #include #endif #if HAVE_SYS_RESOURCE_H #include #endif], - [struct rusage R;], - ac_cv_have_struct_rusage="yes", - ac_cv_have_struct_rusage="no") + [struct rusage R;], + ac_cv_have_struct_rusage="yes", + ac_cv_have_struct_rusage="no") ]) -if test $ac_cv_have_struct_rusage = "yes" ; then - AC_DEFINE(HAVE_STRUCT_RUSAGE) -fi + if test $ac_cv_have_struct_rusage = "yes" ; then + AC_DEFINE(HAVE_STRUCT_RUSAGE, 1, [Define if you have struct rusage]) + fi + ;; +esac AC_CACHE_CHECK(for ip->ip_hl, ac_cv_have_ip_hl, [ AC_TRY_COMPILE([#include @@ -1528,16 +1856,19 @@ ac_cv_have_ip_hl="no") ]) if test $ac_cv_have_ip_hl = "yes" ; then - AC_DEFINE(HAVE_IP_HL) + AC_DEFINE(HAVE_IP_HL, 1, [Define if struct ip has ip_hl member]) fi dnl Check for typedefs AC_CHECK_SIZEOF(void *) +AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF_SYSTYPE(__int64) +AC_CHECK_SIZEOF_SYSTYPE(int8_t) +AC_CHECK_SIZEOF_SYSTYPE(uint8_t) +AC_CHECK_SIZEOF_SYSTYPE(u_int8_t) AC_CHECK_SIZEOF_SYSTYPE(int16_t) AC_CHECK_SIZEOF_SYSTYPE(uint16_t) AC_CHECK_SIZEOF_SYSTYPE(u_int16_t) @@ -1547,14 +1878,31 @@ AC_CHECK_SIZEOF_SYSTYPE(int64_t) AC_CHECK_SIZEOF_SYSTYPE(uint64_t) AC_CHECK_SIZEOF_SYSTYPE(u_int64_t) +AC_CHECK_SIZEOF_SYSTYPE(__int64) +dnl int8_t +if test "x$ac_cv_sizeof_char" = "x1"; then + AC_CHECK_SYSTYPE(int8_t,char) +fi +dnl u_int8_t +if test "x$ac_cv_sizeof_uint8_t" = "x1"; then + AC_CHECK_SYSTYPE(u_int8_t,uint8_t) +elif test "x$ac_cv_sizeof_char" = "x1"; then + AC_CHECK_SYSTYPE(u_int8_t,unsigned char) +fi +dnl uint8_t +if test "x$ac_cv_sizeof_u_int8_t" = "x1"; then + AC_CHECK_SYSTYPE(uint8_t,u_int8_t) +elif test "x$ac_cv_sizeof_char" = "x1"; then + AC_CHECK_SYSTYPE(uint8_t,unsigned char) +fi dnl int16_t if test "x$ac_cv_sizeof_short" = "x2"; then AC_CHECK_SYSTYPE(int16_t,short) elif test "x$ac_cv_sizeof_int" = "x2"; then AC_CHECK_SYSTYPE(int16_t,int) fi -dnl u_int16t_t +dnl u_int16_t if test "x$ac_cv_sizeof_uint16_t" = "x2"; then AC_CHECK_SYSTYPE(u_int16_t,uint16_t) elif test "x$ac_cv_sizeof_short" = "x2"; then @@ -1562,6 +1910,14 @@ elif test "x$ac_cv_sizeof_int" = "x2"; then AC_CHECK_SYSTYPE(u_int16_t,unsigned int) fi +dnl uint16_t +if test "x$ac_cv_sizeof_u_int16_t" = "x2"; then + AC_CHECK_SYSTYPE(uint16_t,u_int16_t) +elif test "x$ac_cv_sizeof_short" = "x2"; then + AC_CHECK_SYSTYPE(uint16_t,unsigned short) +elif test "x$ac_cv_sizeof_int" = "x2"; then + AC_CHECK_SYSTYPE(uint16_t,unsigned int) +fi dnl int32_t if test "x$ac_cv_sizeof_int" = "x4"; then AC_CHECK_SYSTYPE(int32_t,int) @@ -1576,6 +1932,14 @@ elif test "x$ac_cv_sizeof_long" = "x4"; then AC_CHECK_SYSTYPE(u_int32_t,unsigned long) fi +dnl uint32_t +if test "x$ac_cv_sizeof_u_int32_t" = "x4"; then + AC_CHECK_SYSTYPE(uint32_t,u_int32_t) +elif test "x$ac_cv_sizeof_int" = "x4"; then + AC_CHECK_SYSTYPE(uint32_t,unsigned int) +elif test "x$ac_cv_sizeof_long" = "x4"; then + AC_CHECK_SYSTYPE(uint32_t,unsigned long) +fi dnl int64_t if test "x$ac_cv_sizeof_long" = "x8"; then AC_CHECK_SYSTYPE(int64_t,long) @@ -1592,15 +1956,25 @@ elif test "x$ac_cv_sizeof_long_long" = "x8"; then AC_CHECK_SYSTYPE(u_int64_t,unsigned long long) elif test "x$ac_cv_sizeof___int64" = "x8"; then - AC_CHECK_SYSTYPE(int64_t,unsigned __int64) + AC_CHECK_SYSTYPE(u_int64_t,unsigned __int64) +fi +dnl uint64_t +if test "x$ac_cv_sizeof_u_int64_t" = "x8"; then + AC_CHECK_SYSTYPE(uint64_t,u_int64_t) +elif test "x$ac_cv_sizeof_long" = "x8"; then + AC_CHECK_SYSTYPE(uint64_t,unsigned long) +elif test "x$ac_cv_sizeof_long_long" = "x8"; then + AC_CHECK_SYSTYPE(uint64_t,unsigned long long) +elif test "x$ac_cv_sizeof___int64" = "x8"; then + AC_CHECK_SYSTYPE(uint64_t,unsigned __int64) fi -AC_CHECK_TYPE(pid_t, int) -AC_CHECK_TYPE(size_t, unsigned int) -AC_CHECK_TYPE(ssize_t, int) -AC_CHECK_TYPE(off_t, int) -AC_CHECK_TYPE(mode_t, u_short) -AC_CHECK_TYPE(fd_mask, int) +AC_CHECK_SYSTYPE(pid_t, int) +AC_CHECK_SYSTYPE(size_t, unsigned int) +AC_CHECK_SYSTYPE(ssize_t, int) +AC_CHECK_SYSTYPE(off_t, int) +AC_CHECK_SYSTYPE(mode_t, unsigned short) +AC_CHECK_SYSTYPE(fd_mask, int) AC_CHECK_SIZEOF_SYSTYPE(off_t, 4) AC_CHECK_SIZEOF_SYSTYPE(size_t, 4) @@ -1621,7 +1995,9 @@ ac_cv_type_socklen_t=no) ]) if test $ac_cv_type_socklen_t = no; then - AC_DEFINE(socklen_t, int) + AC_DEFINE(socklen_t, int, [This makes warnings go away. If you have socklen_t defined in your + /usr/include files, then this should remain undef'd. Otherwise it + should be defined to int.]) fi dnl Check for mtyp_t in some headers @@ -1633,12 +2009,40 @@ ac_cv_type_mtyp_t=no) ]) if test $ac_cv_type_mtyp_t = no; then - AC_DEFINE(mtyp_t, long) + AC_DEFINE(mtyp_t, long, [message type for message queues]) fi dnl Check for needed libraries AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(socket, main) +AC_MSG_CHECKING(for winsock) +save_LIBS="$LIBS" +for curlib in ws2_32 wsock32; do + LIBS="$LIBS -l$curlib" + AC_TRY_LINK([ + char __attribute__((stdcall)) socket(int,int,int); + char __attribute__((stdcall)) select(int,int,int,int,int); + char __attribute__((stdcall)) closesocket(int); + char __attribute__((stdcall)) gethostname(int,int); + ], + [ + socket(1,2,3); + select(1,2,3,4,5); + closesocket(1); + gethostname(1,2); + ], + have_winsock=yes, have_winsock=no) + + if test $have_winsock = yes; then + ac_cv_func_select='yes' + if test $curlib = ws2_32; then + have_winsock=winsock2 + fi + break + fi + LIBS="$save_LIBS" +done +AC_MSG_RESULT($have_winsock) dnl Ripped from the Samba sources AC_CACHE_CHECK([for unix domain sockets],squid_cv_unixsocket, [ @@ -1652,9 +2056,9 @@ struct sockaddr_un sunaddr; sunaddr.sun_family = AF_UNIX; ], - squid_cv_unixsocket=yes,squid_cv_unixsocket=no)]) + squid_cv_unixsocket=yes,squid_cv_unixsocket=no)]) if test x"$squid_cv_unixsocket" = x"yes"; then - AC_DEFINE(HAVE_UNIXSOCKET) + AC_DEFINE(HAVE_UNIXSOCKET, 1, [Do we have unix sockets? (required for the winbind ntlm helper]) fi dnl end rip @@ -1685,19 +2089,15 @@ AC_CHECK_LIB(bsd, main) AC_CHECK_LIB(regex, main, [REGEXLIB="-lregex"]) -AC_CHECK_LIB(bind, gethostbyname) -if test $ac_cv_lib_bind_gethostbyname = "no" ; then - case "$host" in - i386-*-freebsd*) - echo "skipping libresolv checks for $host" - ;; + +case "$host_os" in +mingw|mingw32) + echo "Use MSVCRT for math functions." + ;; *) - AC_CHECK_LIB(resolv, inet_aton, AC_CHECK_LIB(44bsd, inet_aton)) - AC_CHECK_LIB(resolv, main) - ;; - esac -fi -AC_CHECK_LIB(m, main) + AC_CHECK_LIB(m, main) + ;; +esac dnl Check for libcrypt dnl Some of our helpers use crypt(3) which may be in libc, or in @@ -1716,18 +2116,18 @@ CFLAGS="$CFLAGS -D_REENTRANT" case "$host" in i386-unknown-freebsd*) - if test "$GCC" = "yes" ; then - if test -z "$PRESET_LDFLAGS"; then - LDFLAGS="$LDFLAGS -pthread" - fi - fi + if test "$GCC" = "yes" ; then + if test -z "$PRESET_LDFLAGS"; then + LDFLAGS="$LDFLAGS -pthread" + fi + fi ;; *-solaris2.*) - if test "$GCC" = "yes" ; then + if test "$GCC" = "yes" ; then CFLAGS="$CFLAGS -pthreads" else CFLAGS="$CFLAGS -mt" - fi + fi ;; esac AC_CHECK_LIB(pthread, main) @@ -1736,9 +2136,15 @@ dnl Check for librt dnl We use AIO in the coss store if test "$with_aio" = "yes"; then - AC_CHECK_LIB(rt, aio_read) + dnl On some systems POSIX AIO functions are in libaio + AC_CHECK_LIB(rt, aio_read,,AC_CHECK_LIB(aio, aio_read)) fi +LIB_EPOLL='' +dnl Check for libepoll +AC_CHECK_LIB(epoll, epoll_ctl,[LIB_EPOLL="-lepoll"],,[-L ./lib]) +AC_SUBST(LIB_EPOLL) + dnl -lintl is needed on SCO version 3.2v4.2 for strftime() dnl Robert Side dnl Mon, 18 Jan 1999 17:48:00 GMT @@ -1748,20 +2154,63 @@ ;; esac +dnl On MinGW OpenLDAP is not available, so LDAP helpers can be linked +dnl only with Windows LDAP libraries using -lwldap32 +case "$host_os" in +mingw|mingw32) + LIB_LDAP="-lwldap32" + LIB_LBER="" + ;; +*) + LIB_LDAP="-lldap" + dnl LDAP helpers need to know if -llber is needed or not + AC_CHECK_LIB(lber, main, [LIB_LBER="-llber"]) + ;; +esac +AC_SUBST(LIB_LDAP) +AC_SUBST(LIB_LBER) + +dnl Check for libdb +DBLIB= +dnl 1.85 +AC_CACHE_CHECK(if dbopen needs -ldb,ac_cv_dbopen_libdb, [ +SAVED_LIBS="$LIBS"; LIBS="$LIBS -ldb" + AC_TRY_LINK([ +#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_LIMITS_H +#include +#endif +#if HAVE_DB_185_H +#include +#elif HAVE_DB_H +#include +#endif], + [dbopen((void *)0L, 0, 0, DB_HASH, (void *)0L)], + ac_cv_dbopen_libdb="yes", + ac_cv_dbopen_libdb="no") +LIBS="$SAVED_LIBS" +]) +if test $ac_cv_dbopen_libdb = yes; then + LIB_DB="-ldb" +fi +AC_SUBST(LIB_DB) + dnl System-specific library modifications dnl case "$host" in i386-*-solaris2.*) - if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then echo "Removing -O for gcc on $host" CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" fi ;; *-sgi-irix*) - echo "Removing -lsocket for IRIX..." - LIBS=`echo $LIBS | sed -e s/-lsocket//` - echo "Removing -lnsl for IRIX..." - LIBS=`echo $LIBS | sed -e s/-lnsl//` + echo "Removing -lsocket for IRIX..." + LIBS=`echo $LIBS | sed -e s/-lsocket//` + echo "Removing -lnsl for IRIX..." + LIBS=`echo $LIBS | sed -e s/-lnsl//` ac_cv_lib_nsl_main=no echo "Removing -lbsd for IRIX..." LIBS=`echo $LIBS | sed -e s/-lbsd//` @@ -1788,13 +2237,13 @@ ;; *m88k*) CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_" - AC_DEFINE(GETTIMEOFDAY_NO_TZP) + AC_DEFINE(GETTIMEOFDAY_NO_TZP, 1, [If gettimeofday is known to take only one argument]) ;; [*-*-solaris2.[0-4]]) - AC_DEFINE(GETTIMEOFDAY_NO_TZP) + AC_DEFINE(GETTIMEOFDAY_NO_TZP, 1, [If gettimeofday is known to take only one argument]) ;; [*-sony-newsos[56]*]) - AC_DEFINE(GETTIMEOFDAY_NO_TZP) + AC_DEFINE(GETTIMEOFDAY_NO_TZP, 1, [If gettimeofday is known to take only one argument]) ;; esac @@ -1860,17 +2309,25 @@ esac fi +dnl Override statfs detect on MinGW because is emulated in source code +case "$host_os" in +mingw|mingw32) + ac_cv_func_statfs='yes' + ;; +esac + dnl Check for library functions AC_CHECK_FUNCS(\ bcopy \ backtrace_symbols_fd \ - crypt \ fchmod \ getdtablesize \ getpagesize \ getpass \ getrusage \ getspnam \ + gettimeofday \ + kqueue \ lrand48 \ mallinfo \ mallocblksize \ @@ -1882,6 +2339,7 @@ mktime \ mstats \ poll \ + prctl \ pthread_attr_setscope \ pthread_setschedparam \ pthread_attr_setschedparam \ @@ -1894,6 +2352,7 @@ res_init \ rint \ sbrk \ + select \ seteuid \ setgroups \ setpgrp \ @@ -1902,17 +2361,170 @@ setsid \ sigaction \ snprintf \ + socketpair \ srand48 \ srandom \ statfs \ + strsep \ + strtoll \ sysconf \ syslog \ timegm \ vsnprintf \ - bswap_16 \ - bswap_32 \ ) +SAVED_LIBS="$LIBS" +LIBS="$LIBS $LIB_EPOLL" +AC_CHECK_FUNCS(epoll_ctl) +LIBS="$SAVED_LIBS" + +SAVED_LIBS="$LIBS" +LIBS="$LIBS $CRYPTLIB" +AC_CHECK_FUNCS(crypt) +LIBS="$SAVED_LIBS" + +dnl Verify that epoll really works +if test $ac_cv_func_epoll_ctl = yes; then + AC_CACHE_CHECK(if epoll works, ac_cv_epoll_works, + AC_TRY_RUN([ +#include +#include +#include +int main(int argc, char **argv) +{ + int fd = epoll_create(256); + if (fd < 0) { + perror("epoll_create:"); + exit(1); + } + exit(0); +} + ], [ac_cv_epoll_works=yes], [ac_cv_epoll_works=no])) + if test ac_cv_epoll_works = no && test ac_force_epoll = yes; then + echo "Error - no epoll found"; + echo "Try running 'sh ./scripts/get_epoll-lib.sh'"; + echo "then run configure again"; + exit -1 + fi +fi + +dnl Magic which checks whether we are forcing a type of comm loop we +dnl are actually going to (ab)use + +dnl Actually do the define magic now +dnl mostly ripped from squid-commloops, thanks to adrian and benno + +if test -n "$SELECT_TYPE"; then + : # Nothing to do +elif test "$ac_cv_epoll_works" = "yes" ; then + SELECT_TYPE="epoll" +elif test "$ac_cv_func_kqueue" = "yes" ; then + SELECT_TYPE="kqueue" +elif test "$ac_cv_func_poll" = "yes" ; then + SELECT_TYPE="poll" +elif test "$ac_cv_func_select" = "yes" ; then + case "$host_os" in + mingw|mingw32) + SELECT_TYPE="select_win32" + ;; + *) + SELECT_TYPE="select" + ;; + esac +else + echo "Eep! Can't find poll, epoll, kqueue or select!" + echo "I'll try select and hope for the best." + SELECT_TYPE="select" +fi + +echo "Using ${SELECT_TYPE} for the IO loop." +AM_CONDITIONAL([USE_POLL], [test $SELECT_TYPE = poll]) +AM_CONDITIONAL([USE_EPOLL], [test $SELECT_TYPE = epoll]) +AM_CONDITIONAL([USE_SELECT], [test $SELECT_TYPE = select]) +AM_CONDITIONAL([USE_SELECT_SIMPLE], [test $SELECT_TYPE = select_simple]) +AM_CONDITIONAL([USE_SELECT_WIN32], [test $SELECT_TYPE = select_win32]) +AM_CONDITIONAL([USE_KQUEUE], [test $SELECT_TYPE = kqueue]) +AM_CONDITIONAL([USE_DEVPOLL], [test $SELECT_TYPE = devpoll]) + + +dnl Hmm.. some OS:es (i.e. FreeBSD) can't handle large AF_UNIX dgram packets. +dnl Verify that at least 16K is supported, if not fall back on using +dnl IP dgram sockets for IPC. +AC_CACHE_CHECK(if AF_UNIX dgram sockets support large packets, ac_cv_af_unix_large_dgram, + AC_TRY_RUN([ +#include +#include +#if HAVE_SYS_SELECT_H +#include +#else +#include +#endif +#include +#include +#include + +#define BUFSIZE 16384 + void consumer(int s, int p) + { + fd_set fds; + char buf[[BUFSIZE]]; + int len; + int nfds = p > s ? p + 1 : s + 1; + int rc; + FD_ZERO(&fds); + FD_SET(s, &fds); + FD_SET(p, &fds); + rc = select(nfds, &fds, NULL, NULL, NULL); + if (rc < 0) + exit(1); + if (FD_ISSET(s, &fds)) + len = recv(s, buf, sizeof(buf), 0); + } + + void sender(int s, int p) + { + char buf[[BUFSIZE]]; + int len = sizeof(buf); + int rc = send(s, buf, len, 0); + if (rc < 0) { + perror("send"); + exit(1); + } + if (rc != len) { + fprintf(stderr, "Short send %d of %d\n", rc, len); + exit(1); + } + } + + int main(int argc, char **argv) + { + int s[[2]]; + int p[[2]]; + pid_t pid; + socketpair(AF_UNIX, SOCK_DGRAM, 0, s); + pipe(p); + pid = fork(); + if (pid < 0) { + perror("fork"); + exit(0); + } + if (pid == 0) { + close(s[[0]]); + close(p[[0]]); + consumer(s[[1]],p[[1]]); + } else { + close(s[[1]]); + close(p[[1]]); + sender(s[[0]],p[[0]]); + } + return 0; + } + ], ac_cv_af_unix_large_dgram="yes",ac_cv_af_unix_large_dgram="no") +) +if test "$ac_cv_af_unix_large_dgram" = "yes" ; then + AC_DEFINE(SUPPORTS_LARGE_AF_UNIX_DGRAM, 1, [Supports large dgram sockets over AF_UNIX sockets]) +fi + dnl Yay! Another Linux brokenness. Its not good enough dnl to know that setresuid() exists, because RedHat 5.0 declares dnl setresuid() but doesn't implement it. @@ -1930,7 +2542,9 @@ ],ac_cv_func_setresuid="yes",ac_cv_func_setresuid="no") ) if test "$ac_cv_func_setresuid" = "yes" ; then - AC_DEFINE(HAVE_SETRESUID) + AC_DEFINE(HAVE_SETRESUID, 1, [Yay! Another Linux brokenness. Its not good enough to know that + setresuid() exists, because RedHat 5.0 declare setresuid() but + doesn't implement it.]) fi AM_CONDITIONAL(NEED_OWN_SNPRINTF, false) @@ -1938,6 +2552,11 @@ AM_CONDITIONAL(NEED_OWN_SNPRINTF, true) fi +AM_CONDITIONAL(NEED_OWN_STRSEP, false) +if test "$ac_cv_func_strsep" = "no" ; then + AM_CONDITIONAL(NEED_OWN_STRSEP, true) +fi + dnl dnl Test for va_copy dnl @@ -1945,21 +2564,21 @@ AC_TRY_RUN([ #include void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - va_copy (args2, args1); - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); + va_list args1, args2; + va_start (args1, i); + va_copy (args2, args1); + if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) + exit (1); + va_end (args1); va_end (args2); } int main() { - f (0, 42); - return 0; + f (0, 42); + return 0; } ],ac_cv_func_va_copy="yes",ac_cv_func_va_copy="no") ) if test "$ac_cv_func_va_copy" = "yes" ; then - AC_DEFINE(HAVE_VA_COPY) + AC_DEFINE(HAVE_VA_COPY, 1, [Some systems dont have va_copy]) fi dnl @@ -1969,21 +2588,21 @@ AC_TRY_RUN([ #include void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - __va_copy (args2, args1); - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); + va_list args1, args2; + va_start (args1, i); + __va_copy (args2, args1); + if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) + exit (1); + va_end (args1); va_end (args2); } int main() { - f (0, 42); - return 0; + f (0, 42); + return 0; } ],ac_cv_func___va_copy="yes",ac_cv_func___va_copy="no") ) if test "$ac_cv_func___va_copy" = "yes" ; then - AC_DEFINE(HAVE___VA_COPY) + AC_DEFINE(HAVE___VA_COPY, 1, [Some systems support __va_copy]) fi dnl IP-Filter support requires ipf header files. These aren't @@ -1992,24 +2611,30 @@ AC_MSG_CHECKING(if IP-Filter header files are installed) # hold on to your hats... if test "$ac_cv_header_ip_compat_h" = "yes" || - test "$ac_cv_header_ip_fil_compat_h" = "yes" || - test "$ac_cv_header_netinet_ip_compat_h" = "yes" || - test "$ac_cv_header_netinet_ip_fil_compat_h" = "yes" ; then - have_ipfilter_compat_header="yes" + test "$ac_cv_header_ip_fil_compat_h" = "yes" || + test "$ac_cv_header_netinet_ip_compat_h" = "yes" || + test "$ac_cv_header_netinet_ip_fil_compat_h" = "yes" ; then + have_ipfilter_compat_header="yes" fi if test "x$have_ipfilter_compat_header" = "xyes" && test "$ac_cv_header_ip_fil_h" = "yes" && test "$ac_cv_header_ip_nat_h" = "yes" ; then - IPF_TRANSPARENT="yes" - AC_DEFINE(IPF_TRANSPARENT, 1) + IPF_TRANSPARENT="yes" + AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter + address redirection. This provides "masquerading" support for non + Linux system.]) elif test "$have_ipfilter_compat_header" = "yes" && - test "$ac_cv_header_netinet_ip_fil_h" = "yes" && - test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then - IPF_TRANSPARENT="yes" - AC_DEFINE(IPF_TRANSPARENT, 1) + test "$ac_cv_header_netinet_ip_fil_h" = "yes" && + test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then + IPF_TRANSPARENT="yes" + AC_DEFINE(IPF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using IP-Filter + address redirection. This provides "masquerading" support for non + Linux system.]) else - IPF_TRANSPARENT="no" - AC_DEFINE(IPF_TRANSPARENT, 0) + IPF_TRANSPARENT="no" + AC_DEFINE(IPF_TRANSPARENT, 0, [Enable support for Transparent Proxy on systems using IP-Filter + address redirection. This provides "masquerading" support for non + Linux system.]) fi AC_MSG_RESULT($IPF_TRANSPARENT) fi @@ -2024,11 +2649,13 @@ AC_MSG_CHECKING(if PF header file is installed) # hold on to your hats... if test "$ac_cv_header_net_pfvar_h" = "yes"; then - PF_TRANSPARENT="yes" - AC_DEFINE(PF_TRANSPARENT, 1) + PF_TRANSPARENT="yes" + AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address + redirection. This provides "masquerading" support for OpenBSD.]) else - PF_TRANSPARENT="no" - AC_DEFINE(PF_TRANSPARENT, 0) + PF_TRANSPARENT="no" + AC_DEFINE(PF_TRANSPARENT, 0, [Enable support for Transparent Proxy on systems using PF address + redirection. This provides "masquerading" support for OpenBSD.]) fi AC_MSG_RESULT($PF_TRANSPARENT) fi @@ -2038,23 +2665,44 @@ sleep 10 fi -dnl Linux-Netfilter support requires Linux 2.4 kernel header files. +dnl Linux-Netfilter support requires Linux 2.4 or newer kernel header files. dnl Shamelessly copied from above if test "$LINUX_NETFILTER" ; then - AC_MSG_CHECKING(if Linux 2.4 kernel header files are installed) + AC_MSG_CHECKING(if Linux 2.4 or newer kernel header files are installed) # hold on to your hats... if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes"; then - LINUX_NETFILTER="yes" - AC_DEFINE(LINUX_NETFILTER, 1) + LINUX_NETFILTER="yes" + AC_DEFINE(LINUX_NETFILTER, 1, [Enable support for Transparent Proxy on Linux (Netfilter) systems]) else - LINUX_NETFILTER="no" - AC_DEFINE(LINUX_NETFILTER, 0) + LINUX_NETFILTER="no" + AC_DEFINE(LINUX_NETFILTER, 0, [Enable support for Transparent Proxy on Linux (Netfilter) systems]) fi AC_MSG_RESULT($LINUX_NETFILTER) fi if test "$LINUX_NETFILTER" = "no" ; then - echo "WARNING: Cannot find necessary Linux 2.4 kernel header files" - echo " Linux 2.4 Transparent Proxy support WILL NOT be enabled" + echo "WARNING: Cannot find necessary Linux kernel header files" + echo " Linux Netfilter Transparent Proxy support WILL NOT be enabled" + sleep 10 +fi + +dnl Linux Netfilter/TPROXY support requires some specific header files +dnl Shamelessly copied from shamelessly copied from above +if test "$LINUX_TPROXY" ; then + AC_MSG_CHECKING(if TPROXY header files are installed) + # hold on to your hats... + if test "$ac_cv_header_linux_netfilter_ipv4_ip_tproxy_h" = "yes" && test "$LINUX_NETFILTER" = "yes"; then + LINUX_TPROXY="yes" + AC_DEFINE(LINUX_TPROXY, 1, [Enable real Transparent Proxy support for Netfilter TPROXY.]) + else + LINUX_TPROXY="no" + AC_DEFINE(LINUX_TPROXY, 0, [Enable real Transparent Proxy support for Netfilter TPROXY.]) + fi + AC_MSG_RESULT($LINUX_TPROXY) +fi +if test "$LINUX_TPROXY" = "no" && test "$LINUX_NETFILTER" = "yes"; then + echo "WARNING: Cannot find TPROXY headers, you need to install the" + echo "tproxy package from:" + echo " - lynx http://www.balabit.com/downloads/tproxy/" sleep 10 fi @@ -2083,7 +2731,7 @@ if test "$USE_GNUREGEX" = "yes"; then REGEXLIB="-lregex" LIBREGEX="libregex.a" - AC_DEFINE(USE_GNUREGEX) + AC_DEFINE(USE_GNUREGEX, 1, [Define if we should use GNU regex]) fi AC_SUBST(REGEXLIB) AC_SUBST(LIBREGEX) @@ -2123,7 +2771,25 @@ DEFAULT_FD_SETSIZE=256, DEFAULT_FD_SETSIZE=256) AC_MSG_RESULT($DEFAULT_FD_SETSIZE) -AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE) +AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, [Default FD_SETSIZE value]) + +AC_ARG_WITH(maxfd, +[ --with-maxfd=N Override maximum number of filedescriptors. Useful + if you build as another user who is not privileged + to use the number of filedescriptors you want the + resulting binary to support], +[ case $withval in + [[0-9]]*) + SQUID_MAXFD=$withval + echo "Maximum filedescriptors set to $SQUID_MAXFD" + ;; + *) + echo "ERROR: Invalid --with-maxfd argument" + exit 1 + ;; + esac +]) +if test -z "$SQUID_MAXFD"; then dnl Not cached since people are likely to tune this AC_MSG_CHECKING(Maximum number of filedescriptors we can open) @@ -2155,37 +2821,37 @@ struct rlimit rl; #if defined(RLIMIT_NOFILE) if (getrlimit(RLIMIT_NOFILE, &rl) < 0) { - perror("getrlimit: RLIMIT_NOFILE"); + perror("getrlimit: RLIMIT_NOFILE"); } else { - rl.rlim_cur = rl.rlim_max; /* set it to the max */ - if (setrlimit(RLIMIT_NOFILE, &rl) < 0) { - perror("setrlimit: RLIMIT_NOFILE"); - } + rl.rlim_cur = rl.rlim_max; /* set it to the max */ + if (setrlimit(RLIMIT_NOFILE, &rl) < 0) { + perror("setrlimit: RLIMIT_NOFILE"); + } } #elif defined(RLIMIT_OFILE) if (getrlimit(RLIMIT_OFILE, &rl) < 0) { - perror("getrlimit: RLIMIT_OFILE"); + perror("getrlimit: RLIMIT_OFILE"); } else { - rl.rlim_cur = rl.rlim_max; /* set it to the max */ - if (setrlimit(RLIMIT_OFILE, &rl) < 0) { - perror("setrlimit: RLIMIT_OFILE"); - } + rl.rlim_cur = rl.rlim_max; /* set it to the max */ + if (setrlimit(RLIMIT_OFILE, &rl) < 0) { + perror("setrlimit: RLIMIT_OFILE"); + } } #endif /* RLIMIT_NOFILE */ #endif /* HAVE_SETRLIMIT */ /* by starting at 2^14, we will never get higher than 2^15 for SQUID_MAXFD */ - i = j = 1<<14; - while (j) { - j >>= 1; - if (dup2(0, i) < 0) { - i -= j; - } else { - close(i); - i += j; - } - } - i++; + i = j = 1<<14; + while (j) { + j >>= 1; + if (dup2(0, i) < 0) { + i -= j; + } else { + close(i); + i += j; + } + } + i++; #endif /* IF !DEF CYGWIN */ fp = fopen("conftestval", "w"); fprintf (fp, "%d\n", i & ~0x3F); @@ -2195,8 +2861,15 @@ SQUID_MAXFD=`cat conftestval`, SQUID_MAXFD=256, SQUID_MAXFD=256) +dnl Microsoft MSVCRT.DLL supports 2048 maximum FDs +case "$host_os" in +mingw|mingw32) + SQUID_MAXFD="2048" + ;; +esac AC_MSG_RESULT($SQUID_MAXFD) -AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD) +fi # --with-maxfd SQUID_MAXFD +AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD, [Maximum number of open filedescriptors]) if test "$SQUID_MAXFD" -lt 512 ; then echo "WARNING: $SQUID_MAXFD may not be enough filedescriptors if your" echo " cache will be very busy. Please see the FAQ page" @@ -2217,12 +2890,12 @@ main () { FILE *fp; - int fd,val=0,len=sizeof(int); + int fd,val=0,len=sizeof(int); if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); + if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); if (val<=0) exit(1); - fp = fopen("conftestval", "w"); - fprintf (fp, "%d\n", val); + fp = fopen("conftestval", "w"); + fprintf (fp, "%d\n", val); exit(0); } ], @@ -2230,7 +2903,7 @@ SQUID_UDP_SO_SNDBUF=16384, SQUID_UDP_SO_SNDBUF=16384) AC_MSG_RESULT($SQUID_UDP_SO_SNDBUF) -AC_DEFINE_UNQUOTED(SQUID_UDP_SO_SNDBUF, $SQUID_UDP_SO_SNDBUF) +AC_DEFINE_UNQUOTED(SQUID_UDP_SO_SNDBUF, $SQUID_UDP_SO_SNDBUF, [UDP send buffer size]) dnl Not cached since people are likely to tune this AC_MSG_CHECKING(Default UDP receive buffer size) @@ -2243,9 +2916,9 @@ main () { FILE *fp; - int fd,val=0,len=sizeof(int); + int fd,val=0,len=sizeof(int); if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); + if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); if (val <= 0) exit(1); fp = fopen("conftestval", "w"); fprintf (fp, "%d\n", val); @@ -2256,7 +2929,7 @@ SQUID_UDP_SO_RCVBUF=16384, SQUID_UDP_SO_RCVBUF=16384) AC_MSG_RESULT($SQUID_UDP_SO_RCVBUF) -AC_DEFINE_UNQUOTED(SQUID_UDP_SO_RCVBUF, $SQUID_UDP_SO_RCVBUF) +AC_DEFINE_UNQUOTED(SQUID_UDP_SO_RCVBUF, $SQUID_UDP_SO_RCVBUF, [UDP receive buffer size]) dnl Not cached since people are likely to tune this AC_MSG_CHECKING(Default TCP send buffer size) @@ -2269,9 +2942,9 @@ main () { FILE *fp; - int fd,val=0,len=sizeof(int); + int fd,val=0,len=sizeof(int); if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); + if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) exit(1); if (val <= 0) exit(1); fp = fopen("conftestval", "w"); fprintf (fp, "%d\n", val); @@ -2286,7 +2959,7 @@ echo "Limiting send buffer size to 32K" SQUID_TCP_SO_SNDBUF=32768 fi -AC_DEFINE_UNQUOTED(SQUID_TCP_SO_SNDBUF, $SQUID_TCP_SO_SNDBUF) +AC_DEFINE_UNQUOTED(SQUID_TCP_SO_SNDBUF, $SQUID_TCP_SO_SNDBUF, [TCP send buffer size]) dnl Not cached since people are likely to tune this AC_MSG_CHECKING(Default TCP receive buffer size) @@ -2299,9 +2972,9 @@ main () { FILE *fp; - int fd,val=0,len=sizeof(int); + int fd,val=0,len=sizeof(int); if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1); - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); + if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) exit(1); if (val <= 0) exit(1); fp = fopen("conftestval", "w"); fprintf (fp, "%d\n", val); @@ -2316,23 +2989,16 @@ echo "Limiting receive buffer size to 64K" SQUID_TCP_SO_RCVBUF=65535 fi -AC_DEFINE_UNQUOTED(SQUID_TCP_SO_RCVBUF, $SQUID_TCP_SO_RCVBUF) +AC_DEFINE_UNQUOTED(SQUID_TCP_SO_RCVBUF, $SQUID_TCP_SO_RCVBUF, [TCP receive buffer size]) AC_CACHE_CHECK(if sys_errlist is already defined, ac_cv_needs_sys_errlist, AC_TRY_COMPILE([#include ],[char *s = sys_errlist;], ac_cv_needs_sys_errlist="no", ac_cv_needs_sys_errlist="yes") ) if test "$ac_cv_needs_sys_errlist" = "yes" ; then - AC_DEFINE(NEED_SYS_ERRLIST) + AC_DEFINE(NEED_SYS_ERRLIST, 1, [If we need to declare sys_errlist[] as external]) fi -dnl Not cached since people are likely to change this -AC_MSG_CHECKING(for libresolv _dns_ttl_ hack) -AC_TRY_LINK(extern int _dns_ttl_;,return _dns_ttl_;, -[AC_MSG_RESULT(yes) -AC_DEFINE(LIBRESOLV_DNS_TTL_HACK)], -AC_MSG_RESULT(no)) - AC_MSG_CHECKING(if inet_ntoa() actually works) AC_TRY_RUN([ #include @@ -2357,12 +3023,21 @@ AC_MSG_RESULT("yes") else AC_MSG_RESULT("no") - echo "Will use our own inet_ntoa()." - LIBOBJS="$LIBOBJS inet_ntoa.o" -# echo "WARNING: This looks bad, and probably prevents Squid from working." -# echo " If you're on IRIX and using GCC 2.8, you probably need" -# echo " to use the IRIX C compiler instead." -# sleep 10 + case "$host_os" in + mingw|mingw32) + echo "Using Win32 resolver instead." + ;; + *) + echo "Will use our own inet_ntoa()." + # autoconf-2.13 needs the lines below switched +# LIBOBJS="$LIBOBJS inet_ntoa.o" + AC_LIBOBJ(inet_ntoa) +# echo "WARNING: This looks bad, and probably prevents Squid from working." +# echo " If you're on IRIX and using GCC 2.8, you probably need" +# echo " to use the IRIX C compiler instead." +# sleep 10 + ;; + esac fi if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then @@ -2375,15 +3050,17 @@ ], [ struct statvfs sfs; -sfs.f_blocks = sfs.f_bfree = sfs.f_frsize = -sfs.f_files = sfs.f_ffree = 0; +fsblkcnt_t blocks; +fsfilcnt_t files; +blocks = sfs.f_blocks = sfs.f_bfree = sfs.f_frsize = 0; +files = sfs.f_files = sfs.f_ffree = 0; statvfs("/tmp", &sfs); ], ac_cv_func_statvfs=yes, ac_cv_func_statvfs=no) AC_MSG_RESULT($ac_cv_func_statvfs) if test "$ac_cv_func_statvfs" = "yes" ; then - AC_DEFINE(HAVE_STATVFS) + AC_DEFINE(HAVE_STATVFS, 1, [If your system has statvfs(), and if it actually works!]) fi fi @@ -2409,7 +3086,7 @@ ac_cv_have_res_nsaddr_list="yes", ac_cv_have_res_nsaddr_list="no")) if test $ac_cv_have_res_nsaddr_list = "yes" ; then - AC_DEFINE(HAVE_RES_NSADDR_LIST) + AC_DEFINE(HAVE_RES_NSADDR_LIST, 1, [If _res structure has nsaddr_list member]) fi if test $ac_cv_have_res_nsaddr_list = "no" ; then @@ -2435,7 +3112,7 @@ ac_cv_have_res_ns_list="yes", ac_cv_have_res_ns_list="no")) if test $ac_cv_have_res_ns_list = "yes" ; then - AC_DEFINE(HAVE_RES_NS_LIST) + AC_DEFINE(HAVE_RES_NS_LIST, 1, [If _res structure has ns_list member]) fi fi @@ -2487,37 +3164,19 @@ dnl done -dnl src/fs/aufs/Makefile \ -dnl src/fs/coss/Makefile \ -dnl src/fs/diskd/Makefile \ -dnl src/fs/null/Makefile \ -dnl src/fs/ufs/Makefile \ -dnl src/repl/heap/Makefile \ -dnl src/repl/lru/Makefile \ AC_OUTPUT([\ Makefile \ lib/Makefile \ scripts/Makefile \ scripts/RunCache \ - scripts/RunAccel \ src/Makefile \ src/fs/Makefile \ src/repl/Makefile \ src/auth/Makefile \ - src/auth/basic/Makefile \ - src/auth/digest/Makefile \ - src/auth/ntlm/Makefile \ contrib/Makefile \ snmplib/Makefile \ icons/Makefile \ errors/Makefile \ - src/fs/aufs/Makefile \ - src/fs/coss/Makefile \ - src/fs/diskd/Makefile \ - src/fs/null/Makefile \ - src/fs/ufs/Makefile \ - src/repl/heap/Makefile \ - src/repl/lru/Makefile \ doc/Makefile \ helpers/Makefile \ helpers/basic_auth/Makefile \ @@ -2528,21 +3187,30 @@ helpers/basic_auth/SMB/Makefile \ helpers/basic_auth/YP/Makefile \ helpers/basic_auth/getpwnam/Makefile \ + helpers/basic_auth/mswin_sspi/Makefile \ helpers/basic_auth/multi-domain-NTLM/Makefile \ helpers/basic_auth/SASL/Makefile \ - helpers/basic_auth/winbind/Makefile \ + helpers/basic_auth/POP3/Makefile \ + helpers/basic_auth/DB/Makefile \ helpers/digest_auth/Makefile \ helpers/digest_auth/password/Makefile \ + helpers/digest_auth/ldap/Makefile \ + helpers/digest_auth/eDirectory/Makefile \ helpers/ntlm_auth/Makefile \ helpers/ntlm_auth/fakeauth/Makefile \ + helpers/ntlm_auth/mswin_sspi/Makefile \ helpers/ntlm_auth/no_check/Makefile \ helpers/ntlm_auth/SMB/Makefile \ helpers/ntlm_auth/SMB/smbval/Makefile \ - helpers/ntlm_auth/winbind/Makefile \ + helpers/negotiate_auth/Makefile \ + helpers/negotiate_auth/mswin_sspi/Makefile \ + helpers/negotiate_auth/squid_kerb_auth/Makefile \ helpers/external_acl/Makefile \ helpers/external_acl/ip_user/Makefile \ helpers/external_acl/ldap_group/Makefile \ + helpers/external_acl/mswin_lm_group/Makefile \ + helpers/external_acl/session/Makefile \ helpers/external_acl/unix_group/Makefile \ helpers/external_acl/wbinfo_group/Makefile \ - helpers/external_acl/winbind_group/Makefile \ + tools/Makefile \ ]) Index: squid/mkrelease.sh =================================================================== RCS file: /cvsroot/squid-sf//squid/mkrelease.sh,v retrieving revision 1.7.18.1 retrieving revision 1.7.18.2 diff -u -r1.7.18.1 -r1.7.18.2 --- squid/mkrelease.sh 10 Feb 2005 02:40:03 -0000 1.7.18.1 +++ squid/mkrelease.sh 30 Jun 2007 09:09:59 -0000 1.7.18.2 @@ -68,5 +68,10 @@ s/"ChangeLog"/"ChangeLog.txt"/g; ' > $tmpdir/RELEASENOTES.html touch -r $tmpdir/doc/release-notes/release-$RELEASE.html $tmpdir/RELEASENOTES.html - inst $tmpdir/RELEASENOTES.html $dst/RELEASENOTES.html + inst $tmpdir/RELEASENOTES.html $dst/${name}-RELEASENOTES.html + ln -sf ${name}-RELEASENOTES.html $dst/RELEASENOTES.html +fi +if [ -f $dst/changesets/index.html ]; then + rm -f $dst/changesets/$tag.html + $dst/changesets/.update fi Index: squid/mksnapshot.sh =================================================================== RCS file: /cvsroot/squid-sf//squid/mksnapshot.sh,v retrieving revision 1.6.18.1 retrieving revision 1.6.18.2 diff -u -r1.6.18.1 -r1.6.18.2 --- squid/mksnapshot.sh 10 Feb 2005 02:40:03 -0000 1.6.18.1 +++ squid/mksnapshot.sh 30 Jun 2007 09:09:59 -0000 1.6.18.2 @@ -47,6 +47,10 @@ else cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff fi +elif [ -f STABLE_BRANCH ]; then + stable=`cat STABLE_BRANCH` + echo "Differences from ${stable} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff + cvs -q rdiff -u -r $stable -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff fi cd $startdir @@ -70,3 +74,14 @@ fi cp -p $tmpdir/ChangeLog ${PACKAGE}-${VERSION}-${date}-ChangeLog.txt echo ${PACKAGE}-${VERSION}-${date}-ChangeLog.txt >>${tag}.out + +if [ -x $tmpdir/scripts/www/build-cfg-help.pl ]; then + make -C $tmpdir/src cf.data + mkdir -p $tmpdir/doc/cfgman + $tmpdir/scripts/www/build-cfg-help.pl -o $tmpdir/doc/cfgman $tmpdir/src/cf.data + sh -c "cd $tmpdir/doc/cfgman && tar -zcf $PWD/${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz *" + echo ${PACKAGE}-${VERSION}-${date}-cfgman.tar.gz >>${tag}.out + $tmpdir/scripts/www/build-cfg-help.pl -o ${PACKAGE}-${VERSION}-${date}-cfgman.html -f singlehtml $tmpdir/src/cf.data + gzip -f -9 ${PACKAGE}-${VERSION}-${date}-cfgman.html + echo ${PACKAGE}-${VERSION}-${date}-cfgman.html.gz >>${tag}.out +fi Index: squid/doc/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/Makefile.am,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -u -r1.4.4.1 -r1.4.4.2 --- squid/doc/Makefile.am 10 Feb 2005 02:40:04 -0000 1.4.4.1 +++ squid/doc/Makefile.am 30 Jun 2007 09:10:00 -0000 1.4.4.2 @@ -6,9 +6,34 @@ # Uncomment and customize the following to suit your needs: # +DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf +DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf +DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf +DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ + +SUBSTITUTE=sed "\ + s%@DEFAULT_CONFIG_FILE@%$(DEFAULT_CONFIG_FILE)%g;\ + s%@DEFAULT_CACHEMGR_CONFIG@%$(DEFAULT_CACHEMGR_CONFIG)%g;\ + s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ + s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%@""PACKAGE_STRING""@%$(PACKAGE_STRING)%g;\ + " + +squid.8: $(srcdir)/squid.8.in Makefile + $(SUBSTITUTE) < $(srcdir)/squid.8.in > $@ + +cachemgr.cgi.8: $(srcdir)/cachemgr.cgi.8.in Makefile + $(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@ + man_MANS = \ - squid.8 + squid.8 \ + cachemgr.cgi.8 EXTRA_DIST = \ - squid.8 \ + squid.8.in \ + cachemgr.cgi.8.in \ debug-sections.txt + +CLEANFILES = \ + squid.8 \ + cachemgr.cgi.8 Index: squid/doc/Programming-Guide/prog-guide.sgml =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/Programming-Guide/prog-guide.sgml,v retrieving revision 1.3.6.5 retrieving revision 1.3.6.6 diff -u -r1.3.6.5 -r1.3.6.6 --- squid/doc/Programming-Guide/prog-guide.sgml 10 Feb 2005 02:40:04 -0000 1.3.6.5 +++ squid/doc/Programming-Guide/prog-guide.sgml 30 Jun 2007 09:10:00 -0000 1.3.6.6 @@ -2,7 +2,7 @@
Squid Programmers Guide Squid Developers -$Id: prog-guide.sgml,v 1.3.6.5 2005/02/10 02:40:04 hno Exp $ +$Id: prog-guide.sgml,v 1.3.6.6 2007/06/30 09:10:00 amosjeffries Exp $ Squid is a WWW Cache application developed by the National Laboratory @@ -1254,7 +1254,7 @@

void - storeWrite(storeIOState *sio, char *buf, size_t size, off_t offset, FREE *free_func) + storeWrite(storeIOState *sio, char *buf, size_t size, FREE *free_func)

@@ -1338,8 +1338,10 @@

If a write operation fails, the filesystem layer notifies the calling module by calling the + Only sequential writes is supported, starting at offset 0. storeUnlink() @@ -1386,9 +1388,9 @@

The +2GB objects. As STORE_META_STD except that the swap_file_sz + is a squid_file_sz (64-bit integer) instead of size_t. + Index: squid/doc/release-notes/Makefile =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/release-notes/Makefile,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -u -r1.4.6.1 -r1.4.6.2 --- squid/doc/release-notes/Makefile 10 Feb 2005 02:40:05 -0000 1.4.6.1 +++ squid/doc/release-notes/Makefile 30 Jun 2007 09:10:00 -0000 1.4.6.2 @@ -1,6 +1,11 @@ -DOC = release-2.5 +DOC = release-2.6 -all: $(DOC).html $(DOC).ps +all: html + +.PHONY: html ps + +html: $(DOC).html +ps: $(DOC).ps $(DOC).ps: $(DOC).sgml linuxdoc -B latex -o ps $(DOC) @@ -12,10 +17,12 @@ # $(DOC).txt: $(DOC).sgml - linuxdoc -B txt --filter $(DOC) + linuxdoc -B txt -T 2 --filter $(DOC) $(DOC).html: $(DOC).sgml - linuxdoc -B html --split=0 $(DOC) + linuxdoc -B html -T 2 --split=0 $(DOC) + perl -i -p -e "s%$(DOC).html%%" $(DOC).html + perl -i -p -e 's%Bug #(\d+)%Bug #$$1%g' $(DOC).html $(DOC).man: $(DOC).sgml linuxdoc -B txt -m $(DOC) Index: squid/errors/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Makefile.am,v retrieving revision 1.2.26.2 retrieving revision 1.2.26.3 diff -u -r1.2.26.2 -r1.2.26.3 --- squid/errors/Makefile.am 10 Feb 2005 02:40:07 -0000 1.2.26.2 +++ squid/errors/Makefile.am 30 Jun 2007 09:10:00 -0000 1.2.26.3 @@ -12,6 +12,7 @@ INSTALL_LANGUAGES = @ERR_LANGUAGES@ LANGUAGES = \ + Azerbaijani \ Bulgarian \ Catalan \ Czech \ @@ -22,6 +23,7 @@ Finnish \ French \ German \ + Greek \ Hebrew \ Hungarian \ Italian \ Index: squid/errors/Czech/ERR_SHUTTING_DOWN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Czech/ERR_SHUTTING_DOWN,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Czech/ERR_SHUTTING_DOWN 10 Feb 2005 02:40:08 -0000 1.1.1.2.32.1 +++ squid/errors/Czech/ERR_SHUTTING_DOWN 30 Jun 2007 09:10:01 -0000 1.1.1.2.32.2 @@ -1,23 +1,23 @@ - - -CHYBA: Pozadovany dokument je nedostupny + + +CHYBA: Pozadovany dokument je nedostupny - -

CHYBA

-

Požadovaný dokument je nedostupný

-
-

-Při pokusu o přístup k: -%U -

-se objevila následující chyba: -

-

    -
  • - -Tento cache server je právě restartován a nemůže obsloužit Váš požadavek. -Zkuste to za chvíli znova. - -
-

+ +

CHYBA

+

Požadovaný dokument je nedostupný

+
+

+Při pokusu o přístup k: +%U +

+se objevila následující chyba: +

+

    +
  • + +Tento cache server je právě restartován a nemůže obsloužit Váš požadavek. +Zkuste to za chvíli znova. + +
+

Index: squid/errors/English/ERR_CONNECT_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/English/ERR_CONNECT_FAIL,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/English/ERR_CONNECT_FAIL 10 Feb 2005 02:40:11 -0000 1.1.1.2.32.1 +++ squid/errors/English/ERR_CONNECT_FAIL 30 Jun 2007 09:10:01 -0000 1.1.1.2.32.2 @@ -14,7 +14,7 @@
  • -Connection Failed +Connection to %I Failed
Index: squid/errors/Italian/ERR_CONNECT_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Italian/ERR_CONNECT_FAIL,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Italian/ERR_CONNECT_FAIL 10 Feb 2005 02:40:17 -0000 1.1.1.1.42.1 +++ squid/errors/Italian/ERR_CONNECT_FAIL 30 Jun 2007 09:10:01 -0000 1.1.1.1.42.2 @@ -14,7 +14,7 @@
  • -Collegamento fallito +Collegamento a %I fallito
Index: squid/errors/Italian/ERR_TOO_BIG =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Italian/ERR_TOO_BIG,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Italian/ERR_TOO_BIG 10 Feb 2005 02:40:18 -0000 1.1.1.1.32.1 +++ squid/errors/Italian/ERR_TOO_BIG 30 Jun 2007 09:10:01 -0000 1.1.1.1.32.2 @@ -1,28 +1,28 @@ -ERROR: The requested URL could not be retrieved +ERRORE: La URL richiesta non può essere recuperata -

ERROR

-

The requested URL could not be retrieved

+

ERRORE

+

La URL richiesta non può essere recuperata

-While trying to retrieve the URL: +Mentre si cercava di recuperare la URL: %U

-The following error was encountered: +È avvenuto il seguente errore:

  • -The request or reply is too large. +La richiesta o la risposta è troppo grande.

    -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. +Se state eseguendo una richiesta POST o PUT, allora il corpo della richiesta +(l'oggetto di cui state tendando l'upload) è troppo grande. Se state +eseguendo una richiesta GET, allora il corpo della risposta (l'oggetto di cui +state tendando il download) è troppo grande. Questi limiti sono stati +impostati dal gestore di questa cache. Se ritenete che questo sia un errore +siete pregati di contattarlo direttamente.

-Your cache administrator is %w. +L'amministratore di questa cache è %w. Index: squid/errors/Portuguese/ERR_CANNOT_FORWARD =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Portuguese/ERR_CANNOT_FORWARD,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Portuguese/ERR_CANNOT_FORWARD 10 Feb 2005 02:40:20 -0000 1.1.1.1.42.1 +++ squid/errors/Portuguese/ERR_CANNOT_FORWARD 30 Jun 2007 09:10:01 -0000 1.1.1.1.42.2 @@ -16,12 +16,12 @@

  • -Cache incapaz de encaminhar esta requsição neste momento. +Cache incapaz de encaminhar esta requisição neste momento.

-Esta requsição não pode ser encaminhada para o servidor ou +Esta requisição não pode ser encaminhada para o servidor ou para qualquer outro cache. A causa mais provável para este erro é:

  • O administrador do cache não permite que este cache faça Index: squid/errors/Romanian/ERR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_ACCESS_DENIED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_ACCESS_DENIED 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_ACCESS_DENIED 30 Jun 2007 09:10:03 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -18,9 +17,8 @@ Accesul refuzat.

    -Controlul accesului a prevenit cererea d-voastră -de a fi acceptată la acest moment. Vă rugăm contactaţi -providerul d-voastră daca credeţi că acest lucru -este incorect. +Controlul accesului a prevenit cererea d-voastră de a fi +acceptată la acest moment. Vă rugăm contactaţi providerul +d-voastră daca credeţi că acest lucru este incorect.

-

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED,v retrieving revision 1.1.1.1.32.2 retrieving revision 1.1.1.1.32.3 diff -u -r1.1.1.1.32.2 -r1.1.1.1.32.3 --- squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.2 +++ squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.3 @@ -1,11 +1,10 @@ - -EROARE: URL-ul cerut nu a putut fi citit - + +EROARE: Accesul la cache vă este refuzat -

ERROR

-

URL-ul cerut nu a putut fi citit

+

EROARE

+

Accesul la cache vă este refuzat

În timp ce citeam URL-ul: @@ -22,11 +21,11 @@

Ne pare rău, dar nu sunteţi îndreptăţit să accesaţi: 

    %U
-din acest cache pana cand nu v-aţi autenticat. +din acest cache până când nu v-aţi autenticat.

-Aveti nevoie de Netscape versiunea 2.0 sau mai mare, sau Microsoft +Aveţi 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 Index: squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,11 +1,10 @@ - + EROARE: Accesul interzis la Managerul Cache-ului - -

ERROR

+

EROARE

Accesul interzis la Managerul Cache-ului

@@ -16,22 +15,21 @@

  • -Accesul interzis la Managerul Cache-ului +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. +din acest cache până când nu v-aţi autenticat.

-Aveti nevoie de Netscape versiunea 2.0 sau mai mare, sau Microsoft +Aveţi 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. -

Index: squid/errors/Romanian/ERR_CANNOT_FORWARD =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_CANNOT_FORWARD,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_CANNOT_FORWARD 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_CANNOT_FORWARD 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -25,6 +24,6 @@

  • 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. +
  • Nici un cache părinte nu poate fi contactat în acest moment.
-

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_CONNECT_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_CONNECT_FAIL,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_CONNECT_FAIL 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_CONNECT_FAIL 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -25,5 +24,5 @@

Calculatorul sau reţeaua destinaţie s-ar putea să fie inoperabile. -Repetaţi cererea mai târziu. -

+Vă rog repetaţi cererea. +

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_DNS_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_DNS_FAIL,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_DNS_FAIL 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_DNS_FAIL 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -16,7 +15,6 @@ Nu pot determina adresa IP din numele host-ului pentru %H -

Serverul de DNS a returnat: @@ -30,4 +28,4 @@ Cache-ul nu a putut rezolva numele host-ului scris în URL. Verificaţi dacă adresa este corectă. -

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FORWARDING_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FORWARDING_DENIED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FORWARDING_DENIED 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FORWARDING_DENIED 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -23,4 +22,4 @@ 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. -

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_DISABLED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_DISABLED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FTP_DISABLED 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FTP_DISABLED 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -21,4 +20,4 @@

Acest cache nu suportă protocolul FTP. -

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_FAILURE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_FAILURE,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FTP_FAILURE 10 Feb 2005 02:40:20 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FTP_FAILURE 30 Jun 2007 09:10:04 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -17,9 +16,4 @@ ş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. -

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_FORBIDDEN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_FORBIDDEN,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.2 diff -u -r1.2.8.1 -r1.2.8.2 --- squid/errors/Romanian/ERR_FTP_FORBIDDEN 10 Feb 2005 02:40:20 -0000 1.2.8.1 +++ squid/errors/Romanian/ERR_FTP_FORBIDDEN 30 Jun 2007 09:10:04 -0000 1.2.8.2 @@ -1,19 +1,19 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

ERROR

-

The requested URL could not be retrieved

+

EROARE

+

URL-ul cerut nu a putut fi citit

-An FTP authentication failure occurred -while trying to retrieve the URL: +O eroare de autentificare FTP s-a întâmplat +în timp ce încercam să citesc URL-ul: %U

-Squid sent the following FTP command: +Squid a trimis următoarea comandă FTP: 

%f
-and then received this reply +şi apoi a primit această replică 
%F
%g
-

Your cache administrator is %w. +

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_NOT_FOUND =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_NOT_FOUND,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.2 diff -u -r1.2.8.1 -r1.2.8.2 --- squid/errors/Romanian/ERR_FTP_NOT_FOUND 10 Feb 2005 02:40:21 -0000 1.2.8.1 +++ squid/errors/Romanian/ERR_FTP_NOT_FOUND 30 Jun 2007 09:10:04 -0000 1.2.8.2 @@ -1,22 +1,23 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

ERROR

-

The requested URL could not be retrieved

+

EROARE

+

URL-ul cerut nu a putut fi citit

-The following URL could not be retrieved: +Următorul URL nu a putut fi citit: %U

-Squid sent the following FTP command: +Squid a trimis următoarea comandă FTP: 

%f
-and then received this reply +şi apoi a primit această replică 
%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. +Acest lucru ar putea fi cauzat de un URL FTP cu o cale absolută +(fapt care nu este conform cu standardul RFC 1738). Dacă aceasta +este cauza, atunci fişierul poate fi găsit la adresa +%B. +

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_PUT_CREATED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_PUT_CREATED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FTP_PUT_CREATED 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FTP_PUT_CREATED 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,12 +1,8 @@ - + Comanda FTP PUT a reuşit: Fişierul a fost creat -

Operaţiune reuşităl

Fişierul a fost creat

-

-

- Index: squid/errors/Romanian/ERR_FTP_PUT_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_PUT_ERROR,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FTP_PUT_ERROR 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FTP_PUT_ERROR 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: Trimiterea de fişier prin FTP a eşuat - -

ERROR

+

EROARE

Comanda FTP PUT/trimiterea a eşuat

@@ -25,4 +24,4 @@ Verificaţi calea, drepturile, spaţiul liber şi încercaţi din nou. -

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_FTP_PUT_MODIFIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_PUT_MODIFIED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_FTP_PUT_MODIFIED 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_FTP_PUT_MODIFIED 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,11 +1,8 @@ - + Comanda FTP PUT a reuşit: Fişierul a fost modificat

Operaţiune reuşită

-

Fişier modificat

+

Fişier actualizat

-

-

- Index: squid/errors/Romanian/ERR_FTP_UNAVAILABLE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_FTP_UNAVAILABLE,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.2 diff -u -r1.2.8.1 -r1.2.8.2 --- squid/errors/Romanian/ERR_FTP_UNAVAILABLE 10 Feb 2005 02:40:21 -0000 1.2.8.1 +++ squid/errors/Romanian/ERR_FTP_UNAVAILABLE 30 Jun 2007 09:10:05 -0000 1.2.8.2 @@ -1,18 +1,19 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

ERROR

-

The requested URL could not be retrieved

+

EROARE

+

URL-ul cerut nu a putut fi citit

-The FTP server was too busy while trying to retrieve the URL: +Serverul de FTP a fost prea ocupat în timp ce am încercat să +citesc URL-ul: %U

-Squid sent the following FTP command: +Squid a trimis următoarea comandă FTP: 

%f
-and then received this reply +şi apoi a primit această replică 
%F
%g
-

Your cache administrator is %w. +

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_INVALID_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_INVALID_REQ,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_INVALID_REQ 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_INVALID_REQ 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,15 +1,16 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

-În timp ce citeam URL-ul: -%U +În timp ce încercam să procesez cererea: +

+%R
+

Am întâlnit următoarea eroare:

    @@ -29,4 +30,4 @@
  • Câmpul Content-Length lipseşte pentru cereri POST sau PUT
  • Caracter(e) ilegal în numele calculatorului; underscore (_) nu este acceptat
-

+

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_INVALID_RESP =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_INVALID_RESP,v retrieving revision 1.1.10.1 retrieving revision 1.1.10.2 diff -u -r1.1.10.1 -r1.1.10.2 --- squid/errors/Romanian/ERR_INVALID_RESP 10 Feb 2005 02:40:21 -0000 1.1.10.1 +++ squid/errors/Romanian/ERR_INVALID_RESP 30 Jun 2007 09:10:05 -0000 1.1.10.2 @@ -1,29 +1,30 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

ERROR

-

The requested URL could not be retrieved

+

EROARE

+

URL-ul cerut nu a putut fi citit

-While trying to process the request: +În timp ce încercam să procesez cererea: 

 %R

-The following error was encountered: +Am întâlnit următoarea eroare:

  • -Invalid Response +Răspuns invalid

-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. +Mesajul de răspuns HTTP primit de la serverul contactat +nu a putut fi înţeles sau a fost deformat. Vă rog să contactaţi +operatorul serverului. Administratorul proxy-ului s-ar putea +să vă fie de ajutor cu mai multe detalii despre natura exactă a +aceastei probleme dacă vă este necesar. -

Your cache administrator is %w. +

Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_INVALID_URL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_INVALID_URL,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_INVALID_URL 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_INVALID_URL 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

ERROR

+

EROARE

URL-ul cerut nu a putut fi citit

@@ -27,4 +26,4 @@

  • Caracterul escape-dublu este ilegal în calea URL
  • Caracter(e) ilegal în numele calculatorului; underscore (_) nu este acceptat -

    +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_LIFETIME_EXP =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_LIFETIME_EXP,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_LIFETIME_EXP 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_LIFETIME_EXP 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -15,11 +14,11 @@

    • -Durate de viaţă a conexiunii a expirat +Durata de viaţă a conexiunii a expirat

    Squid a terminat conexiunea din cauză că a depăşit durata maximă admisă pentru o conexiune. -

    +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_NO_RELAY =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_NO_RELAY,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_NO_RELAY 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_NO_RELAY 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -21,4 +20,4 @@

    Nu este definit nici un calculator relay Wais pentru acest cache! Strigaţi la administrator! -

    +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -15,15 +14,17 @@

    • -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) +Un document valid 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 + +Aţi cerut un document cu directiva de control only-if-cached (numai dacă există deja în cache). Documentul nu a fost găsit în -cache, sau a necesitat o revalidare, revalidare interzisă +cache, sau a necesitat o revalidare interzisă de directivaonly-if-cached. -

    + +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_READ_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_READ_ERROR,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_READ_ERROR 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_READ_ERROR 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -26,4 +25,4 @@

    O condiţie de eroare în timp ce citeam date din reţea. Vă rog retrimiteţi cererea. -

    +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_READ_TIMEOUT =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_READ_TIMEOUT,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_READ_TIMEOUT 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_READ_TIMEOUT 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

    ERROR

    +

    EROARE

    URL-ul cerut nu a putut fi citit

    @@ -27,4 +26,4 @@ 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. -

    +

    Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_SHUTTING_DOWN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_SHUTTING_DOWN,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_SHUTTING_DOWN 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_SHUTTING_DOWN 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,19 +1,18 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

    ERROR

    -

    The requested URL could not be retrieved

    +

    EROARE

    +

    URL-ul cerut nu a putut fi citit

    -While trying to retrieve the URL: +În timp ce citeam URL-ul: %U

    -The following error was encountered: -

      +Am întâlnit următoarea eroare:

      -This cache is in the process of shutting down and can not -service your request at this time. Please retry your -request again soon. -

      +Acest cache este în curs de oprire şi nu poate servi +cererea d-voastră în acest moment. Vă rog să reîncercaţi +în curând. +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_SOCKET_FAILURE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_SOCKET_FAILURE,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_SOCKET_FAILURE 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_SOCKET_FAILURE 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

      ERROR

      +

      EROARE

      URL-ul cerut nu a putut fi citit

      @@ -25,5 +24,5 @@

      Squid nu a reuşit să creeze un socket TCP, probabil din cauza încărcării -excesive. Încercaţi mai târziu. -

      +excesive. Încercaţi mai târziu. +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_TOO_BIG =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_TOO_BIG,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_TOO_BIG 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_TOO_BIG 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,28 +1,29 @@ - -ERROR: The requested URL could not be retrieved + +EROARE: URL-ul cerut nu a putut fi citit -

      ERROR

      -

      The requested URL could not be retrieved

      +

      EROARE

      +

      URL-ul cerut nu a putut fi citit

      -While trying to retrieve the URL: +În timp ce citeam URL-ul: %U

      -The following error was encountered: +Am întâlnit următoarea eroare:

      • -The request or reply is too large. +Cererea sau răspunsul sunt prea mari.

        -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. +Dacă faceţi o cerere de tipul POST sau PUT, atunci conţinutul +cererii d-voastre (datele care încercaţi să le trimiteţi) sunt +prea mari. Dacă faceţi o cerere de tipul GET, atunci răspunsul +serverului (ceaa ce încercaţi să aduceţi) este prea mare. Aceste +limite au fost stabilite de către providerul de internet (ISP-ul) +care administrează acest cache. Va rugăm să îi contactaţi direct +dacă consideraţi că acest lucru este o eroare.

      -Your cache administrator is %w. +Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_UNSUP_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_UNSUP_REQ,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_UNSUP_REQ 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_UNSUP_REQ 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

      ERROR

      +

      EROARE

      URL-ul cerut nu a putut fi citit

      @@ -22,4 +21,4 @@

      Squid nu suportă toate cererile sub toate protocoalele. De exemplu, nu puteţi să POST o cerere Gopher. -

      +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_URN_RESOLVE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_URN_RESOLVE,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_URN_RESOLVE 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_URN_RESOLVE 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,14 +1,13 @@ - -EROARE: URL-ul cerut nu a putut fi citit - + +EROARE: URN-ul cerut nu a putut fi citit -

      ERROR

      -

      URL-ul cerut nu a putut fi citit

      +

      EROARE

      +

      Un URL pentru URN-ul cerut nu a putut fi citit

      -În timp ce citeam URL-ul: +În timp ce citeam URN-ul: %U

      Am întâlnit următoarea eroare: @@ -21,4 +20,4 @@

      Hei, nu te aştepta la prea multe de la URN-uri pe %T :) -

      +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_WRITE_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_WRITE_ERROR,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_WRITE_ERROR 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_WRITE_ERROR 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

      ERROR

      +

      EROARE

      URL-ul cerut nu a putut fi citit

      @@ -24,6 +23,6 @@ 

          %E

      -O condiţie de eroare a survenit în timp ce scriam date în reţea. Reîncercaţi -operaţia. -

      +O condiţie de eroare a survenit în timp ce scriam date în reţea. Vă rog +reîncercaţi operaţia. +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT 10 Feb 2005 02:40:21 -0000 1.1.1.1.32.1 +++ squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.2 @@ -1,10 +1,9 @@ - + EROARE: URL-ul cerut nu a putut fi citit - -

      ERROR

      +

      EROARE

      URL-ul cerut nu a putut fi citit

      @@ -21,4 +20,4 @@

      Squid nu a recepţionat nici o informaţie ca urmare a acestei cereri. -

      +

      Administratorul cache-ului d-voastră este %w. Index: squid/errors/Romanian/README =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Romanian/README,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.32.1 diff -u -r1.1.1.1 -r1.1.1.1.32.1 --- squid/errors/Romanian/README 26 Jan 2000 03:25:00 -0000 1.1.1.1 +++ squid/errors/Romanian/README 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.1 @@ -1,2 +1,2 @@ -Thank you to Iusty Pop Daniel for +Thank you to Iustin Pop Daniel for creating these error pages in Romanian! Index: squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED,v retrieving revision 1.1.1.1.32.2 retrieving revision 1.1.1.1.32.3 diff -u -r1.1.1.1.32.2 -r1.1.1.1.32.3 --- squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED 10 Feb 2005 02:40:43 -0000 1.1.1.1.32.2 +++ squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED 30 Jun 2007 09:10:05 -0000 1.1.1.1.32.3 @@ -1,11 +1,11 @@ -ERROR: Acceso Denegado al Cache +ERROR: Acceso Denegado al Caché

      ERROR

      -

      Acceso Denegado al Cache

      +

      Acceso Denegado al Caché

      Mientras se intentaba traer el URL: @@ -15,20 +15,20 @@

      • -Acceso denegado al cache. +Acceso denegado al caché.

      Disculpe, Ud. no está autorizado a acceder a: 

          %U
      -desde este cache hasta que se haya autenticado. +desde este caché hasta que se haya autenticado.

      -Ud. necesita utilizar Netscape version 2.0 o superior, o Microsoft Internet -Explorer 3.0, o un navegador que cumpla con HTTP/1.1 para que funcione. -Por favor contacte al administrador del cache si +Ud. necesita utilizar Netscape versión 2.0 o superior, o Microsoft +Internet Explorer 3.0, o un navegador que cumpla con HTTP/1.1 para que funcione. +Por favor contacte al administrador del caché si tiene dificultad para autenticarse o cambie su password.

      Index: squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED,v retrieving revision 1.1.1.1.32.1 retrieving revision 1.1.1.1.32.2 diff -u -r1.1.1.1.32.1 -r1.1.1.1.32.2 --- squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED 10 Feb 2005 02:40:43 -0000 1.1.1.1.32.1 +++ squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED 30 Jun 2007 09:10:06 -0000 1.1.1.1.32.2 @@ -1,6 +1,6 @@ -ERROR: Acceso Denegado al Cache Manager +ERROR: Acceso Denegado al Caché Manager @@ -21,13 +21,13 @@

      Disculpe, Ud. no está autorizado a acceder a: 

          %U
      -desde este cache hasta que se haya autenticado. +desde este caché hasta que se haya autenticado.

      -Ud. necesita utilizar Netscape version 2.0 o superior, o Microsoft Internet -Explorer 3.0, o un navegador que cumpla con HTTP/1.1 para que funcione. -Por favor contacte al administrador del cache si +Ud. necesita utilizar Netscape versión 2.0 o superior, o Microsoft +Internet Explorer 3.0, o un navegador que cumpla con HTTP/1.1 para que funcione. +Por favor contacte al administrador del caché si tiene dificultad para autenticarse, o si Ud. es el administrador, lea la documentación de Squid sobre interfaz del cache manager y -chequee en el log de cache mensajes de error más detallados. +chequee en el log de caché mensajes de error más detallados.

      Index: squid/errors/Spanish/ERR_CANNOT_FORWARD =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_CANNOT_FORWARD,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_CANNOT_FORWARD 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_CANNOT_FORWARD 30 Jun 2007 09:10:08 -0000 1.1.1.2.32.2 @@ -19,13 +19,13 @@

    -La petición no ha podido ser enviada al servidor origen o a alguna -de las cachés padres. Las razones más probables de que haya +La petición no ha podido ser enviada al servidor origen o a alguno +de los cachés padres. Las razones más probables de que haya ocurrido este error son:

      -
    • El administrador de la caché no permite que esta +
    • El administrador de lo caché no permite que este caché realice conexiones directas a los servidores origen, y -
    • Todas las cachés configuradas como padres son inalcanzables +
    • Todos los cachés configurados como padres son inalcanzables en este momento.
    Index: squid/errors/Spanish/ERR_DNS_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_DNS_FAIL,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_DNS_FAIL 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_DNS_FAIL 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -12,7 +12,7 @@ Ha ocurrido el siguiente problema:
    Incapaz de determinar la dirección IP a partir -del nombre de la máquina: +del nombre de la máquina: %H
    @@ -25,7 +25,7 @@

    Esto significa que: 

    - La caché no ha sido capaz de resolver el nombre de máquina
+ El caché no ha sido capaz de resolver el nombre de máquina
  presente en la URL.
  Compruebe que la dirección sea correcta.
    Index: squid/errors/Spanish/ERR_FORWARDING_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_FORWARDING_DENIED,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_FORWARDING_DENIED 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_FORWARDING_DENIED 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -19,7 +19,7 @@

    -Esta caché no permite reenviar su petición porque trata de +Este caché no permite reenviar su petición porque trata de obligar a mantener una relación de hermandad. -Quizás el cliente en %i es una caché que ha sido mal configurada. +Quizás el cliente en %i es un caché que ha sido mal configurado.

    Index: squid/errors/Spanish/ERR_FTP_DISABLED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_FTP_DISABLED,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_FTP_DISABLED 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_FTP_DISABLED 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -19,5 +19,5 @@

    -Esta caché no proporciona servicio caché para el protocolo FTP. +Este caché no proporciona servicio caché para el protocolo FTP.

    Index: squid/errors/Spanish/ERR_FTP_NOT_FOUND =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_FTP_NOT_FOUND,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_FTP_NOT_FOUND 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_FTP_NOT_FOUND 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -17,7 +17,7 @@ 
    %g

    Esto puede ser causado por un URL FTP con un camino absoluto (y por -lo tanto no cumple con RFC 1738). Si este es la causa, entonces el +lo tanto no cumple con RFC 1738). Si esta es la causa, entonces el archivo puede ser obtenido en %B.

    Index: squid/errors/Spanish/ERR_INVALID_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_INVALID_REQ,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_INVALID_REQ 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_INVALID_REQ 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -7,7 +7,7 @@

    El URL solicitado no se ha podido conseguir

    -Mientras se intentaba procesar la petición: +Mientras se intentaba procesar la petición: 

     %R
    Index: squid/errors/Spanish/ERR_INVALID_RESP =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_INVALID_RESP,v retrieving revision 1.1.10.1 retrieving revision 1.1.10.2 diff -u -r1.1.10.1 -r1.1.10.2 --- squid/errors/Spanish/ERR_INVALID_RESP 10 Feb 2005 02:40:43 -0000 1.1.10.1 +++ squid/errors/Spanish/ERR_INVALID_RESP 30 Jun 2007 09:10:09 -0000 1.1.10.2 @@ -1,29 +1,30 @@ -ERROR: The requested URL could not be retrieved +ERROR: El URL solicitado no se ha podido conseguir

    ERROR

    -

    The requested URL could not be retrieved

    +

    El URL solicitado no se ha podido conseguir

    -While trying to process the request: +Mientras se intentaba procesar la petición: 

     %R

    -The following error was encountered: +Ha ocurrido el siguiente problema:

    • -Invalid Response +Respuesta no válida.

    -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. +El mensaje de Respuesta HTTP recibido del servidor contactado +no pudo ser entendido o tenía alguna malformación. +Por favor contacte al operador del sitio web. Quizas su +administrador del caché pueda darle a Ud. más +detalles acerca de la naturaleza exacta del problema en caso +de ser necesario. +

    Su administrador del caché es %w. Index: squid/errors/Spanish/ERR_INVALID_URL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_INVALID_URL,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_INVALID_URL 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_INVALID_URL 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -14,7 +14,7 @@

    • -URL incorrecta. +URL incorrecto.
    Index: squid/errors/Spanish/ERR_NO_RELAY =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_NO_RELAY,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_NO_RELAY 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_NO_RELAY 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -19,5 +19,6 @@

    -Esta caché no tiene definido ninguna pasarela para el protocolo WAIS !! -¡Gríteselo al administrador de la caché ! +Este caché no tiene definido ninguna pasarela para el protocolo WAIS !! +¡Grítele al administrador del caché ! +

    Su administrador del caché es %w. +Su administrador del caché es %w. Index: squid/errors/Spanish/ERR_UNSUP_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Spanish/ERR_UNSUP_REQ,v retrieving revision 1.1.1.2.32.1 retrieving revision 1.1.1.2.32.2 diff -u -r1.1.1.2.32.1 -r1.1.1.2.32.2 --- squid/errors/Spanish/ERR_UNSUP_REQ 10 Feb 2005 02:40:43 -0000 1.1.1.2.32.1 +++ squid/errors/Spanish/ERR_UNSUP_REQ 30 Jun 2007 09:10:09 -0000 1.1.1.2.32.2 @@ -14,7 +14,7 @@

    • -Método de la petición y protocolo no soportados +Método de la petición y protocolo no soportados.
    Index: squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED 30 Jun 2007 09:10:09 -0000 1.1.1.1.42.2 @@ -1,31 +1,31 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Access Denied. -
    • -Śs¨úłQŠÚľ´ - -

      -Access control configuration prevents your request from -being allowed at this time. Please contact your service provider if -you feel this is incorrect. -

      -

      -ąýłsľ˛¤§şôŻ¸ŞşŚs¨úąą¨îł]ŠwĽŘŤe¸T¤î¤FązŞşłs˝u­n¨DĄAŚpŞGązÄąąoąo¨ěłoźËŞş -°TŽ§¨Ă¤ŁĽż˝TĄA˝ĐťP´Ł¨Ńşô¸ôŞA°ČŞşşŢ˛zŞĚÁpĂ´ĄC -

    -

    - + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Access Denied. +
    • +Śs¨úłQŠÚľ´ + +

      +Access control configuration prevents your request from +being allowed at this time. Please contact your service provider if +you feel this is incorrect. +

      +

      +ąýłsľ˛¤§şôŻ¸ŞşŚs¨úąą¨îł]ŠwĽŘŤe¸T¤î¤FązŞşłs˝u­n¨DĄAŚpŞGązÄąąoąo¨ěłoźËŞş +°TŽ§¨Ă¤ŁĽż˝TĄA˝ĐťP´Ł¨Ńşô¸ôŞA°ČŞşşŢ˛zŞĚÁpĂ´ĄC +

    +

    + Index: squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED,v retrieving revision 1.1.1.1.42.2 retrieving revision 1.1.1.1.42.3 diff -u -r1.1.1.1.42.2 -r1.1.1.1.42.3 --- squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.2 +++ squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED 30 Jun 2007 09:10:09 -0000 1.1.1.1.42.3 @@ -1,43 +1,43 @@ - -żůť~ĄGşô¸ô§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´ + +żůť~ĄGşô¸ô§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´ - - -

    żůť~

    -

    şô¸ô§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Cache Access Denied. -
    • -§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´ - -
    -

    - -

    -ŠęşpĄAąz¤ŁłQ¤šł\łzšL§Ú­Ěło­Óşô¸ô§Ö¨úŚřŞAžšśÇŚ^¤UŚCŚě¸mĄG -
    %U
    -°ŁŤDązłqšL¤F§Ú­ĚŞş¨­Ľ÷ĹçĂŇĄC -

    - -

    -You need to use Netscape version 2.0 or greater, or Microsoft Internet -Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please -contact the cache administrator if you have -difficulties authenticating yourself or -change your default password. -

    -

    -ązťÝ­n¨ĎĽÎ Netscape version 2.0 ŠÎ§óˇsŞşŞŠĽťĄAŠÎŹO¨ĎĽÎ Microsoft Internet -Explorer 3.0ĄAŠÎŹO¤@­ÓŹŰŽe HTTP/1.1 ŞşÂsÄýžš¨ÓśiŚć¤u§@ĄCŚpŞGązŚb¨­Ľ÷ĹçĂҤW -ľoĽÍ§xĂřĄA˝ĐťP şŢ˛zŞĚ ÁpĂ´ĄC -ŠÎŹO§ó§ďązŞşąK˝XĄC -

    + + +

    żůť~

    +

    şô¸ô§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Cache Access Denied. +
    • +§Ö¨úŚřŞAžšŚs¨úłQŠÚľ´ + +
    +

    + +

    +ŠęşpĄAąz¤ŁłQ¤šł\łzšL§Ú­Ěło­Óşô¸ô§Ö¨úŚřŞAžšśÇŚ^¤UŚCŚě¸mĄG +
    %U
    +°ŁŤDązłqšL¤F§Ú­ĚŞş¨­Ľ÷ĹçĂŇĄC +

    + +

    +You need to use Netscape version 2.0 or greater, or Microsoft Internet +Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please +contact the cache administrator if you have +difficulties authenticating yourself or +change your default password. +

    +

    +ązťÝ­n¨ĎĽÎ Netscape version 2.0 ŠÎ§óˇsŞşŞŠĽťĄAŠÎŹO¨ĎĽÎ Microsoft Internet +Explorer 3.0ĄAŠÎŹO¤@­ÓŹŰŽe HTTP/1.1 ŞşÂsÄýžš¨ÓśiŚć¤u§@ĄCŚpŞGązŚb¨­Ľ÷ĹçĂҤW +ľoĽÍ§xĂřĄA˝ĐťP şŢ˛zŞĚ ÁpĂ´ĄC +ŠÎŹO§ó§ďązŞşąK˝XĄC +

    Index: squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,44 +1,44 @@ - -żůť~ĄG¨ĎĽÎ§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄłQŠÚľ´ + +żůť~ĄG¨ĎĽÎ§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄłQŠÚľ´ - - -

    żůť~

    -

    ¨ĎĽÎ§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄłQŠÚľ´

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Cache Manager Access Denied. -
    • -§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄ¨ĎĽÎłQŠÚ - -
    -

    - -

    -ŠęşpĄAąz¤ŁłQ¤šł\łzšL§Ú­Ěło­Ó§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄśÇŚ^¤UŚCŚě¸mĄG -
    %U
    -°ŁŤDązłqšL§Ú­ĚŞş¨­Ľ÷ĹçĂŇĄC -

    - -

    You need to use Netscape version 2.0 or greater, or Microsoft Internet -Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please -contact the cache administrator if you have -difficulties authenticating yourself or, if you are the -administrator, read Squid documentation on cache manager interface and check -cache log for more detailed error messages. -

    -

    -ązťÝ­n¨ĎĽÎ Netscape version 2.0 ŠÎłĚˇsŞşŞŠĽťĄAŠÎŹO¨ĎĽÎ Microsoft Internet -ExplorerĄAŠÎŹO¤@­ÓŹŰŽe HTTP/1.1 ŞşÂsÄýžš¨ÓśiŚć¤u§@ĄCŚpŞGązŹOŚb¨­Ľ÷ĹçĂҤWľo -ĽÍ°ÝĂDĄA˝ĐĽý˝TŠwązŚłĹvšď§Ö¨úŚřŞAžš¨ĎĽÎşŢ˛zľ{ŚĄĄC -ŠÎŹOťPşŢ˛zŞĚÁpĂ´ĄCŚpŞGąz´NŹOşŢ˛zŞĚĄA˝Đ¸Ô˛Óž\ĹŞ Squid ŠŇŞţ¤ĺĽó¤¤ťP -cache manager ŚłĂöłĄĽ÷ŠÎŔËŹd cache log ĽHŤKąo¨ě§ó¸ÔşÉŞş˛Ó¸`ĄC -

    + + +

    żůť~

    +

    ¨ĎĽÎ§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄłQŠÚľ´

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Cache Manager Access Denied. +
    • +§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄ¨ĎĽÎłQŠÚ + +
    +

    + +

    +ŠęşpĄAąz¤ŁłQ¤šł\łzšL§Ú­Ěło­Ó§Ö¨úŚřŞAžšşŢ˛zľ{ŚĄśÇŚ^¤UŚCŚě¸mĄG +
    %U
    +°ŁŤDązłqšL§Ú­ĚŞş¨­Ľ÷ĹçĂŇĄC +

    + +

    You need to use Netscape version 2.0 or greater, or Microsoft Internet +Explorer 3.0, or an HTTP/1.1 compliant browser for this to work. Please +contact the cache administrator if you have +difficulties authenticating yourself or, if you are the +administrator, read Squid documentation on cache manager interface and check +cache log for more detailed error messages. +

    +

    +ązťÝ­n¨ĎĽÎ Netscape version 2.0 ŠÎłĚˇsŞşŞŠĽťĄAŠÎŹO¨ĎĽÎ Microsoft Internet +ExplorerĄAŠÎŹO¤@­ÓŹŰŽe HTTP/1.1 ŞşÂsÄýžš¨ÓśiŚć¤u§@ĄCŚpŞGązŹOŚb¨­Ľ÷ĹçĂҤWľo +ĽÍ°ÝĂDĄA˝ĐĽý˝TŠwązŚłĹvšď§Ö¨úŚřŞAžš¨ĎĽÎşŢ˛zľ{ŚĄĄC +ŠÎŹOťPşŢ˛zŞĚÁpĂ´ĄCŚpŞGąz´NŹOşŢ˛zŞĚĄA˝Đ¸Ô˛Óž\ĹŞ Squid ŠŇŞţ¤ĺĽó¤¤ťP +cache manager ŚłĂöłĄĽ÷ŠÎŔËŹd cache log ĽHŤKąo¨ě§ó¸ÔşÉŞş˛Ó¸`ĄC +

    Index: squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,38 +1,38 @@ - -żůť~ĄFąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄFąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Unable to forward this request at this time. -
    • -ĽŘŤeľLŞk´ŔązŞşşôŻ¸łsľ˛­n¨DśiŚćÂŕŚV°Ę§@ - -
    - -

    -This request could not be forwarded to the origin server or to any -parent caches. The most likely cause for this error is that: -

      -
    • The cache administrator does not allow this cache to make - direct connections to origin servers, and -
    • All configured parent caches are currently unreachable. -
    -

    -

    -ązŞşłsľ˛­n¨DľLŞkłQÂŕŚV­ěŠlşôŻ¸ŚřŞAžšŠÎ¨äĽLŞş¤Wźh§Ö¨úŚřŞAžšĄAľoĽÍło­Ó°ÝĂDŞşłĚĽiŻŕŞş­ěŚ]ĽiŻŕŹOĄG -

      -
    • şô¸ô§Ö¨úŚřŞAžšşŢ˛zŞĚ¤Ł¤šł\ĽťŚřŞAžšłwŚćŞ˝ąľłsľ˛­ěŠlŞşşô­śŚě¸mĄAŠÎŹO -
    • ŠŇŚłĽťŚřŞAžšł]ŠwŞş¤WźhŚřŞAžšĽŘŤełŁźČŽÉľLŞkłsľ˛¤WĄC -
    -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Unable to forward this request at this time. +
    • +ĽŘŤeľLŞk´ŔązŞşşôŻ¸łsľ˛­n¨DśiŚćÂŕŚV°Ę§@ + +
    + +

    +This request could not be forwarded to the origin server or to any +parent caches. The most likely cause for this error is that: +

      +
    • The cache administrator does not allow this cache to make + direct connections to origin servers, and +
    • All configured parent caches are currently unreachable. +
    +

    +

    +ązŞşłsľ˛­n¨DľLŞkłQÂŕŚV­ěŠlşôŻ¸ŚřŞAžšŠÎ¨äĽLŞş¤Wźh§Ö¨úŚřŞAžšĄAľoĽÍło­Ó°ÝĂDŞşłĚĽiŻŕŞş­ěŚ]ĽiŻŕŹOĄG +

      +
    • şô¸ô§Ö¨úŚřŞAžšşŢ˛zŞĚ¤Ł¤šł\ĽťŚřŞAžšłwŚćŞ˝ąľłsľ˛­ěŠlŞşşô­śŚě¸mĄAŠÎŹO +
    • ŠŇŚłĽťŚřŞAžšł]ŠwŞş¤WźhŚřŞAžšĽŘŤełŁźČŽÉľLŞkłsľ˛¤WĄC +
    +

    Index: squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,31 +1,31 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Connection Failed -
    • -łs˝uĽ˘ąŃ - -
    - -

    -¨t˛ÎŚ^Ŕł¤F¤UŚCżůť~°TŽ§ĄG -

        %E
    - -

    -The remote host or network may be down. Please try the request again. -

    -ąząýłsľ˛ŞşşôŻ¸ŚřŞAžšŠÎŹOşô¸ôĽiŻŕľoĽÍŹGťŮĄC˝ĐľyŤáŚA¸ŐĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Connection Failed +
    • +łs˝uĽ˘ąŃ + +
    + +

    +¨t˛ÎŚ^Ŕł¤F¤UŚCżůť~°TŽ§ĄG +

        %E
    + +

    +The remote host or network may be down. Please try the request again. +

    +ąząýłsľ˛ŞşşôŻ¸ŚřŞAžšŠÎŹOşô¸ôĽiŻŕľoĽÍŹGťŮĄC˝ĐľyŤáŚA¸ŐĄC +

    Index: squid/errors/Traditional_Chinese/ERR_DNS_FAIL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_DNS_FAIL,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_DNS_FAIL 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_DNS_FAIL 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,35 +1,35 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

    -ľLŞkąNązżé¤JŞşşôŻ¸ĽDž÷Śě¸mÂŕÄśŚ¨Ľż˝TŞş IP Śě¸mĄG -%H -
    - - -

    -ťâ°ěŚWşŮŚřŞAžšŚ^Ŕł¤UŚCżůť~°TŽ§ĄG -

    -%z -
    - -

    -łoŞíĽÜĄG -

    - The cache was not able to resolve the hostname presented in the URL. 
- Check if the address is correct. 
-
    
- şô¸ô§Ö¨úŚřŞAžš¨SŚłżěŞkĽż˝TÂŕÄśązżé¤JŞşşôŻ¸ĽDž÷ŚWşŮĄA˝ĐŔËŹdązżé¤JŞşşô
- §}Ą]URLĄ^ŹOĽż˝TŞşĄC
-
    -

    - + +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

    +ľLŞkąNązżé¤JŞşşôŻ¸ĽDž÷Śě¸mÂŕÄśŚ¨Ľż˝TŞş IP Śě¸mĄG +%H +
    + + +

    +ťâ°ěŚWşŮŚřŞAžšŚ^Ŕł¤UŚCżůť~°TŽ§ĄG +

    +%z +
    + +

    +łoŞíĽÜĄG +

    + The cache was not able to resolve the hostname presented in the URL. 
+ Check if the address is correct. 
+
    
+ şô¸ô§Ö¨úŚřŞAžš¨SŚłżěŞkĽż˝TÂŕÄśązżé¤JŞşşôŻ¸ĽDž÷ŚWşŮĄA˝ĐŔËŹdązżé¤JŞşşô
+ §}Ą]URLĄ^ŹOĽż˝TŞşĄC
+
    +

    + Index: squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,30 +1,30 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Forwarding Denied. -
    • -Âŕ°e­n¨DłQŠÚ - -
    - -

    -This cache will not forward your request because it is trying to enforce a -sibling relationship. Perhaps the client at %i is a cache which has been -misconfigured. -

    -Ľť§Ö¨úŚřŞAžšąNľLŞk´ŔązÂŕŚVązŞşłs˝u­n¨DĄA¤]ł\ŹOŚ]Ź°ązŠŇ¨ĎĽÎŞş§Ö¨úŚřŞAžšĄ]%iĄ^¨ĂĽźłQĽť§Ö¨úŚřŞAžš -ł]ŠwŹ°­ăł\śiŚćŚs¨úĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Forwarding Denied. +
    • +Âŕ°e­n¨DłQŠÚ + +
    + +

    +This cache will not forward your request because it is trying to enforce a +sibling relationship. Perhaps the client at %i is a cache which has been +misconfigured. +

    +Ľť§Ö¨úŚřŞAžšąNľLŞk´ŔązÂŕŚVązŞşłs˝u­n¨DĄA¤]ł\ŹOŚ]Ź°ązŠŇ¨ĎĽÎŞş§Ö¨úŚřŞAžšĄ]%iĄ^¨ĂĽźłQĽť§Ö¨úŚřŞAžš +ł]ŠwŹ°­ăł\śiŚćŚs¨úĄC +

    Index: squid/errors/Traditional_Chinese/ERR_FTP_DISABLED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FTP_DISABLED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FTP_DISABLED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FTP_DISABLED 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,27 +1,27 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -FTP is Disabled -
    • -¸T¤î¨ĎĽÎŔɎלǿé - -
    - -

    -This cache does not support FTP. -

    -Ľť§Ö¨úŚřŞAžš¨ĂĽźś}Šń¤ä´ŠŔɎלǿéŞA°ČĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +FTP is Disabled +
    • +¸T¤î¨ĎĽÎŔɎלǿé + +
    + +

    +This cache does not support FTP. +

    +Ľť§Ö¨úŚřŞAžš¨ĂĽźś}Šń¤ä´ŠŔɎלǿéŞA°ČĄC +

    Index: squid/errors/Traditional_Chinese/ERR_FTP_FAILURE =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FTP_FAILURE,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FTP_FAILURE 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FTP_FAILURE 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,26 +1,26 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ŚbšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉľoĽÍŔɎלǿéłq°T¨óŠwżůť~ĄG -%U -

    -PROXY ŚřŞAžš´Ŕąz°eĽX¤UŚCŔɎלǿéŠRĽOĄG -

    %f
    -ŔHŤáŚŹ¨ěłoźËŞşŚ^ŔłĄG -
    %F
    -
    %g
    -

    -This might be caused by an FTP URL with an absolute path (which does -not comply with RFC 1738). If this is the cause, then the file -can be found at %B. -

    -łoĽiŻŕŹOŚ]Ź°Ľ]§t¤Fľ´šď¸ôŽ|Şş FTP şô§}Ą]URLĄ^ŠŇžÉ­PŞşĄ]¤Ł˛ĹŚX RFC 1738Ą^ĄCŚpŞGŻuŞşŹOŚ]Ź° -ło­Ó­ěŚ]žÉ­PłoźËŞşżůť~ĄAŔɎ׼iŻŕĽiĽHŚb%BłQ§ä¨ěĄC -

    - + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ŚbšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉľoĽÍŔɎלǿéłq°T¨óŠwżůť~ĄG +%U +

    +PROXY ŚřŞAžš´Ŕąz°eĽX¤UŚCŔɎלǿéŠRĽOĄG +

    %f
    +ŔHŤáŚŹ¨ěłoźËŞşŚ^ŔłĄG +
    %F
    +
    %g
    +

    +This might be caused by an FTP URL with an absolute path (which does +not comply with RFC 1738). If this is the cause, then the file +can be found at %B. +

    +łoĽiŻŕŹOŚ]Ź°Ľ]§t¤Fľ´šď¸ôŽ|Şş FTP şô§}Ą]URLĄ^ŠŇžÉ­PŞşĄ]¤Ł˛ĹŚX RFC 1738Ą^ĄCŚpŞGŻuŞşŹOŚ]Ź° +ło­Ó­ěŚ]žÉ­PłoźËŞşżůť~ĄAŔɎ׼iŻŕĽiĽHŚb%BłQ§ä¨ěĄC +

    + Index: squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,11 +1,11 @@ - -ŔɎלǿé PUT ŤüĽOŚ¨Ľ\§šŚ¨ĄGŔɎפwłQŤŘĽß + +ŔɎלǿé PUT ŤüĽOŚ¨Ľ\§šŚ¨ĄGŔɎפwłQŤŘĽß - -

    ŠŇ­n¨DŞşŤüĽOŚ¨Ľ\ŚałQ§šŚ¨

    -

    ŔɎפwłQŚ¨Ľ\ŚaŤŘĽß

    -
    -

    -

    - + +

    ŠŇ­n¨DŞşŤüĽOŚ¨Ľ\ŚałQ§šŚ¨

    +

    ŔɎפwłQŚ¨Ľ\ŚaŤŘĽß

    +
    +

    +

    + Index: squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,29 +1,29 @@ - -żůť~ĄGŔɎפWśÇĽ˘ąŃ + +żůť~ĄGŔɎפWśÇĽ˘ąŃ - -

    żůť~

    -

    ŔɎלǿé¤WśÇĄ]PUTĄ^Ľ˘ąŃ

    -
    -

    -ˇíšÁ¸Ő¤WśÇĄ]PUTĄ^¤UŚCŚě¸mŽÉĄG -%U -

    -§Ö¨úŚřŞAžš´ŔązÂŕ°eĽX¤UŚCŔɎלǿéŠRĽOĄG -

    
-        %f
-
    -ŔHŤáŚŹ¨ěłoźËŞş°TŽ§ -
    
-        %F
-
    -

    -łoŞíĽÜĄG -

    -Check path, permissions, diskspace and try again.
-
    
-˝ĐązŔËŹd¤WśÇ¸ôŽ|ĄA¤WśÇŚě¸mŞşĹŞźgĹv­­ĄAĽi¨ĎĽÎŞşŞĹśĄ¤§ŤáŚA¸Ő¤@šMĄC
-
    -

    - + +

    żůť~

    +

    ŔɎלǿé¤WśÇĄ]PUTĄ^Ľ˘ąŃ

    +
    +

    +ˇíšÁ¸Ő¤WśÇĄ]PUTĄ^¤UŚCŚě¸mŽÉĄG +%U +

    +§Ö¨úŚřŞAžš´ŔązÂŕ°eĽX¤UŚCŔɎלǿéŠRĽOĄG +

    
+        %f
+
    +ŔHŤáŚŹ¨ěłoźËŞş°TŽ§ +
    
+        %F
+
    +

    +łoŞíĽÜĄG +

    +Check path, permissions, diskspace and try again.
+
    
+˝ĐązŔËŹd¤WśÇ¸ôŽ|ĄA¤WśÇŚě¸mŞşĹŞźgĹv­­ĄAĽi¨ĎĽÎŞşŞĹśĄ¤§ŤáŚA¸Ő¤@šMĄC
+
    +

    + Index: squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,11 +1,11 @@ - -ŔɎלǿé PUT ŤüĽOŚ¨Ľ\§šŚ¨ĄGŔɎפwłQ§óˇs + +ŔɎלǿé PUT ŤüĽOŚ¨Ľ\§šŚ¨ĄGŔɎפwłQ§óˇs - -

    Ś¨Ľ\§šŚ¨ŠŇ­n¨DŞşŤüĽO

    -

    ŔɎפwłQ§óˇs¤F

    -
    -

    -

    - + +

    Ś¨Ľ\§šŚ¨ŠŇ­n¨DŞşŤüĽO

    +

    ŔɎפwłQ§óˇs¤F

    +
    +

    +

    + Index: squid/errors/Traditional_Chinese/ERR_INVALID_REQ =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_INVALID_REQ,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_INVALID_REQ 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_INVALID_REQ 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,43 +1,43 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśiŚćązŠŇ­n¨DŞş¤UŚCľ{§ÇŽÉĄG -

    -%R
-
    -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Invalid Request -
    • -¤ŁĽż˝TŞş­n¨D - -
    - -

    -Some aspect of the HTTP Request is invalid. Possible problems: -
    -ľoĽÍ¤F¤@¨Ç¤ŁĽż˝TŞş HTTP ­n¨DĄCĽiŻŕŹO¤UŚCŞş°ÝĂDĄG -

      -
    • Missing or unknown request method -
      ­n¨D¤čŚĄżňĽ˘ŠÎŹOĽźŞž -
    • Missing URL -
      şôŻ¸Śě¸mżňĽ˘ -
    • Missing HTTP Identifier (HTTP/1.0) -
      HTTP źĐˇÇŞşŤĹ§iżňĽ˘Ą]HTTP/1.0Ą^ -
    • Request is too large -
      ­n¨DŠRĽOšLŞř -
    • Content-Length missing for POST or PUT requests -
      ŻĘ¤Ö POST ŠÎ PUT ­n¨D -
    • Illegal character in hostname; underscores are not allowed -
      ąýłsľ˛ŞşĽDž÷ŚWşŮĽ]§t¤ŁŚXŞkŞşŚr¤¸ĄFŠł˝uło­ÓŚr¤¸ŹO¤ŁłQ¤šł\ŚsŚbŞşĄC -
    -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśiŚćązŠŇ­n¨DŞş¤UŚCľ{§ÇŽÉĄG +

    +%R
+
    +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Invalid Request +
    • +¤ŁĽż˝TŞş­n¨D + +
    + +

    +Some aspect of the HTTP Request is invalid. Possible problems: +
    +ľoĽÍ¤F¤@¨Ç¤ŁĽż˝TŞş HTTP ­n¨DĄCĽiŻŕŹO¤UŚCŞş°ÝĂDĄG +

      +
    • Missing or unknown request method +
      ­n¨D¤čŚĄżňĽ˘ŠÎŹOĽźŞž +
    • Missing URL +
      şôŻ¸Śě¸mżňĽ˘ +
    • Missing HTTP Identifier (HTTP/1.0) +
      HTTP źĐˇÇŞşŤĹ§iżňĽ˘Ą]HTTP/1.0Ą^ +
    • Request is too large +
      ­n¨DŠRĽOšLŞř +
    • Content-Length missing for POST or PUT requests +
      ŻĘ¤Ö POST ŠÎ PUT ­n¨D +
    • Illegal character in hostname; underscores are not allowed +
      ąýłsľ˛ŞşĽDž÷ŚWşŮĽ]§t¤ŁŚXŞkŞşŚr¤¸ĄFŠł˝uło­ÓŚr¤¸ŹO¤ŁłQ¤šł\ŚsŚbŞşĄC +
    +

    Index: squid/errors/Traditional_Chinese/ERR_INVALID_URL =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_INVALID_URL,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_INVALID_URL 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_INVALID_URL 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,37 +1,37 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Invalid URL -
    • -¤ŁĽż˝TŞşŚě¸m - -
    - -

    -Some aspect of the requested URL is incorrect. Possible problems: -
    -ąýłsľ˛ŞşŚě¸mŚł¤@¨Ç¤ŁĽż˝TĄCĽiŻŕŹOŚ]Ź°¤UŚC°ÝĂDĄG -

      -
    • Missing or incorrect access protocol (should be `http://'' or similar) -
      ŻĘ¤ÖŠÎ¤ŁĽż˝TŞşłq°T¨óŠwŤĹ§iĄ]Ŕł¸ÓŹO `http://''ŠÎŹOĂţŚüŞşś}ŔYĄ^ -
    • Missing hostname -
      ŻĘ¤Öąýłsľ˛ŞşĽDž÷ŚWşŮ -
    • Illegal double-escape in the URL-Path -
      ¤ŁŚXŞkŞşşôŻ¸łsľ˛¸ôŽ|Ą]ŻĘ¤Ö `//''Ą^ -
    • Illegal character in hostname; underscores are not allowed -
      ¤ŁŚXŞkŞşŚr¤¸ŚsŚbŠóąýłsľ˛ŞşĽDž÷ŚWşŮ¤¤ĄFŠł˝uło­ÓŚr¤¸ŹO¤ŁłQ¤šł\Şş -
    -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Invalid URL +
    • +¤ŁĽż˝TŞşŚě¸m + +
    + +

    +Some aspect of the requested URL is incorrect. Possible problems: +
    +ąýłsľ˛ŞşŚě¸mŚł¤@¨Ç¤ŁĽż˝TĄCĽiŻŕŹOŚ]Ź°¤UŚC°ÝĂDĄG +

      +
    • Missing or incorrect access protocol (should be `http://'' or similar) +
      ŻĘ¤ÖŠÎ¤ŁĽż˝TŞşłq°T¨óŠwŤĹ§iĄ]Ŕł¸ÓŹO `http://''ŠÎŹOĂţŚüŞşś}ŔYĄ^ +
    • Missing hostname +
      ŻĘ¤Öąýłsľ˛ŞşĽDž÷ŚWşŮ +
    • Illegal double-escape in the URL-Path +
      ¤ŁŚXŞkŞşşôŻ¸łsľ˛¸ôŽ|Ą]ŻĘ¤Ö `//''Ą^ +
    • Illegal character in hostname; underscores are not allowed +
      ¤ŁŚXŞkŞşŚr¤¸ŚsŚbŠóąýłsľ˛ŞşĽDž÷ŚWşŮ¤¤ĄFŠł˝uło­ÓŚr¤¸ŹO¤ŁłQ¤šł\Şş +
    +

    Index: squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,28 +1,28 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Connection Lifetime Expired -
    • -śWšLłs˝uľĽŤÝŽÉ­­ - -
    - -

    -Squid has terminated the request because it has exceeded the maximum -connection lifetime. -

    -§Ö¨úŚřŞAžš¤w˛×¤îązŞşłs˝u­n¨DĄAŚ]Ź°¤w¸gśWšLłs˝uľĽŤÝŽÉ­­ĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Connection Lifetime Expired +
    • +śWšLłs˝uľĽŤÝŽÉ­­ + +
    + +

    +Squid has terminated the request because it has exceeded the maximum +connection lifetime. +

    +§Ö¨úŚřŞAžš¤w˛×¤îązŞşłs˝u­n¨DĄAŚ]Ź°¤w¸gśWšLłs˝uľĽŤÝŽÉ­­ĄC +

    Index: squid/errors/Traditional_Chinese/ERR_NO_RELAY =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_NO_RELAY,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_NO_RELAY 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_NO_RELAY 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,27 +1,27 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -No Wais Relay -
    • -¤Ł´Ł¨Ń WaisĄ]źs°ě¸ę°TŚřŞAžšĄ^Âŕąľ - -
    - -

    -There is no WAIS Relay host defined for this Cache! Yell at the administrator. -
    -Ľť§Ö¨úŚřŞAžšĽź´Ł¨Ń WAIS źs°ě¸ę°TŚřŞAžšŞA°ČĄIŚpŚłşĂ°Ý˝ĐŹ˘§Ö¨úŚřŞAžšşŢ˛zŞĚĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +No Wais Relay +
    • +¤Ł´Ł¨Ń WaisĄ]źs°ě¸ę°TŚřŞAžšĄ^Âŕąľ + +
    + +

    +There is no WAIS Relay host defined for this Cache! Yell at the administrator. +
    +Ľť§Ö¨úŚřŞAžšĽź´Ł¨Ń WAIS źs°ě¸ę°TŚřŞAžšŞA°ČĄIŚpŚłşĂ°Ý˝ĐŹ˘§Ö¨úŚřŞAžšşŢ˛zŞĚĄC +

    Index: squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,33 +1,33 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Valid document was not found in the cache and only-if-cached -directive was specified. -
    • -ąz­n¨DŞş¤ĺĽó¨ĂĽźŚsŚbŠóĽť§Ö¨úŚřŞAžš¤WĄAŚÓĽBązł]Šw¤Fonly-if-cached -ŤüĽOĄC - -
    - -

    - -You have issued a request with a only-if-cached cache control -directive. The document was not found in the cache, or it required -revalidation prohibited by only-if-cached directive. -
    -ąz°eĽX¤F¤@­ÓĽ]§t only-if-cached §Ö¨úąą¨îŤüĽOŞşłsľ˛­n¨DĄCŚÓ¤ĺĽó¨ĂĽźŚsŚb§Ö¨úŚřŞAžš¤¤ĄAŠÎŞĚ -ło­Ółs˝u­n¨DłQ only-if-cached ŤüĽOť{ŠwŹO¸TĽÎŞşĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Valid document was not found in the cache and only-if-cached +directive was specified. +
    • +ąz­n¨DŞş¤ĺĽó¨ĂĽźŚsŚbŠóĽť§Ö¨úŚřŞAžš¤WĄAŚÓĽBązł]Šw¤Fonly-if-cached +ŤüĽOĄC + +
    + +

    + +You have issued a request with a only-if-cached cache control +directive. The document was not found in the cache, or it required +revalidation prohibited by only-if-cached directive. +
    +ąz°eĽX¤F¤@­ÓĽ]§t only-if-cached §Ö¨úąą¨îŤüĽOŞşłsľ˛­n¨DĄCŚÓ¤ĺĽó¨ĂĽźŚsŚb§Ö¨úŚřŞAžš¤¤ĄAŠÎŞĚ +ło­Ółs˝u­n¨DłQ only-if-cached ŤüĽOť{ŠwŹO¸TĽÎŞşĄC +

    Index: squid/errors/Traditional_Chinese/ERR_READ_ERROR =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_READ_ERROR,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_READ_ERROR 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_READ_ERROR 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,32 +1,32 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Read Error -
    • -ĹŞ¨úżůť~ - -
    - -

    -¨t˛ÎŚ^ŔłĄG -

        %E
    - -

    -An error condition occurred while reading data from the network. Please -retry your request. -

    -ĽżŚbłzšLşô¸ôĹŞ¨ú¸ęŽĆŽÉľoĽÍ¤Fżůť~ŞşąĄŞpĄA˝ĐŚAšÁ¸Ő¤@šMązŞşłsľ˛­n¨DĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Read Error +
    • +ĹŞ¨úżůť~ + +
    + +

    +¨t˛ÎŚ^ŔłĄG +

        %E
    + +

    +An error condition occurred while reading data from the network. Please +retry your request. +

    +ĽżŚbłzšLşô¸ôĹŞ¨ú¸ęŽĆŽÉľoĽÍ¤Fżůť~ŞşąĄŞpĄA˝ĐŚAšÁ¸Ő¤@šMązŞşłsľ˛­n¨DĄC +

    Index: squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,33 +1,33 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -

      -
    • - -Read Timeout -
    • -śWšLĹŞ¨úŽÉ­­ - -
    - -

    -¨t˛ÎŚ^ŔłĄG -

        %E
    - -

    -A Timeout occurred while waiting to read data from the network. The network -or server may be down or congested. Please retry your request. -
    -ˇíłzšLşô¸ôĹŞ¨ú¸ęŽĆŽÉĄAśWšL¤FľĽŤÝŽÉ­­ĄCłoĽiŻŕŹOŚ]Ź°şô¸ôŠÎŹOąýłsľ˛ŞşşôŻ¸ŚřŞAžšľoĽÍžĂśëŠÎˇlĂaĄC -˝Đ­ŤˇsšÁ¸Ő¤@šMązŞşłsľ˛­n¨DĄC -

    + +

    żůť~

    +

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    +
    +

    +ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG +%U +

    +ľoĽÍ¤F¤UŚCŞşżůť~ĄG +

      +
    • + +Read Timeout +
    • +śWšLĹŞ¨úŽÉ­­ + +
    + +

    +¨t˛ÎŚ^ŔłĄG +

        %E
    + +

    +A Timeout occurred while waiting to read data from the network. The network +or server may be down or congested. Please retry your request. +
    +ˇíłzšLşô¸ôĹŞ¨ú¸ęŽĆŽÉĄAśWšL¤FľĽŤÝŽÉ­­ĄCłoĽiŻŕŹOŚ]Ź°şô¸ôŠÎŹOąýłsľ˛ŞşşôŻ¸ŚřŞAžšľoĽÍžĂśëŠÎˇlĂaĄC +˝Đ­ŤˇsšÁ¸Ő¤@šMązŞşłsľ˛­n¨DĄC +

    Index: squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN =================================================================== RCS file: /cvsroot/squid-sf//squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN,v retrieving revision 1.1.1.1.42.1 retrieving revision 1.1.1.1.42.2 diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2 --- squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN 10 Feb 2005 02:40:46 -0000 1.1.1.1.42.1 +++ squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN 30 Jun 2007 09:10:10 -0000 1.1.1.1.42.2 @@ -1,22 +1,22 @@ - -żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ + +żůť~ĄGąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^ - -

    żůť~

    -

    ąýłsľ˛¤§şô§}Ą]URLĄ^ľLŞkĽż˝TŞşśÇŚ^

    -
    -

    -ˇíšÁ¸ŐśÇŚ^¤U­ąŞşşô§}Ą]URLĄ^ŽÉĄG -%U -

    -ľoĽÍ¤F¤UŚCŞşżůť~ĄG -