------------------------------------------------------------ revno: 13392 revision-id: squid3@treenet.co.nz-20140503103531-z7goapps6xsl2dhf parent: squid3@treenet.co.nz-20140502102908-ff267j1je0bk0pow committer: Amos Jeffries branch nick: trunk timestamp: Sat 2014-05-03 03:35:31 -0700 message: Fix generated HTTP message version labels Squid being conditionally compliant with RFC 2616 should be handling HTTP/1.1 at all times unless another version was explicitly received. This makes the default version number for all generated messages be 1.1 unless the alternative constructor is used or the numeric members are explicitly set to other values. As a result all Squid generated messages are labelled correctly as 1.1 by default now. Fixes message version details sent to ICAP/eCAP on many error or internally generated responses. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140503103531-z7goapps6xsl2dhf # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: fa753f4b2310226712f3a395d8c37a878dd1f720 # timestamp: 2014-05-03 11:03:11 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140502102908-\ # ff267j1je0bk0pow # # Begin patch === modified file 'src/http/ProtocolVersion.h' --- src/http/ProtocolVersion.h 2013-03-17 12:19:16 +0000 +++ src/http/ProtocolVersion.h 2014-05-03 10:35:31 +0000 @@ -8,12 +8,15 @@ /** * Stores HTTP version label information. - * For example HTTP/1.0 + * + * Squid being conditionally compliant with RFC 2616 + * on both client and server connections the default + * value is HTTP/1.1. */ class ProtocolVersion : public AnyP::ProtocolVersion { public: - ProtocolVersion() : AnyP::ProtocolVersion(AnyP::PROTO_HTTP,0,0) {} + ProtocolVersion() : AnyP::ProtocolVersion(AnyP::PROTO_HTTP,1,1) {} ProtocolVersion(unsigned int aMajor, unsigned int aMinor) : AnyP::ProtocolVersion(AnyP::PROTO_HTTP,aMajor,aMinor) {} };