From: hno <>
Date: Mon, 29 Oct 2001 23:06:31 +0000 (+0000)
Subject: Further cleanups of Bugzilla #255 related issues.
X-Git-Tag: SQUID_3_0_PRE1~1312
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b3ce25aeea0095f6d366b607aebb121db84ae3e;p=thirdparty%2Fsquid.git

Further cleanups of Bugzilla #255 related issues.
 * Partly backed out the previous patch. We can store the status, only need
   to do it slightly different.
 * Same error was repeated a few lines down for another "error" case.
   (out of filedescriptors)
---

diff --git a/src/ssl.cc b/src/ssl.cc
index c89973f998..926029e551 100644
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.117 2001/10/25 19:51:27 hno Exp $
+ * $Id: ssl.cc,v 1.118 2001/10/29 16:06:31 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -456,6 +456,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *s
 	answer = aclCheckFast(Config.accessList.miss, &ch);
 	if (answer == 0) {
 	    err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
+	    *status_ptr = HTTP_FORBIDDEN;
 	    err->request = requestLink(request);
 	    err->src_addr = request->client_addr;
 	    errorSend(fd, err);
@@ -477,7 +478,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *s
     if (sock == COMM_ERROR) {
 	debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
 	err = errorCon(ERR_SOCKET_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-	*sslState->status_ptr = HTTP_INTERNAL_SERVER_ERROR;
+	*status_ptr = HTTP_INTERNAL_SERVER_ERROR;
 	err->xerrno = errno;
 	err->request = requestLink(request);
 	errorSend(fd, err);
diff --git a/src/tunnel.cc b/src/tunnel.cc
index 16004b28c7..a994497b1f 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.117 2001/10/25 19:51:27 hno Exp $
+ * $Id: tunnel.cc,v 1.118 2001/10/29 16:06:31 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -456,6 +456,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *s
 	answer = aclCheckFast(Config.accessList.miss, &ch);
 	if (answer == 0) {
 	    err = errorCon(ERR_FORWARDING_DENIED, HTTP_FORBIDDEN);
+	    *status_ptr = HTTP_FORBIDDEN;
 	    err->request = requestLink(request);
 	    err->src_addr = request->client_addr;
 	    errorSend(fd, err);
@@ -477,7 +478,7 @@ sslStart(int fd, const char *url, request_t * request, size_t * size_ptr, int *s
     if (sock == COMM_ERROR) {
 	debug(26, 4) ("sslStart: Failed because we're out of sockets.\n");
 	err = errorCon(ERR_SOCKET_FAILURE, HTTP_INTERNAL_SERVER_ERROR);
-	*sslState->status_ptr = HTTP_INTERNAL_SERVER_ERROR;
+	*status_ptr = HTTP_INTERNAL_SERVER_ERROR;
 	err->xerrno = errno;
 	err->request = requestLink(request);
 	errorSend(fd, err);