---------------------
PatchSet 6089 
Date: 2007/11/06 00:23:13
Author: rousskov
Branch: ssl-bump
Tag: (none) 
Log:
Intercept CONNECT requests only if sslBump option is set for the http_port.
Eventually, we may need an ACL to decide what CONNECT requests should be
intercepted.

Members: 
	src/client_side_request.cc:1.80.2.1->1.80.2.2 

Index: squid3/src/client_side_request.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/client_side_request.cc,v
retrieving revision 1.80.2.1
retrieving revision 1.80.2.2
diff -u -r1.80.2.1 -r1.80.2.2
--- squid3/src/client_side_request.cc	5 Nov 2007 17:52:37 -0000	1.80.2.1
+++ squid3/src/client_side_request.cc	6 Nov 2007 00:23:13 -0000	1.80.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.80.2.1 2007/11/05 17:52:37 rousskov Exp $
+ * $Id: client_side_request.cc,v 1.80.2.2 2007/11/06 00:23:13 rousskov Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -47,6 +47,7 @@
 #include "client_side_request.h"
 #include "AuthUserRequest.h"
 #include "HttpRequest.h"
+#include "ProtoPort.h"
 #include "ACLChecklist.h"
 #include "ACL.h"
 #include "client_side.h"
@@ -879,7 +880,7 @@
 {
     debugs(85, 4, "clientProcessRequest: " << RequestMethodStr[request->method] << " '" << uri << "'");
 
-    if (request->method == METHOD_CONNECT && true) { // XXX: check flags?
+    if (request->method == METHOD_CONNECT && getConn()->port->sslBump) {
         sslBumpStart();
         return;
     }