---------------------
PatchSet 6096 
Date: 2007/11/06 18:04:24
Author: rousskov
Branch: ssl-bump
Tag: (none) 
Log:
Added ERR_SECURE_CONNECT_FAIL that is returned when we cannot secure
the established connection with the server. Formerly, ERR_CONNECT_FAIL
was returned.

Members: 
	src/client_side_request.cc:1.80.2.4->1.80.2.5 
	src/enums.h:1.38->1.38.6.1 
	src/forward.cc:1.75.6.1->1.75.6.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.4
retrieving revision 1.80.2.5
diff -u -r1.80.2.4 -r1.80.2.5
--- squid3/src/client_side_request.cc	6 Nov 2007 16:22:34 -0000	1.80.2.4
+++ squid3/src/client_side_request.cc	6 Nov 2007 18:04:24 -0000	1.80.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.80.2.4 2007/11/06 16:22:34 rousskov Exp $
+ * $Id: client_side_request.cc,v 1.80.2.5 2007/11/06 18:04:24 rousskov Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -199,6 +199,7 @@
     case ERR_DNS_FAIL:
 
     case ERR_CONNECT_FAIL:
+    case ERR_SECURE_CONNECT_FAIL:
 
     case ERR_READ_ERROR:
         n_bad++;
Index: squid3/src/enums.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/enums.h,v
retrieving revision 1.38
retrieving revision 1.38.6.1
diff -u -r1.38 -r1.38.6.1
--- squid3/src/enums.h	13 Aug 2007 17:24:15 -0000	1.38
+++ squid3/src/enums.h	6 Nov 2007 18:04:24 -0000	1.38.6.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.38 2007/08/13 17:24:15 squidadm Exp $
+ * $Id: enums.h,v 1.38.6.1 2007/11/06 18:04:24 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -69,6 +69,7 @@
     ERR_WRITE_ERROR,
     ERR_SHUTTING_DOWN,
     ERR_CONNECT_FAIL,
+    ERR_SECURE_CONNECT_FAIL,
     ERR_INVALID_REQ,
     ERR_UNSUP_REQ,
     ERR_INVALID_URL,
Index: squid3/src/forward.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/forward.cc,v
retrieving revision 1.75.6.1
retrieving revision 1.75.6.2
diff -u -r1.75.6.1 -r1.75.6.2
--- squid3/src/forward.cc	5 Nov 2007 17:53:00 -0000	1.75.6.1
+++ squid3/src/forward.cc	6 Nov 2007 18:04:24 -0000	1.75.6.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.75.6.1 2007/11/05 17:53:00 rousskov Exp $
+ * $Id: forward.cc,v 1.75.6.2 2007/11/06 18:04:24 rousskov Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -582,7 +582,7 @@
              debugs(81, 1, "fwdNegotiateSSL: Error negotiating SSL connection on FD " << fd << 
                     ": " << ERR_error_string(ERR_get_error(), NULL) << " (" << ssl_error << 
                     "/" << ret << "/" << errno << ")");
-            ErrorState *anErr = errorCon(ERR_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request);
+            ErrorState *anErr = errorCon(ERR_SECURE_CONNECT_FAIL, HTTP_SERVICE_UNAVAILABLE, request);
 #ifdef EPROTO
 
             anErr->xerrno = EPROTO;