head	1.6;
access;
symbols;
locks; strict;
comment	@# @;


1.6
date	2003.01.20.20.48.20;	author swiergot;	state Exp;
branches;
next	1.5;

1.5
date	2003.01.20.19.11.29;	author swiergot;	state Exp;
branches;
next	1.4;

1.4
date	2003.01.20.18.34.42;	author swiergot;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.19.19.49.58;	author swiergot;	state Exp;
branches;
next	1.2;

1.2
date	2003.01.19.14.24.43;	author swiergot;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.19.12.53.03;	author swiergot;	state Exp;
branches;
next	;


desc
@@


1.6
log
@- In rc.jabberd, wait 5 seconds before running jggtrans.
- Kill jabberd by pid from pidfile.
@
text
@--- ../../tmp/jabber-1.4.2/jabberd/mio_ssl.c	Fri Feb  8 02:39:27 2002
+++ mio_ssl.c	Tue May 28 12:16:11 2002
@@@@ -219,6 +219,7 @@@@
     SSL_CTX *ctx = NULL;
     int fd;
     int sret;
+    int flags;
 
     if(m->ip == NULL)
     {
@@@@ -228,6 +229,12 @@@@
 
     fd = accept(m->fd, serv_addr, addrlen);
     
+    /* set the socket to non-blocking as this is not
+       inherited */
+    flags =  fcntl(fd, F_GETFL, 0);
+    flags |= O_NONBLOCK;
+    fcntl(fd, F_SETFL, flags);
+
     ctx = ghash_get(ssl__ctxs, m->ip);
     if(ctx == NULL)
     {
@@@@ -235,7 +242,8 @@@@
         return -1;
     }
     ssl = SSL_new(ctx);
-    log_debug(ZONE, "SSL accepting socket with new session %x", ssl);
+    log_debug(ZONE, "SSL accepting socket from %s with new session %x",
+                                   m->ip, ssl);
     SSL_set_fd(ssl, fd);
     SSL_set_accept_state(ssl);
     sret = SSL_accept(ssl);
@


1.5
log
@- Added support for jggtrans to rc.jabberd.
- Cosmetics in rc.jabberd.
@
text
@@


1.4
log
@- Added example sections to jabber.xml to run GG transport.
@
text
@@


1.3
log
@- Fixed a path to key.pem in the dirs patch.
- Improved rc.jabberd (start/stop/restart).
- Cosmetics in script.postinst output.
@
text
@@


1.2
log
@- In rc.jabberd, chown -R jabber.users /var/log/jabber.
@
text
@@


1.1
log
@- Added a jhome patch to fix home directory of running jabberd.
- Added mio_ssl.c.patch to close a DoS attack possibility.
- Improved rc.jabberd.
@
text
@@


.