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 c89973f998574a4534dce73c1bd7ed6221710993..926029e551ca59131dc1509bc52e1b8cdd91cef6 100644 (file)
--- 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 16004b28c7bd536da899fce8c1095b1298f7453a..a994497b1f4978154ac8913f1eedff114372428b 100644 (file)
--- 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);