]> git.ipfire.org Git - thirdparty/squid.git/commit
Merge form trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Thu, 4 Nov 2010 10:09:05 +0000 (23:09 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Thu, 4 Nov 2010 10:09:05 +0000 (23:09 +1300)
commita750e510255a44b1861500b9b766694b37048c9d
treeba6488470d714559475a8a7a0b2522789433dd75
parentbe3641799529a2939471e6d8798258d6706acd5b
parent13b08e1ce31c7876e928efd6567eaf1542191c58
Merge form trunk
48 files changed:
doc/release-notes/release-3.2.sgml
src/CacheManager.h
src/HttpRequest.cc
src/Makefile.am
src/Server.cc
src/acl/Asn.cc
src/adaptation/icap/ModXact.cc
src/adaptation/icap/Xaction.cc
src/adaptation/icap/Xaction.h
src/cache_cf.cc
src/cache_manager.cc
src/cf.data.pre
src/client_side.cc
src/client_side_reply.cc
src/client_side_request.cc
src/client_side_request.h
src/comm.cc
src/defines.h
src/dns_internal.cc
src/errorpage.cc
src/errorpage.h
src/external_acl.cc
src/forward.cc
src/fqdncache.cc
src/ftp.cc
src/globals.h
src/gopher.cc
src/http.cc
src/icmp/net_db.cc
src/icp_v2.cc
src/ip/Qos.cci
src/ip/QosConfig.cc
src/ip/QosConfig.h
src/ipc/Coordinator.cc
src/ipc/Coordinator.h
src/ipc/SharedListen.cc
src/ipc/Strand.cc
src/ipcache.cc
src/main.cc
src/neighbors.cc
src/pconn.cc
src/protos.h
src/redirect.cc
src/stat.cc
src/store.cc
src/structs.h
src/tests/stub_cache_manager.cc
src/tests/stub_comm.cc