git.ipfire.org Git - thirdparty/squid.git/commit - src/client_side.cc

]> git.ipfire.org Git - thirdparty/squid.git/commit - src/client_side.cc

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b7a48d 8d55d7e)

author	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 17 Jun 2011 06:04:05 +0000 (18:04 +1200)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Fri, 17 Jun 2011 06:04:05 +0000 (18:04 +1200)
commit	9815f129cf106b6bf21887a756bbeaf5d38e8b45
tree	287cf4a76cfc58d277b711228aac28851537c95a	tree \| snapshot
parent	3b7a48df22952c932edaac41dd23cbe69c80e855	commit \| diff
parent	8d55d7ef16402d9634e011df1cf3795bc2438a99	commit \| diff

Merged from trunk

12 files changed:

doc/release-notes/release-3.2.sgml	diff1 \|	diff2 \|	blob \| history
src/Server.cc	diff1 \|	diff2 \|	blob \| history
src/adaptation/icap/ServiceRep.cc	diff1 \|	diff2 \|	blob \| history
src/adaptation/icap/ServiceRep.h	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/comm/Connection.h	diff1 \|	\|	blob \| history
src/log/FormatSquidCustom.cc	diff1 \|	diff2 \|	blob \| history
src/pconn.cc	diff1 \|	diff2 \|	blob \| history
src/pconn.h	diff1 \|	diff2 \|	blob \| history
src/redirect.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/squid-cache/squid.git