Changeset b1dc403 for lib/ssl_gnutls.c

Timestamp:

2015-05-04T21:58:50Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Catch up with master.

File:

• lib/ssl_gnutls.c (modified) (4 diffs)

lib/ssl_gnutls.c

@@ -124 +124 @@
 
         if (conn->fd < 0) {
+                g_free(conn->hostname);
                 g_free(conn);
                 return NULL;
@@ -314 +315 @@
         if (source == -1) {
                 conn->func(conn->data, 0, NULL, cond);
+                g_free(conn->hostname);
                 g_free(conn);
                 return FALSE;
@@ -355 +357 @@
                         conn->func(conn->data, 0, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 }
         } else {
@@ -364 +363 @@
                         conn->func(conn->data, stver, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 } else {
                         /* For now we can't handle non-blocking perfectly everywhere... */