Changeset b79308b for protocols/jabber/io.c

Timestamp:

2008-04-14T13:10:53Z (17 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:

• protocols/jabber/io.c (modified) (2 diffs)

protocols/jabber/io.c

@@ -241 +241 @@
         }
         
-        /* EAGAIN/etc or a successful read. */
-        return TRUE;
+        if( ssl_pending( jd->ssl ) )
+                /* OpenSSL empties the TCP buffers completely but may keep some
+                   data in its internap buffers. select() won't see that, but
+                   ssl_pending() does. */
+                return jabber_read_callback( data, fd, cond );
+        else
+                return TRUE;
 }
 
@@ -521 +526 @@
            from the server too. */
         xt_free( jd->xt );      /* In case we're RE-starting. */
-        jd->xt = xt_new( ic );
-        jd->xt->handlers = (struct xt_handler_entry*) jabber_handlers;
+        jd->xt = xt_new( jabber_handlers, ic );
         
         if( jd->r_inpa <= 0 )