]>
granicus.if.org Git - ejabberd/log
Badlop [Thu, 6 Dec 2007 17:42:25 +0000 (17:42 +0000)]
* src/ejabberd_c2s.erl: Increase the timeout of open socket
without authentication to 60 seconds because many Jabber clients
are not yet capable of handling this correctly (EJAB-355)
SVN Revision: 1040
Badlop [Thu, 6 Dec 2007 17:14:39 +0000 (17:14 +0000)]
* src/Makefile.in: Allow compilation with HiPE, disabled by
default, undocumented and unrecommended because it is experimental
and doesn't seem to provide meaningful gains currently (thanks to
Samuel Tardieu) (EJAB-412)
* src/configure.ac: Likewise
SVN Revision: 1039
Badlop [Thu, 6 Dec 2007 17:09:35 +0000 (17:09 +0000)]
* src/Makefile.in: Allow compilation with HiPE (EJAB-412)
* src/configure.ac: Likewise
SVN Revision: 1038
Badlop [Thu, 6 Dec 2007 16:04:46 +0000 (16:04 +0000)]
* src/msgs/cs.msg: Updated (thanks to Lukáš Polívka alias
Spike411)
SVN Revision: 1037
Badlop [Thu, 6 Dec 2007 15:40:21 +0000 (15:40 +0000)]
* src/mod_muc/mod_muc.erl: Catch creation of table
muc_online_users: it may be already created by other mod_muc
instance
SVN Revision: 1036
Badlop [Thu, 6 Dec 2007 15:31:17 +0000 (15:31 +0000)]
* doc/Makefile: Remove bashism (now really committed)
SVN Revision: 1035
Badlop [Thu, 6 Dec 2007 15:26:53 +0000 (15:26 +0000)]
* doc/Makefile: Remove bashism
* doc/guide.tex: Document how to change computer
hostname (EJAB-320)
SVN Revision: 1034
Badlop [Thu, 6 Dec 2007 11:24:57 +0000 (11:24 +0000)]
* src/web/ejabberd_http.erl: Change loglevel for http
queries (EJAB-363)
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 1033
Badlop [Thu, 6 Dec 2007 11:13:29 +0000 (11:13 +0000)]
* doc/guide.tex: Add mod_caps and improve mod_pubsub documentation
* src/ejabberd.cfg.example: Added mod_caps enabled by default
SVN Revision: 1032
Christophe Romain [Thu, 6 Dec 2007 09:29:28 +0000 (09:29 +0000)]
enable pep by default and add pubsub plugin examples
SVN Revision: 1031
Badlop [Thu, 6 Dec 2007 00:31:09 +0000 (00:31 +0000)]
* doc/guide.tex: Document the Debug Console (EJAB-395)
SVN Revision: 1030
Badlop [Wed, 5 Dec 2007 23:58:38 +0000 (23:58 +0000)]
* src/ejabberdctl.template: The parameter 'kernel inetrc' is used
even with -sname to guarantee the same behaviour that when using
-name (EJAB-317)
SVN Revision: 1029
Badlop [Wed, 5 Dec 2007 23:46:50 +0000 (23:46 +0000)]
* doc/guide.tex: Improvements in sections: Start, Creating Initial
Account, Module Overview, Managing an ejabberd server, and
Debugging
SVN Revision: 1028
Badlop [Wed, 5 Dec 2007 18:53:09 +0000 (18:53 +0000)]
* doc/guide.tex: Added explanations about epmd, cookie and node
name (EJAB-251)
SVN Revision: 1027
Badlop [Wed, 5 Dec 2007 11:59:12 +0000 (11:59 +0000)]
* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
SVN Revision: 1026
Badlop [Wed, 5 Dec 2007 09:09:09 +0000 (09:09 +0000)]
* src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence
to make more natural
SVN Revision: 1025
Badlop [Wed, 5 Dec 2007 00:59:33 +0000 (00:59 +0000)]
* src/msgs/es.msg: Updated
SVN Revision: 1024
Badlop [Wed, 5 Dec 2007 00:31:30 +0000 (00:31 +0000)]
* src/ejabberd.hrl: Set more proper version number
SVN Revision: 1023
Badlop [Tue, 4 Dec 2007 23:41:52 +0000 (23:41 +0000)]
* contrib/extract_translations/extract_translations.erl: Don't
report [] to be translated. Identify unusued strings.
SVN Revision: 1022
Badlop [Tue, 4 Dec 2007 21:40:25 +0000 (21:40 +0000)]
* .gitignore: Removed (EJAB-441)
* src/.cvsignore: Likewise
SVN Revision: 1021
Badlop [Tue, 4 Dec 2007 21:35:41 +0000 (21:35 +0000)]
* src/mod_pubsub/mod_pubsub.erl: Fixed URI.
SVN Revision: 1020
Badlop [Tue, 4 Dec 2007 11:38:00 +0000 (11:38 +0000)]
* src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber
server as a pubsub service.
SVN Revision: 1019
Mickaël Rémond [Mon, 3 Dec 2007 10:51:22 +0000 (10:51 +0000)]
* ChangeLog: Fix conflict.
SVN Revision: 1018
Mickaël Rémond [Mon, 3 Dec 2007 10:51:06 +0000 (10:51 +0000)]
* ChangeLog: Update.
SVN Revision: 1017
Mickaël Rémond [Mon, 3 Dec 2007 10:50:36 +0000 (10:50 +0000)]
* src/mod_muc.erl: Added option to limit the number of room a user is
allowed to connect to (EJAB-445).
* src/mod_muc_room.erl: Likewise.
* doc/guide.tex: Likewise.
SVN Revision: 1016
Mickaël Rémond [Mon, 3 Dec 2007 10:47:42 +0000 (10:47 +0000)]
* Temporary commit.
SVN Revision: 1015
Badlop [Sun, 2 Dec 2007 21:13:25 +0000 (21:13 +0000)]
* src/ejabberdctl.cfg.example: Bugfix in kernel poll. Added SMP
option. Reorganization of options
* src/ejabberdctl.template: Added SMP option
SVN Revision: 1014
Badlop [Sun, 2 Dec 2007 01:03:18 +0000 (01:03 +0000)]
* src/Makefile.in: New options make uninstall and
uninstall-all (EJAB-293)
SVN Revision: 1013
Mickaël Rémond [Sat, 1 Dec 2007 16:43:10 +0000 (16:43 +0000)]
* doc/*.html: Rebuild.
SVN Revision: 1012
Mickaël Rémond [Sat, 1 Dec 2007 16:43:04 +0000 (16:43 +0000)]
* doc/Makefile: echo seems to interpret \n and \v under MacOSX
Leopard. I fixed the problem but let me know if it breaks build
chain in other contexts.
SVN Revision: 1011
Mickaël Rémond [Sat, 1 Dec 2007 16:08:05 +0000 (16:08 +0000)]
* ChangeLog: Updated.
SVN Revision: 1010
Mickaël Rémond [Sat, 1 Dec 2007 16:06:24 +0000 (16:06 +0000)]
* doc/guide.tex: Updated Windows compilation instructions.
* src/configure.erl: Likewise.
* doc/ejabberd.hrl: Preparing ejabberd 2.0.0 beta release.
* doc/version.tex: Likewise.
SVN Revision: 1009
Mickaël Rémond [Sat, 1 Dec 2007 15:14:41 +0000 (15:14 +0000)]
* src/tls/Makefile.win32: Updated for latest Win32 OpenSSL library.
SVN Revision: 1008
Mickaël Rémond [Sat, 1 Dec 2007 14:25:31 +0000 (14:25 +0000)]
* src/odbc_queries.erl: Added a default define value so that we
can recompile the file manually with a simple erlc command (with the
default generic value).
SVN Revision: 1007
Alexey Shchepin [Sat, 1 Dec 2007 14:11:46 +0000 (14:11 +0000)]
* src/mod_pubsub/Makefile.in: Removed mod_pubsub_old mentioning
* src/mod_pubsub/Makefile.win32: Likewise
SVN Revision: 1006
Alexey Shchepin [Sat, 1 Dec 2007 05:20:45 +0000 (05:20 +0000)]
* src/odbc/odbc_queries.erl: Reverted the previous patch because
it produces "redefining macro 'generic'" compilation error
SVN Revision: 1005
Alexey Shchepin [Sat, 1 Dec 2007 05:16:30 +0000 (05:16 +0000)]
* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch)
* src/ejabberd_local.erl: Support for IQ responses
* src/jlib.erl: Added iq_query_or_response_info/1 function
* src/jlib.hrl: Added NS_PUBSUB_ERRORS and NS_CAPS
* src/mod_pubsub/Makefile.in: New pubsub+pep implementation
(thanks to Christophe Romain and Magnus Henoch)
* src/ejabberd_sm.erl: Added get_session_pid/3 function
* src/ejabberd_c2s.erl: Added get_subscribed_and_online/1 function
SVN Revision: 1004
Mickaël Rémond [Fri, 30 Nov 2007 18:06:26 +0000 (18:06 +0000)]
* src/odbc_queries.erl: Added a default define value so that we can
recompile the file manually with a simple erlc command.
SVN Revision: 1003
Badlop [Thu, 29 Nov 2007 18:24:31 +0000 (18:24 +0000)]
* src/mod_vcard.erl: Add type of x:data field to search
results (thanks to Robin Redeker) (EJAB-327)
* src/mod_vcard_ldap.erl:
* src/mod_vcard_odbc.erl:
SVN Revision: 1002
Badlop [Thu, 29 Nov 2007 17:22:34 +0000 (17:22 +0000)]
* src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks
to Michael Shields) (EJAB-439)
* src/configure.ac: Don't hardcode gcc and gcc options in
Makefiles (thanks to Etan Reisner) (EJAB-436)
SVN Revision: 1001
Badlop [Thu, 29 Nov 2007 16:59:35 +0000 (16:59 +0000)]
* src/configure.ac: Don't hardcode gcc and options (EJAB-436)
* src/Makefile.in:
* src/ejabberd_zlib/Makefile.in:
* src/eldap/Makefile.in:
* src/mod_irc/Makefile.in:
* src/mod_muc/Makefile.in:
* src/mod_proxy65/Makefile.in:
* src/mod_pubsub/Makefile.in:
* src/odbc/Makefile.in:
* src/pam/Makefile.in:
* src/stringprep/Makefile.in:
* src/tls/Makefile.in:
* src/web/Makefile.in:
SVN Revision: 1000
Badlop [Thu, 29 Nov 2007 16:16:10 +0000 (16:16 +0000)]
* src/mod_muc/mod_muc_room.erl: Hide the option 'Make room
moderated' because it isn't implemented, and set the default value
of 'moderated' to true because that is the behaviour
implemented (EJAB-419)
SVN Revision: 999
Badlop [Wed, 28 Nov 2007 17:16:36 +0000 (17:16 +0000)]
* doc/guide.tex: It should be made more clear that domain_certfile
works for both s2s and c2s connections (EJAB-212). Added another
example of listening ports.
SVN Revision: 998
Badlop [Tue, 27 Nov 2007 23:35:26 +0000 (23:35 +0000)]
* doc/guide.tex: Update URI of ejabberd official home page, URI
of ejabberd.jabber.ru, and copyright dates (EJAB-366)
* doc/introduction.tex:
* src/ejabberd.hrl:
* src/ejabberd_admin.erl:
* src/mod_irc/mod_irc.erl:
* src/mod_irc/mod_irc_connection.erl:
* src/mod_muc/mod_muc.erl:
* src/mod_muc/mod_muc_log.erl:
* src/mod_proxy65/mod_proxy65_service.erl:
* src/mod_pubsub/mod_pubsub.erl:
* src/mod_vcard.erl:
* src/mod_vcard_ldap.erl:
* src/mod_vcard_odbc.erl:
* src/msgs/*.msg:
* src/web/ejabberd_web_admin.erl:
SVN Revision: 997
Badlop [Tue, 27 Nov 2007 22:30:51 +0000 (22:30 +0000)]
* src/gen_mod.erl: Update in database the configuration changes in
modules (EJAB-330)
SVN Revision: 996
Badlop [Tue, 27 Nov 2007 18:54:06 +0000 (18:54 +0000)]
* src/mod_configure.erl: The command get-user-lastlogin is now
compatible with both Mnesia and ODBC (EJAB-383)
* src/mod_last.erl: Likewise
* src/mod_last_odbc.erl: Likewise
SVN Revision: 995
Badlop [Tue, 27 Nov 2007 18:40:09 +0000 (18:40 +0000)]
* doc/guide.tex: Document ejabberd_http's
request_handlers (EJAB-372). Fixed small Latex problems.
Sort options of listening sockets.
SVN Revision: 994
Badlop [Tue, 27 Nov 2007 18:22:47 +0000 (18:22 +0000)]
* doc/guide.tex: Document ejabberd_http's
request_handlers (EJAB-372). Fixed small Latex problems.
SVN Revision: 993
Alexey Shchepin [Tue, 27 Nov 2007 15:18:45 +0000 (15:18 +0000)]
* src/mod_announce.erl: Bugfix (thanks to Christophe Romain)
SVN Revision: 992
Badlop [Tue, 27 Nov 2007 14:45:30 +0000 (14:45 +0000)]
* doc/guide.tex: Added clarification about LDAP default port
(thanks to Christophe Romain).
SVN Revision: 991
Badlop [Tue, 27 Nov 2007 14:06:44 +0000 (14:06 +0000)]
* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328).
* src/mod_vcard_ldap.erl: Likewise.
* src/mod_vcard_odbc.erl: Likewise.
* doc/guide.tex: Updated documentation.
SVN Revision: 990
Badlop [Tue, 27 Nov 2007 08:09:47 +0000 (08:09 +0000)]
* src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382).
SVN Revision: 989
Badlop [Mon, 26 Nov 2007 21:29:14 +0000 (21:29 +0000)]
* src/ejabberd.cfg.example: Added example configuration of databases.
SVN Revision: 988
Badlop [Mon, 26 Nov 2007 19:54:30 +0000 (19:54 +0000)]
* doc/guide.tex: Fixed several typos.
SVN Revision: 987
Badlop [Mon, 26 Nov 2007 19:52:09 +0000 (19:52 +0000)]
* src/ejabberd_config.erl: Print error when the configuration
requires ODBC, MySQL or PostgreSQL libraries but are not
installed (EJAB-210).
SVN Revision: 986
Badlop [Mon, 26 Nov 2007 15:12:34 +0000 (15:12 +0000)]
* src/web/ejabberd_web_admin.erl: Added a favicon (EJAB-379).
SVN Revision: 985
Badlop [Mon, 26 Nov 2007 15:03:11 +0000 (15:03 +0000)]
* src/msgs/wa.msg: New Walon translation (thanks to
Pablo Saratxaga) (EJAB-374).
SVN Revision: 984
Badlop [Mon, 26 Nov 2007 14:52:11 +0000 (14:52 +0000)]
* doc/guide.tex: Describe how ejabberd treats ejabberd.cfg file
(EJAB-384).
SVN Revision: 983
Badlop [Mon, 26 Nov 2007 14:35:53 +0000 (14:35 +0000)]
* src/ejabberd.cfg.example: Huge reorganization and grouping of options (EJAB-392).
SVN Revision: 982
Badlop [Mon, 26 Nov 2007 10:23:37 +0000 (10:23 +0000)]
* doc/guide.tex: Describe in mod_muc: nick register and service admin message (EJAB-400).
SVN Revision: 981
Badlop [Mon, 26 Nov 2007 10:15:18 +0000 (10:15 +0000)]
* src/mod_echo.erl: Example function that demonstrates how to receive XMPP packets using Erlang's message passing mechanism (EJAB-247).
SVN Revision: 980
Badlop [Mon, 26 Nov 2007 08:57:21 +0000 (08:57 +0000)]
* src/ejabberdctl.template: Write erl_crash.dump in the log/ directory, with unique filename (EJAB-433).
SVN Revision: 979
Badlop [Mon, 26 Nov 2007 07:59:35 +0000 (07:59 +0000)]
* src/ejabberdctl.template: Removed bashisms (EJAB-399). Set environment variables instead of passing parameters when calling erl (EJAB-421).
* src/ejabberd_ctl.erl: Improvements in the help messages (EJAB-399).
* doc/guide.tex: Improvements in sections ejabberdctl, and Install from Source (EJAB-399).
SVN Revision: 978
Alexey Shchepin [Sun, 25 Nov 2007 16:39:56 +0000 (16:39 +0000)]
* src/ejabberd_router.erl: Bugfix
SVN Revision: 977
Alexey Shchepin [Sun, 25 Nov 2007 16:14:32 +0000 (16:14 +0000)]
* src/ejabberd_s2s_out.erl: Bugfix
SVN Revision: 976
Alexey Shchepin [Sun, 25 Nov 2007 15:35:20 +0000 (15:35 +0000)]
* src/ejabberd_sm.erl: Optimized check_max_sessions (thanks to
Christophe Romain)
SVN Revision: 975
Mickaël Rémond [Thu, 22 Nov 2007 13:46:54 +0000 (13:46 +0000)]
* src/ejabberd_config.erl: Improved error message when ejabberd
config file is not found.
SVN Revision: 974
Mickaël Rémond [Thu, 22 Nov 2007 13:46:50 +0000 (13:46 +0000)]
* examples/extauth/check_pass_null.pl: Fixed external
authentication example script (EJAB-404)
SVN Revision: 973
Christophe Romain [Fri, 16 Nov 2007 13:58:00 +0000 (13:58 +0000)]
Better count management and batch users retrieval internal database
SVN Revision: 972
Mickaël Rémond [Thu, 15 Nov 2007 10:34:27 +0000 (10:34 +0000)]
* Making sure SVN properties are correctly set.
SVN Revision: 971
Mickaël Rémond [Thu, 15 Nov 2007 10:33:18 +0000 (10:33 +0000)]
* Making sure SVN properties are correctly set.
SVN Revision: 970
Mickaël Rémond [Fri, 9 Nov 2007 10:18:38 +0000 (10:18 +0000)]
* src/ejabberd_config.erl: Refactoring: Move internal data structure to an include file.
* src/ejabberd_config.hrl: Likewise.
SVN Revision: 969
Mickaël Rémond [Sat, 3 Nov 2007 17:35:23 +0000 (17:35 +0000)]
* src/ejabberd_auth.erl: Better count management and batch users retrieval for relational database (Thanks to Massimiliano Mirra).
* src/ejabberd_auth_odbc.erl: Likewise.
* src/odbc/odbc_queries.erl: Likewise.
SVN Revision: 968
Mickaël Rémond [Fri, 2 Nov 2007 14:59:06 +0000 (14:59 +0000)]
* ChangeLog: Fixed typo.
SVN Revision: 967
Mickaël Rémond [Fri, 2 Nov 2007 14:45:06 +0000 (14:45 +0000)]
* src/web/ejabberd_http_poll.erl: Refactoring. Moved c2s limits acquisition to a separate module.
* src/ejabberd_c2s_config.erl: Likewise.
SVN Revision: 966
Mickaël Rémond [Thu, 1 Nov 2007 13:59:29 +0000 (13:59 +0000)]
* src/web/ejabberd_http_poll.erl: Support for c2s ACL access,
max_stanza and shaper on http_bind connections (EJAB-243,
EJAB-415, EJAB-416)
SVN Revision: 965
Mickaël Rémond [Thu, 1 Nov 2007 13:49:50 +0000 (13:49 +0000)]
* ChangeLog: Added missing info about last commits in ChangeLog.
SVN Revision: 964
Jérôme Sautret [Tue, 30 Oct 2007 17:38:40 +0000 (17:38 +0000)]
* src/ejabberd_s2s.erl: don't use the resource of the sender to choose
a s2s connection to ensure that a muc room always uses the same
connection
Merge branch 'ejabberd_s2s'
Conflicts:
.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl
SVN Revision: 963
Christophe Romain [Tue, 23 Oct 2007 09:56:52 +0000 (09:56 +0000)]
dev.tex: list typo fix
SVN Revision: 962
Christophe Romain [Tue, 23 Oct 2007 09:54:50 +0000 (09:54 +0000)]
add extauth script details
SVN Revision: 961
Christophe Romain [Wed, 17 Oct 2007 08:51:35 +0000 (08:51 +0000)]
Bugfix on previous change (EJAB-380)
SVN Revision: 960
Alexey Shchepin [Wed, 17 Oct 2007 02:33:19 +0000 (02:33 +0000)]
* src/ejabberdctl.template: Several improvements (EJAB-380)
(thanks to Sander Devrieze, Sergei Golovan, Torsten Werner and
Badlop)
* src/ejabberdctl.cfg.example: Likewise
* src/ejabberd.inetrc: Likewise
* src/Makefile.in: Likewise
SVN Revision: 959
Alexey Shchepin [Wed, 17 Oct 2007 02:19:44 +0000 (02:19 +0000)]
* src/mod_privacy.erl: Bugfix
SVN Revision: 958
Alexey Shchepin [Sun, 7 Oct 2007 10:52:45 +0000 (10:52 +0000)]
* src/mod_vcard_odbc.erl: Reverted previous change
SVN Revision: 957
Alexey Shchepin [Sat, 6 Oct 2007 17:52:12 +0000 (17:52 +0000)]
* src/mod_vcard_odbc.erl: Bugfix
SVN Revision: 956
Alexey Shchepin [Sat, 6 Oct 2007 17:35:15 +0000 (17:35 +0000)]
* src/mod_offline_odbc.erl: Bugfix
SVN Revision: 955
Alexey Shchepin [Mon, 1 Oct 2007 10:49:42 +0000 (10:49 +0000)]
SVN Revision: 954
Alexey Shchepin [Mon, 1 Oct 2007 10:33:03 +0000 (10:33 +0000)]
* src/ejabberd_auth_pam.erl: Support for PAM authentication
(thanks to Evgeniy Khramtsov)
* src/ejabberd.cfg.example: Likewise
* src/configure.ac: Likewise
* src/aclocal.m4: Likewise
* src/Makefile.in: Likewise
* examples/ejabberd.pam: Likewise
* doc/guide.tex: Likewise
SVN Revision: 953
Christophe Romain [Fri, 28 Sep 2007 13:33:27 +0000 (13:33 +0000)]
Added some missing NOT NULL restrictions
SVN Revision: 952
Christophe Romain [Thu, 27 Sep 2007 12:32:05 +0000 (12:32 +0000)]
apply rootdir patch from Badlop (EJAB-385)
SVN Revision: 951
Alexey Shchepin [Tue, 25 Sep 2007 16:32:18 +0000 (16:32 +0000)]
* src/ejabberd_s2s.erl: Max number of connections and max number
of connections per node now can be specified via
max_s2s_connections and max_s2s_connections_per_node acl rules
SVN Revision: 950
Mickaël Rémond [Fri, 14 Sep 2007 14:21:41 +0000 (14:21 +0000)]
* ChangeLog: Integration of multiple s2s support (EJAB-360).
SVN Revision: 949
Mickaël Rémond [Fri, 14 Sep 2007 14:21:25 +0000 (14:21 +0000)]
* src/ejabberd_s2s_out.erl: Changed to actual p1_fsm behaviour. It was working
correctly as the API of p1_fsm and gen_fsm is strictly the same.
SVN Revision: 948
Mickaël Rémond [Fri, 14 Sep 2007 14:21:12 +0000 (14:21 +0000)]
* src/ejabberd_s2_in.erl: Added debug hook for s2s loop (EJAB-358).
SVN Revision: 947
Mickaël Rémond [Fri, 14 Sep 2007 14:20:56 +0000 (14:20 +0000)]
* src/ejabberd_c2s.erl: Added debug hook for c2s loop (EJAB-358).
SVN Revision: 946
Mickaël Rémond [Fri, 14 Sep 2007 14:20:43 +0000 (14:20 +0000)]
* src/ejabberd_s2s.erl: open all missing connections if needed.
SVN Revision: 945
Mickaël Rémond [Fri, 14 Sep 2007 14:20:30 +0000 (14:20 +0000)]
* src/ejabberd_s2s.erl: untabify
SVN Revision: 944
Mickaël Rémond [Fri, 14 Sep 2007 14:20:15 +0000 (14:20 +0000)]
* src/ejabberd_s2s.erl: don't check blacklist for services.
SVN Revision: 943
Mickaël Rémond [Fri, 14 Sep 2007 14:20:01 +0000 (14:20 +0000)]
* src/ejabberd_s2s.erl: Fixed merge conflict (duplicate functions).
SVN Revision: 942
Mickaël Rémond [Fri, 14 Sep 2007 14:19:48 +0000 (14:19 +0000)]
Try to open all s2s connections at the same time, to guarantee the right order of the packets.
SVN Revision: 941