Changeset 3fbce97 for lib/ssl_nss.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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:

Merge branch 'master' into parson

File:

• lib/ssl_nss.c (modified) (2 diffs)

lib/ssl_nss.c

@@ -226 +226 @@
         if (conn->prfd) {
                 PR_Close(conn->prfd);
-        }
-        if (source >= 0) {
+        } else if (source >= 0) {
+                /* proxy_disconnect() would be redundant here */
                 closesocket(source);
         }
@@ -305 +305 @@
         if (conn->prfd) {
                 PR_Close(conn->prfd);
+        } else if (conn->fd) {
+                proxy_disconnect(conn->fd);
         }