Do not try to do SSL handshake if the connect() fails

This will avoid this icky error:

    $ https-client -4 -url https://127.1
    some request failed - no idea which one though!
    error:00000005:lib(0):func(0):DH lib

And instead will report only:

    $ https-client -4 -url https://127.1
    some request failed - no idea which one though!
    socket error = Connection refused (111)

Refs: #1115

diff --git a/bufferevent_ssl.c b/bufferevent_ssl.c
index b34af9af42e75bf8b91139963dae3327b15aa336..a946c162f9d76f166b3230584b8a31a603caedbf 100644 (file)
--- a/bufferevent_ssl.c
+++ b/bufferevent_ssl.c
@@ -739,8 +739,13 @@ be_ssl_handshakeeventcb(evutil_socket_t fd, short what, void *ptr)
        bufferevent_incref_and_lock_(&bev_ssl->bev.bev);
        if (what & EV_TIMEOUT) {
                bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_TIMEOUT, 0);
-       } else
-               do_handshake(bev_ssl);/* XXX handle failure */
+       } else {
+               int c = evutil_socket_finished_connecting_(fd);
+               if (c < 0)
+                       bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_ERROR, 0);
+               else
+                       do_handshake(bev_ssl);/* XXX handle failure */
+       }
        bufferevent_decref_and_unlock_(&bev_ssl->bev.bev);
 }
 

diff --git a/util-internal.h b/util-internal.h
index 9010b2e375432c6d4342d1d1c79953b6a6f37b3d..dabb6d6ba0119ecc9f40073a9ec00f24daae3c17 100644 (file)
--- a/util-internal.h
+++ b/util-internal.h
@@ -300,6 +300,7 @@ int evutil_read_file_(const char *filename, char **content_out, size_t *len_out,
 EVENT2_EXPORT_SYMBOL
 int evutil_socket_connect_(evutil_socket_t *fd_ptr, const struct sockaddr *sa, int socklen);
 
+EVENT2_EXPORT_SYMBOL
 int evutil_socket_finished_connecting_(evutil_socket_t fd);
 
 #ifdef EVENT__HAVE_AFUNIX_H