]> git.ipfire.org Git - thirdparty/squid.git/commit
Merge from trunk
authorAmos Jeffries <squid3@treenet.co.nz>
Sat, 17 Apr 2010 10:38:50 +0000 (22:38 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 17 Apr 2010 10:38:50 +0000 (22:38 +1200)
commit74d45fa5faa00b3385d940951ff4cee8d1ca5ac9
tree05eac84c31b9e58a2f72b70c961191e567b176d8
parenta088a99926439a8b33acacea13464b36861d9539
parentb7ac5457b2c07bf13d3123a4035d22f6c79ce37e
Merge from trunk
27 files changed:
src/CompositePoolNode.h
src/HttpRequest.h
src/Makefile.am
src/acl/FilledChecklist.h
src/adaptation/icap/ModXact.cc
src/auth/AclMaxUserIp.cc
src/auth/AclMaxUserIp.h
src/auth/User.cc
src/auth/User.h
src/auth/UserRequest.cc
src/auth/UserRequest.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/errorpage.h
src/external_acl.cc
src/http.cc
src/main.cc
src/protos.h
src/redirect.cc
src/stat.cc
src/structs.h
src/tests/testAuth.h