~ahasenack/ubuntu/+source/squid:cosmic-squid-4.2-merge
Last commit made on
2018-10-04
- Get this branch:
-
git clone
-b cosmic-squid-4.2-merge
https://git.not.enabled/~ahasenack/ubuntu/+source/squid
Only
Andreas Hasenack
can upload to this branch. If you are
Andreas Hasenack
please log in for upload directions.
Branch merges
Propose for merging
- Robie Basak: Approve
- Canonical Server: Pending requested
-
Diff: 417 lines (+298/-4)11 files modifieddebian/NEWS (+0/-0)
debian/changelog (+113/-0)
debian/control (+5/-3)
debian/patches/90-cf.data.ubuntu.patch (+16/-0)
debian/patches/99-ubuntu-ssl-cert-snakeoil.patch (+22/-0)
debian/patches/fix-uninitialized-var.patch (+25/-0)
debian/patches/series (+3/-0)
debian/rules (+11/-1)
debian/squid.install (+3/-0)
debian/squid.preinst (+15/-0)
debian/usr.sbin.squid (+85/-0)
- Canonical Server Core Reviewers: Pending requested
- Canonical Server: Pending requested
-
Diff: 11733 lines (+1722/-1627) (has conflicts)214 files modifiedChangeLog (+30/-0)
RELEASENOTES.html (+3/-3)
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+78/-0)
debian/control (+3/-3)
debian/patches/0003-installed-binary-for-debian-ci.patch (+19/-0)
debian/patches/0004-upstream-pr264.patch (+28/-0)
debian/patches/series (+7/-0)
debian/rules (+10/-0)
debian/tests/control (+1/-1)
dev/null (+0/-41)
doc/release-notes/release-4.html (+3/-3)
errors/af/ERR_AGENT_CONFIGURE (+3/-3)
errors/af/ERR_AGENT_WPAD (+3/-3)
errors/ar/ERR_AGENT_CONFIGURE (+3/-3)
errors/ar/ERR_AGENT_WPAD (+3/-3)
errors/az/ERR_AGENT_CONFIGURE (+3/-3)
errors/az/ERR_AGENT_WPAD (+3/-3)
errors/bg/ERR_AGENT_CONFIGURE (+3/-3)
errors/bg/ERR_AGENT_WPAD (+3/-3)
errors/ca/ERR_AGENT_CONFIGURE (+3/-3)
errors/ca/ERR_AGENT_WPAD (+3/-3)
errors/cs/ERR_AGENT_CONFIGURE (+3/-3)
errors/cs/ERR_AGENT_WPAD (+3/-3)
errors/da/ERR_AGENT_CONFIGURE (+3/-3)
errors/da/ERR_AGENT_WPAD (+3/-3)
errors/de/ERR_AGENT_CONFIGURE (+3/-3)
errors/de/ERR_AGENT_WPAD (+3/-3)
errors/el/ERR_AGENT_CONFIGURE (+3/-3)
errors/el/ERR_AGENT_WPAD (+3/-3)
errors/en/ERR_AGENT_CONFIGURE (+3/-3)
errors/en/ERR_AGENT_WPAD (+3/-3)
errors/es/ERR_AGENT_CONFIGURE (+3/-3)
errors/es/ERR_AGENT_WPAD (+3/-3)
errors/et/ERR_AGENT_CONFIGURE (+3/-3)
errors/et/ERR_AGENT_WPAD (+3/-3)
errors/fa/ERR_AGENT_CONFIGURE (+3/-3)
errors/fa/ERR_AGENT_WPAD (+3/-3)
errors/fi/ERR_AGENT_CONFIGURE (+3/-3)
errors/fi/ERR_AGENT_WPAD (+3/-3)
errors/fr/ERR_AGENT_CONFIGURE (+3/-3)
errors/fr/ERR_AGENT_WPAD (+3/-3)
errors/he/ERR_AGENT_CONFIGURE (+3/-3)
errors/he/ERR_AGENT_WPAD (+3/-3)
errors/hu/ERR_AGENT_CONFIGURE (+3/-3)
errors/hu/ERR_AGENT_WPAD (+3/-3)
errors/hy/ERR_AGENT_CONFIGURE (+3/-3)
errors/hy/ERR_AGENT_WPAD (+3/-3)
errors/id/ERR_AGENT_CONFIGURE (+3/-3)
errors/id/ERR_AGENT_WPAD (+3/-3)
errors/it/ERR_AGENT_CONFIGURE (+3/-3)
errors/it/ERR_AGENT_WPAD (+3/-3)
errors/ja/ERR_AGENT_CONFIGURE (+3/-3)
errors/ja/ERR_AGENT_WPAD (+3/-3)
errors/ka/ERR_AGENT_CONFIGURE (+3/-3)
errors/ka/ERR_AGENT_WPAD (+3/-3)
errors/ko/ERR_AGENT_CONFIGURE (+3/-3)
errors/ko/ERR_AGENT_WPAD (+3/-3)
errors/lt/ERR_AGENT_CONFIGURE (+3/-3)
errors/lt/ERR_AGENT_WPAD (+3/-3)
errors/lv/ERR_AGENT_CONFIGURE (+3/-3)
errors/lv/ERR_AGENT_WPAD (+3/-3)
errors/ms/ERR_AGENT_CONFIGURE (+3/-3)
errors/ms/ERR_AGENT_WPAD (+3/-3)
errors/nl/ERR_AGENT_CONFIGURE (+3/-3)
errors/nl/ERR_AGENT_WPAD (+3/-3)
errors/oc/ERR_AGENT_CONFIGURE (+3/-3)
errors/oc/ERR_AGENT_WPAD (+3/-3)
errors/pl/ERR_AGENT_CONFIGURE (+3/-3)
errors/pl/ERR_AGENT_WPAD (+3/-3)
errors/pt-br/ERR_AGENT_CONFIGURE (+3/-3)
errors/pt-br/ERR_AGENT_WPAD (+3/-3)
errors/pt/ERR_AGENT_CONFIGURE (+3/-3)
errors/pt/ERR_AGENT_WPAD (+3/-3)
errors/ro/ERR_AGENT_CONFIGURE (+3/-3)
errors/ro/ERR_AGENT_WPAD (+3/-3)
errors/ru/ERR_AGENT_CONFIGURE (+3/-3)
errors/ru/ERR_AGENT_WPAD (+3/-3)
errors/sk/ERR_AGENT_CONFIGURE (+3/-3)
errors/sk/ERR_AGENT_WPAD (+3/-3)
errors/sl/ERR_AGENT_CONFIGURE (+3/-3)
errors/sl/ERR_AGENT_WPAD (+3/-3)
errors/sr-cyrl/ERR_AGENT_CONFIGURE (+3/-3)
errors/sr-cyrl/ERR_AGENT_WPAD (+3/-3)
errors/sr-latn/ERR_AGENT_CONFIGURE (+3/-3)
errors/sr-latn/ERR_AGENT_WPAD (+3/-3)
errors/sv/ERR_AGENT_CONFIGURE (+3/-3)
errors/sv/ERR_AGENT_WPAD (+3/-3)
errors/th/ERR_AGENT_CONFIGURE (+3/-3)
errors/th/ERR_AGENT_WPAD (+3/-3)
errors/tr/ERR_AGENT_CONFIGURE (+3/-3)
errors/tr/ERR_AGENT_WPAD (+3/-3)
errors/uk/ERR_AGENT_CONFIGURE (+3/-3)
errors/uk/ERR_AGENT_WPAD (+3/-3)
errors/uz/ERR_AGENT_CONFIGURE (+3/-3)
errors/uz/ERR_AGENT_WPAD (+3/-3)
errors/vi/ERR_AGENT_CONFIGURE (+3/-3)
errors/vi/ERR_AGENT_WPAD (+3/-3)
errors/zh-hans/ERR_AGENT_CONFIGURE (+3/-3)
errors/zh-hans/ERR_AGENT_WPAD (+3/-3)
errors/zh-hant/ERR_AGENT_CONFIGURE (+3/-3)
errors/zh-hant/ERR_AGENT_WPAD (+3/-3)
include/version.h (+1/-1)
src/AccessLogEntry.cc (+12/-0)
src/AccessLogEntry.h (+18/-0)
src/CacheManager.h (+0/-3)
src/Downloader.cc (+1/-3)
src/HttpMsg.h (+1/-1)
src/HttpReply.cc (+17/-8)
src/HttpReply.h (+6/-2)
src/HttpRequest.cc (+7/-1)
src/HttpRequest.h (+4/-0)
src/Makefile.am (+0/-4)
src/Makefile.in (+20/-27)
src/MemObject.cc (+4/-16)
src/MemObject.h (+19/-25)
src/MemStore.cc (+1/-1)
src/PeerDigest.h (+20/-17)
src/SquidConfig.h (+8/-4)
src/StatCounters.h (+61/-63)
src/StatHist.h (+14/-32)
src/acl/BoolOps.cc (+2/-1)
src/acl/FilledChecklist.cc (+2/-2)
src/acl/external/SQL_session/ext_sql_session_acl.8 (+1/-1)
src/acl/external/delayer/ext_delayer_acl.8 (+1/-1)
src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 (+1/-1)
src/anyp/TrafficMode.h (+5/-9)
src/anyp/Uri.cc (+62/-9)
src/anyp/Uri.h (+7/-1)
src/auth/basic/DB/basic_db_auth.8 (+1/-1)
src/auth/basic/POP3/basic_pop3_auth.8 (+1/-1)
src/cache_cf.cc (+11/-9)
src/cf.data.pre (+143/-61)
src/client_side.cc (+10/-79)
src/client_side.h (+0/-2)
src/client_side_reply.cc (+6/-8)
src/client_side_request.cc (+104/-38)
src/client_side_request.h (+45/-2)
src/clients/FtpGateway.cc (+66/-85)
src/comm/Loops.h (+6/-1)
src/comm/ModDevPoll.cc (+0/-11)
src/comm/ModEpoll.cc (+0/-8)
src/comm/ModKqueue.cc (+1/-13)
src/comm/ModPoll.cc (+1/-6)
src/comm/ModSelect.cc (+1/-6)
src/comm/ModSelectWin32.cc (+1/-6)
src/comm/TcpAcceptor.cc (+1/-0)
src/debug.cc (+11/-7)
src/dlink.h (+5/-9)
src/dns_internal.cc (+57/-87)
src/esi/Element.h (+18/-0)
src/esi/Esi.cc (+30/-77)
src/esi/Makefile.am (+0/-1)
src/esi/Makefile.in (+4/-5)
src/esi/Sequence.cc (+8/-6)
src/esi/Sequence.h (+1/-2)
src/eui/Eui64.h (+1/-3)
src/fd.cc (+1/-2)
src/format/Format.cc (+3/-4)
src/fqdncache.cc (+1/-2)
src/fs/rock/RockRebuild.cc (+0/-1)
src/fs/ufs/UFSSwapDir.cc (+76/-101)
src/fs/ufs/UFSSwapDir.h (+1/-1)
src/fs_io.cc (+14/-13)
src/fs_io.h (+11/-1)
src/htcp.cc (+15/-20)
src/http/one/ResponseParser.cc (+1/-10)
src/http/url_rewriters/LFS/url_lfs_rewrite.8 (+1/-1)
src/icmp/Icmp.h (+11/-8)
src/icmp/IcmpPinger.cc (+1/-1)
src/icmp/IcmpSquid.cc (+0/-1)
src/icmp/net_db.cc (+1/-1)
src/icp_v2.cc (+2/-0)
src/ident/Ident.cc (+4/-2)
src/ipc/StoreMap.cc (+1/-3)
src/ipc/StoreMap.h (+16/-7)
src/ipc/TypedMsgHdr.cc (+24/-5)
src/ipc/TypedMsgHdr.h (+8/-3)
src/ipcache.cc (+1/-2)
src/log/DB/log_db_daemon.8 (+1/-1)
src/log/ModStdio.cc (+12/-7)
src/mem/old_api.cc (+13/-21)
src/neighbors.cc (+0/-8)
src/peer_digest.cc (+29/-22)
src/security/ServerOptions.cc (+7/-4)
src/security/cert_validators/fake/security_fake_certverify.8 (+1/-1)
src/servers/FtpServer.cc (+1/-4)
src/servers/Http1Server.cc (+13/-12)
src/snmp/Pdu.cc (+2/-1)
src/snmp/Pdu.h (+1/-1)
src/snmp/Session.cc (+19/-35)
src/snmp/Session.h (+2/-4)
src/snmp/Var.cc (+5/-9)
src/ssl/PeekingPeerConnector.cc (+5/-5)
src/stat.cc (+55/-114)
src/store.cc (+1/-1)
src/store/Disks.cc (+16/-16)
src/store/id_rewriters/file/storeid_file_rewrite.8 (+1/-1)
src/store_digest.cc (+17/-16)
src/store_rebuild.cc (+1/-1)
src/store_rebuild.h (+10/-16)
src/tests/stub_HttpReply.cc (+17/-16)
src/tests/stub_MemObject.cc (+2/-13)
src/tests/stub_cache_manager.cc (+1/-1)
src/tests/stub_client_side.cc (+0/-1)
src/tests/stub_libanyp.cc (+0/-1)
src/tests/stub_libcomm.cc (+0/-1)
src/tests/testRock.cc (+1/-1)
src/tests/testUfs.cc (+1/-1)
src/tools.cc (+1/-1)
src/tunnel.cc (+0/-1)
src/wccp2.cc (+2/-1)
tools/helper-mux/helper-mux.8 (+1/-1)
Related source package recipes
Branch information
- Name:
- cosmic-squid-4.2-merge
- Repository:
- lp:~ahasenack/ubuntu/+source/squid
Recent commits
There was an error while fetching commit information from code hosting service. Please try again in a few minutes. If the problem persists, contact Launchpad support.
