Changeset 2139

Timestamp:

03/28/2008 04:33:15 PM (5 months ago)

Author:

stbuehler

Message:

Fixed SSL_shutdown error handling problems which became visible after [2136].

Files:

• branches/lighttpd-1.4.x/src/connections.c (modified) (2 diffs)

branches/lighttpd-1.4.x/src/connections.c

@@ -1670 +1670 @@
 #ifdef USE_OPENSSL
                         if (srv_sock->is_ssl) {
-                                int ret;
+                                int ret, ssl_r;
+                                unsigned long err;
                                 ERR_clear_error();
                                 switch ((ret = SSL_shutdown(con->ssl))) {
@@ -1678 +1679 @@
                                 case 0:
                                         ERR_clear_error();
-                                        if ((ret = SSL_shutdown(con->ssl)) == 1) break;
+                                        if (-1 != (ret = SSL_shutdown(con->ssl))) break;
 
                                         // fall through
                                 default:
-                                        log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:",
-                                                        SSL_get_error(con->ssl, ret),
-                                                        ERR_error_string(ERR_get_error(), NULL));
-                                        return -1;
+
+                                        switch ((ssl_r = SSL_get_error(con->ssl, ret))) {
+                                        case SSL_ERROR_WANT_WRITE:
+                                        case SSL_ERROR_WANT_READ:
+                                                break;
+                                        case SSL_ERROR_SYSCALL:
+                                                /* perhaps we have error waiting in our error-queue */
+                                                if (0 != (err = ERR_get_error())) {
+                                                        do {
+                                                                log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
+                                                                                ssl_r, ret,
+                                                                                ERR_error_string(err, NULL));
+                                                        } while((err = ERR_get_error()));
+                                                } else {
+                                                        log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
+                                                                        ssl_r, r, errno,
+                                                                        strerror(errno));
+                                                }
+        
+                                                break;
+                                        default:
+                                                while((err = ERR_get_error())) {
+                                                        log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:",
+                                                                        ssl_r, ret,
+                                                                        ERR_error_string(err, NULL));
+                                                }
+        
+                                                break;
+                                        }
                                 }
                         }
+                        ERR_clear_error();
 #endif