Merged from trunk

diff --cc src/HttpHeaderTools.cc
Simple merge

diff --cc src/HttpReply.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge