]> git.ipfire.org Git - thirdparty/squid.git/commit - src/wordlist.h
Merge from trunk
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Fri, 24 Feb 2012 13:17:24 +0000 (15:17 +0200)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Fri, 24 Feb 2012 13:17:24 +0000 (15:17 +0200)
commit03f00a1184594d82540b50b4c6ba3568993f1cb7
tree8c14b14c1d25f8e208f34d93fbb8f3f445f25ff6
parentc5bd24d6b84f9289025b7fe4291c6043d622941d
parent9f9211930fcaae7d410c9951d254051c7a6215bf
Merge from trunk
30 files changed:
src/AclRegs.cc
src/HttpRequest.h
src/Makefile.am
src/ProtoPort.h
src/acl/FilledChecklist.cc
src/acl/FilledChecklist.h
src/acl/SslError.cc
src/acl/SslErrorData.cc
src/anyp/ProtocolType.h
src/cache_cf.cc
src/cf.data.pre
src/client_side.cc
src/client_side.h
src/client_side_reply.cc
src/client_side_reply.h
src/client_side_request.cc
src/forward.cc
src/globals.h
src/ssl/ErrorDetail.cc
src/ssl/ServerPeeker.cc
src/ssl/certificate_db.cc
src/ssl/crtd_message.cc
src/ssl/gadgets.cc
src/ssl/helper.cc
src/ssl/ssl_crtd.cc
src/ssl/support.cc
src/structs.h
src/tunnel.cc
src/typedefs.h
src/url.cc