Changeset b79308b for lib/ssl_nss.c

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

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_ )
 {