Changeset 6738a67 for lib/ssl_gnutls.c

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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 in latest trunk

File:

• lib/ssl_gnutls.c (modified) (1 diff)

lib/ssl_gnutls.c

@@ -216 +216 @@
 }
 
+/* See ssl_openssl.c for an explanation. */
+int ssl_pending( void *conn )
+{
+        return 0;
+}
+
 void ssl_disconnect( void *conn_ )
 {