diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /lib/ssl_gnutls.c | |
parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'lib/ssl_gnutls.c')
-rw-r--r-- | lib/ssl_gnutls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl_gnutls.c b/lib/ssl_gnutls.c index 721137b8..74ac49b6 100644 --- a/lib/ssl_gnutls.c +++ b/lib/ssl_gnutls.c @@ -193,6 +193,8 @@ int ssl_read( void *conn, char *buf, int len ) if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED ) ssl_errno = SSL_AGAIN; + if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st ); + return st; } @@ -212,6 +214,8 @@ int ssl_write( void *conn, const char *buf, int len ) if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED ) ssl_errno = SSL_AGAIN; + if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st ); + return st; } |