git.ipfire.org Git - thirdparty/squid.git/commit

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

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 84aa17d 94da12c)

author	Alex Rousskov <rousskov@measurement-factory.com>
	Wed, 30 Jul 2014 17:33:14 +0000 (11:33 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Wed, 30 Jul 2014 17:33:14 +0000 (11:33 -0600)
commit	8ea0d84754ce24036c43f6df893e667ae6d52b6d
tree	d035cd96eb50abe149b2558a45e26c3d67e7ea53	tree \| snapshot
parent	84aa17d81cdcad77f11f1810b7f524ddf782ac3c	commit \| diff
parent	94da12c862a7d2e6b0d941c030c5aefeba9a933c	commit \| diff

Merged from trunk (r13515).
Needs more work to handle FTP adaptation failures better.

20 files changed:

src/FtpGatewayServer.cc	diff1 \|	\|	blob \| history
src/FtpServer.cc	diff1 \|	\|	blob \| history
src/FtpServer.h	diff1 \|	\|	blob \| history
src/FwdState.cc	diff1 \|	diff2 \|	blob \| history
src/HttpHeader.cc	diff1 \|	diff2 \|	blob \| history
src/HttpHeader.h	diff1 \|	diff2 \|	blob \| history
src/HttpHeaderTools.cc	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/Server.cc	diff1 \|	diff2 \|	blob \| history
src/SquidConfig.h	diff1 \|	diff2 \|	blob \| history
src/anyp/PortCfg.cc	diff1 \|	diff2 \|	blob \| history
src/anyp/PortCfg.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/client_side.h	diff1 \|	diff2 \|	blob \| history
src/ftp.cc	diff1 \|	diff2 \|	blob \| history
src/main.cc	diff1 \|	diff2 \|	blob \| history
src/tests/stub_client_side.cc	diff1 \|	diff2 \|	blob \| history
src/tools.cc	diff1 \|	diff2 \|	blob \| history

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