25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-06 16:42:56 +01:00

* src/ejabberd_c2s.erl: Send new id for each new stream inside one

session (thanks to Maxim Ryazanov)

* src/tls/tls_drv.c: Now reads all certificates from certificate
file instead of reading only first one (thanks to Karl-Johan
Karlsson)

* examples/transport-configs/init-scripts/jabber-gg-transport:
Fixed typo (thanks to Sander Devrieze)

SVN Revision: 305
This commit is contained in:
Alexey Shchepin 2005-04-09 23:47:56 +00:00
parent e23e473012
commit 13de45118d
4 changed files with 20 additions and 4 deletions

3
.cvslog Normal file
View File

@ -0,0 +1,3 @@
jabber://aleksey@jabber.ru
jabber://sgolovan@nes.ru
ryazanov@gmail.com

View File

@ -1,3 +1,17 @@
2005-04-09 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: Send new id for each new stream inside one
session (thanks to Maxim Ryazanov)
* src/tls/tls_drv.c: Now reads all certificates from certificate
file instead of reading only first one (thanks to Karl-Johan
Karlsson)
2005-04-06 Alexey Shchepin <alexey@sevcom.net>
* examples/transport-configs/init-scripts/jabber-gg-transport:
Fixed typo (thanks to Sander Devrieze)
2005-04-05 Alexey Shchepin <alexey@sevcom.net>
* examples/transport-configs/configs/msn-transport.xml: Fixed typo

View File

@ -33,8 +33,7 @@ case "$1" in
stop)
echo "Stopping $NAME."
killall $NAME &
# BUG REPORTEN hiervoor: bij afsluiten blijft telkens PID-bestand achter
rm $HOME/../../../var/run/jabber/jabber-gg-transport.pid
rm /var/run/jabber/jabber-gg-transport.pid
;;
restart|reload)

View File

@ -80,8 +80,8 @@ static int tls_drv_control(ErlDrvData handle,
d->ctx = SSL_CTX_new(SSLv23_server_method());
die_unless(d->ctx, "SSL_CTX_new failed");
res = SSL_CTX_use_certificate_file(d->ctx, buf, SSL_FILETYPE_PEM);
die_unless(res > 0, "SSL_CTX_use_certificate_file failed");
res = SSL_CTX_use_certificate_chain_file(d->ctx, buf);
die_unless(res > 0, "ssl_ctx_use_certificate_chain_file failed");
res = SSL_CTX_use_PrivateKey_file(d->ctx, buf, SSL_FILETYPE_PEM);
die_unless(res > 0, "SSL_CTX_use_PrivateKey_file failed");