Changeset eded1f7 for lib


Ignore:
Timestamp:
2007-12-18T23:59:35Z (17 years ago)
Author:
kenobi <kenobi@…>
Branches:
master
Children:
2379566
Parents:
dc0ba9c
Message:

Merged in 280..288 from upstream (e.g. PING)

Location:
lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lib/misc.c

    rdc0ba9c reded1f7  
    4444#include <resolv.h>
    4545#endif
     46
     47#include "ssl_client.h"
    4648
    4749void strip_linefeed(gchar *text)
     
    591593        return g_string_free( ret, FALSE );
    592594}
     595
     596gboolean ssl_sockerr_again( void *ssl )
     597{
     598        if( ssl )
     599                return ssl_errno == SSL_AGAIN;
     600        else
     601                return sockerr_again();
     602}
  • lib/misc.h

    rdc0ba9c reded1f7  
    6666G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
    6767
     68G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
     69
    6870#endif
  • lib/ssl_gnutls.c

    rdc0ba9c reded1f7  
    223223        closesocket( conn->fd );
    224224       
    225         gnutls_deinit( conn->session );
    226         gnutls_certificate_free_credentials( conn->xcred );
     225        if( conn->session )
     226                gnutls_deinit( conn->session );
     227        if( conn->xcred )
     228                gnutls_certificate_free_credentials( conn->xcred );
    227229        g_free( conn );
    228230}
Note: See TracChangeset for help on using the changeset viewer.