------------------------------------------------------------
revno: 13684
revision-id: squid3@treenet.co.nz-20141209101836-srle29ru3nnf5yvu
parent: squid3@treenet.co.nz-20141208083751-za559fem6v9igupl
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2014-12-09 02:18:36 -0800
message:
  Fix port errors in rev.13674
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141209101836-srle29ru3nnf5yvu
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 3ccfc47c5829d22b99f8b71562ee01b5da53162b
# timestamp: 2014-12-09 10:51:04 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141208083751-\
#   za559fem6v9igupl
# 
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc	2014-12-08 08:17:31 +0000
+++ src/client_side.cc	2014-12-09 10:18:36 +0000
@@ -2213,9 +2213,9 @@
      * Deny "PRI" method if used in HTTP/1.x or 0.9 versions.
      * If seen it signals a broken client or proxy has corrupted the traffic.
      */
-    if (hp->method() == Http::METHOD_PRI && hp->messageProtocol() < Http::ProtocolVersion(2,0)) {
-        debugs(33, DBG_IMPORTANT, "WARNING: PRI method received on " << csd->transferProtocol << " port " << csd->port->s.port());
-        debugs(33, DBG_IMPORTANT, "WARNING: for request: " << hp->method() << " " << hp->requestUri() << " " << hp->messageProtocol());
+    if (*method_p == Http::METHOD_PRI && *http_ver < Http::ProtocolVersion(2,0)) {
+        debugs(33, DBG_IMPORTANT, "WARNING: PRI method received on " << csd->port->transport.protocol << "port " << csd->port->s.port());
+        debugs(33, DBG_IMPORTANT, "WARNING: for request: " << hp->buf);
         hp->request_parse_status = Http::scMethodNotAllowed;
         return csd->abortRequestParsing("error:method-not-allowed");
     }