Changeset dd34575 for lib/ssl_nss.c

Timestamp:

2008-04-02T13:28:23Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

6ff51ff, 85d7b85

Parents:

0db75ad (diff), fa75134 (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 trunk.

File:

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

lib/ssl_nss.c

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