Changeset 0db6618


Ignore:
Timestamp:
2015-10-26T08:28:10Z (9 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
345577b
Parents:
4e365ce
git-author:
dequis <dx@…> (26-10-15 08:18:51)
git-committer:
dequis <dx@…> (26-10-15 08:28:10)
Message:

Use proxy_disconnect() in http, ssl, jabber, oscar

Twitter and MSN are all HTTP/SSL, so they don't need it either.

The out of tree facebook and steam plugins are also covered by the
HTTP/SSL changes.

Yahoo is written in a weird way and doesn't seem to need it (it seems it
doesn't immediately stop connections when you tell it to logout)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lib/http_client.c

    r4e365ce r0db6618  
    700700                ssl_disconnect(req->ssl);
    701701        } else {
    702                 closesocket(req->fd);
     702                proxy_disconnect(req->fd);
    703703        }
    704704
  • lib/ssl_gnutls.c

    r4e365ce r0db6618  
    455455        }
    456456
    457         closesocket(conn->fd);
     457        proxy_disconnect(conn->fd);
    458458
    459459        if (conn->session) {
  • lib/ssl_nss.c

    r4e365ce r0db6618  
    226226        if (conn->prfd) {
    227227                PR_Close(conn->prfd);
    228         }
    229         if (source >= 0) {
     228        } else if (source >= 0) {
     229                /* proxy_disconnect() would be redundant here */
    230230                closesocket(source);
    231231        }
     
    305305        if (conn->prfd) {
    306306                PR_Close(conn->prfd);
     307        } else if (conn->fd) {
     308                proxy_disconnect(conn->fd);
    307309        }
    308310
  • lib/ssl_openssl.c

    r4e365ce r0db6618  
    131131                conn->func(conn->data, 1, NULL, cond);
    132132                if (source >= 0) {
    133                         closesocket(source);
     133                        proxy_disconnect(source);
    134134                }
    135135                ssl_conn_free(conn);
     
    276276        }
    277277
    278         closesocket(conn->fd);
     278        proxy_disconnect(conn->fd);
    279279
    280280        ssl_conn_free(conn);
  • protocols/jabber/jabber.c

    r4e365ce r0db6618  
    345345        }
    346346        if (jd->fd >= 0) {
    347                 closesocket(jd->fd);
     347                proxy_disconnect(jd->fd);
    348348        }
    349349
  • protocols/oscar/conn.c

    r4e365ce r0db6618  
    317317
    318318        if (deadconn->fd >= 3) {
    319                 closesocket(deadconn->fd);
     319                proxy_disconnect(deadconn->fd);
    320320        }
    321321        deadconn->fd = -1;
Note: See TracChangeset for help on using the changeset viewer.