Merge from upstream.

author Benno Rice <benno@squid-cache.org>

Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)

committer Benno Rice <benno@squid-cache.org>

Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)
author Benno Rice <benno@squid-cache.org>
Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)
committer Benno Rice <benno@squid-cache.org>
Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)
diff --cc src/htcp.cc
Simple merge
diff --cc src/http.cc
Simple merge
diff --cc src/protos.h
Simple merge
author	Benno Rice <benno@squid-cache.org>
	Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)
committer	Benno Rice <benno@squid-cache.org>
	Thu, 18 Sep 2008 00:31:34 +0000 (10:31 +1000)
		1	2
src/htcp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/http.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/protos.h	patch \|	diff1 \|	diff2 \|	blob \| history