=== modified file 'src/adaptation/ecap/MessageRep.cc' --- src/adaptation/ecap/MessageRep.cc 2014-04-27 07:59:17 +0000 +++ src/adaptation/ecap/MessageRep.cc 2014-05-02 17:20:05 +0000 @@ -118,41 +118,41 @@ } libecap::Version Adaptation::Ecap::FirstLineRep::version() const { return libecap::Version(theMessage.http_ver.major, theMessage.http_ver.minor); } void Adaptation::Ecap::FirstLineRep::version(const libecap::Version &aVersion) { theMessage.http_ver.major = aVersion.majr; theMessage.http_ver.minor = aVersion.minr; } libecap::Name Adaptation::Ecap::FirstLineRep::protocol() const { // TODO: optimize? - switch (theMessage.protocol) { + switch (theMessage.http_ver.protocol) { case AnyP::PROTO_HTTP: return libecap::protocolHttp; case AnyP::PROTO_HTTPS: return libecap::protocolHttps; case AnyP::PROTO_FTP: return libecap::protocolFtp; case AnyP::PROTO_GOPHER: return libecap::protocolGopher; case AnyP::PROTO_WAIS: return libecap::protocolWais; case AnyP::PROTO_WHOIS: return libecap::protocolWhois; case AnyP::PROTO_URN: return libecap::protocolUrn; case AnyP::PROTO_ICP: return protocolIcp; #if USE_HTCP case AnyP::PROTO_HTCP: return protocolHtcp; #endif @@ -162,41 +162,41 @@ return protocolIcy; case AnyP::PROTO_COAP: case AnyP::PROTO_COAPS: // use 'unknown' until libecap supports coap:// and coaps:// case AnyP::PROTO_UNKNOWN: return protocolUnknown; // until we remember the protocol image case AnyP::PROTO_NONE: return Name(); case AnyP::PROTO_MAX: break; // should not happen // no default to catch AnyP::PROTO_ additions } Must(false); // not reached return Name(); } void Adaptation::Ecap::FirstLineRep::protocol(const Name &p) { // TODO: what happens if we fail to translate some protocol? - theMessage.protocol = TranslateProtocolId(p); + theMessage.http_ver.protocol = TranslateProtocolId(p); } AnyP::ProtocolType Adaptation::Ecap::FirstLineRep::TranslateProtocolId(const Name &name) { if (name.assignedHostId()) return static_cast(name.hostId()); return AnyP::PROTO_UNKNOWN; } /* RequestHeaderRep */ Adaptation::Ecap::RequestLineRep::RequestLineRep(HttpRequest &aMessage): FirstLineRep(aMessage), theMessage(aMessage) { } void Adaptation::Ecap::RequestLineRep::uri(const Area &aUri) {