[Pkg-xmpp-commits] [jabberd2] 02/05: Merge tag 'upstream/2.3.4'

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch master
in repository jabberd2.

commit 0242eb5af855b23964528db9a544f5de99d656a8
Merge: d128bfc a0d7bde
Author: Simon Josefsson <simon at josefsson.org>
Date:   Sun Nov 1 00:38:19 2015 +0100

    Merge tag 'upstream/2.3.4'
    
    Upstream version 2.3.4
    
    # gpg: Signatur gjordes sön  1 nov 2015 00:38:18 CET med RSA nyckel-id 32F8119D
    # gpg: Korrekt signatur från "Simon Josefsson <simon at josefsson.org>"
    # gpg:       även känd som "Simon Josefsson <simon at yubico.com>"

 .gitignore              |   1 +
 Makefile.am             |   2 +-
 NEWS                    |  23 ++
 README                  | 213 +----------------
 README.md               | 163 ++++++++++++-
 c2s/Makefile.am         |   3 +
 c2s/authreg.c           |  67 +++---
 c2s/c2s.c               |  58 ++---
 c2s/c2s.h               |  23 +-
 c2s/main.c              | 104 ++++++---
 configure.ac            |  15 +-
 etc/c2s.xml.dist.in     |  24 +-
 etc/s2s.xml.dist.in     |   5 +
 etc/sm.xml.dist.in      |  10 +-
 router/main.c           |   4 +-
 router/router.h         |   1 +
 s2s/main.c              |  12 +-
 s2s/out.c               |   6 +-
 s2s/s2s.h               |   7 +
 sm/main.c               |   3 +-
 sm/mod_disco.c          |  64 ++++--
 sm/sm.h                 |   1 +
 storage/Makefile.am     |   2 +-
 storage/authreg_anon.c  |   7 -
 storage/authreg_pgsql.c | 228 +++++++++++++------
 storage/storage_db.c    |   2 +-
 sx/Makefile.am          |   4 +
 sx/ack.c                |  12 +-
 sx/client.c             |   6 +-
 sx/compress.c           |  21 +-
 sx/error.c              |  36 +--
 sx/io.c                 |  24 +-
 sx/plugins.h            |  31 ++-
 sx/server.c             |  36 ++-
 sx/ssl.c                | 234 ++++++++++---------
 sx/sx.c                 |  14 +-
 sx/sx.h                 |   7 +-
 sx/websocket.c          | 590 ++++++++++++++++++++++++++++++++++++++++++++++++
 util/base64.c           |   6 +-
 util/crypt_blowfish.c   |   1 +
 util/uri.h              |   1 +
 41 files changed, 1458 insertions(+), 613 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git