]> git.ipfire.org Git - thirdparty/squid.git/commit
Merged from parent (trunk r11623, v3.2.0.10+).
authorAlex Rousskov <rousskov@measurement-factory.com>
Wed, 10 Aug 2011 15:54:51 +0000 (09:54 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Wed, 10 Aug 2011 15:54:51 +0000 (09:54 -0600)
commit109cf61c2a9f1ece83ea8f453f5c9d9982dd3326
treea4479f66bb218edcdc440a499e94b5488ef642a6
parenta0a5b16124997bd956d83941816904ed17482509
parent27f1960077b4fd2ec8abae313080fb1d3ca52dfe
Merged from parent (trunk r11623, v3.2.0.10+).
46 files changed:
configure.ac
src/Makefile.am
src/MemObject.cc
src/Server.cc
src/Store.h
src/adaptation/icap/ServiceRep.cc
src/adaptation/icap/ServiceRep.h
src/adaptation/icap/Xaction.cc
src/cache_cf.cc
src/cf.data.depend
src/cf.data.pre
src/client_side.cc
src/client_side_reply.cc
src/comm.cc
src/comm.h
src/format/Format.cc
src/format/Tokens.h
src/fs/coss/store_dir_coss.cc
src/fs/ufs/store_dir_ufs.cc
src/fs/ufs/store_io_ufs.cc
src/globals.h
src/http.cc
src/ipc/Coordinator.cc
src/ipc/Coordinator.h
src/ipc/Forwarder.cc
src/ipc/Kid.h
src/ipc/Makefile.am
src/ipc/Strand.cc
src/log/FormatSquidCustom.cc.THIS
src/log/FormatSquidIcap.cc
src/main.cc
src/mem.cc
src/mgr/FunAction.cc
src/mgr/InfoAction.cc
src/neighbors.cc
src/protos.h
src/stat.cc
src/store.cc
src/store_dir.cc
src/structs.h
src/tests/stub_MemObject.cc
src/tests/stub_store.cc
src/tests/stub_tools.cc
src/tests/testStore.cc
src/tools.cc
src/urn.cc