Merged from trunk.

diff --cc configure.in
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side_request.h
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/structs.h
Simple merge