96ded4535d
* 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
2007-10-30 17:38:40 +00:00
c167c80f6d
Bugfix on previous change (EJAB-380)
...
SVN Revision: 960
2007-10-17 08:51:35 +00:00
0d557566fb
* 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
2007-10-17 02:33:19 +00:00
7583eef401
* src/mod_privacy.erl: Bugfix
...
SVN Revision: 958
2007-10-17 02:19:44 +00:00
5f41b6c6f1
* src/mod_vcard_odbc.erl: Reverted previous change
...
SVN Revision: 957
2007-10-07 10:52:45 +00:00
a3380daa79
* src/mod_vcard_odbc.erl: Bugfix
...
SVN Revision: 956
2007-10-06 17:52:12 +00:00
5ab52e2712
* src/mod_offline_odbc.erl: Bugfix
...
SVN Revision: 955
2007-10-06 17:35:15 +00:00
4971de9d2a
SVN Revision: 954
2007-10-01 10:49:42 +00:00
63487ff7b2
* 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
2007-10-01 10:33:03 +00:00
665abff588
Added some missing NOT NULL restrictions
...
SVN Revision: 952
2007-09-28 13:33:27 +00:00
0bb936f848
apply rootdir patch from Badlop (EJAB-385)
...
SVN Revision: 951
2007-09-27 12:32:05 +00:00
f82b84158e
* 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
2007-09-25 16:32:18 +00:00
b53f2be7f2
* 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
2007-09-14 14:21:25 +00:00
48a2813ec6
* src/ejabberd_s2_in.erl: Added debug hook for s2s loop (EJAB-358).
...
SVN Revision: 947
2007-09-14 14:21:12 +00:00
fd666398ee
* src/ejabberd_c2s.erl: Added debug hook for c2s loop (EJAB-358).
...
SVN Revision: 946
2007-09-14 14:20:56 +00:00
31449bc720
* src/ejabberd_s2s.erl: open all missing connections if needed.
...
SVN Revision: 945
2007-09-14 14:20:43 +00:00
f6d376a4fc
* src/ejabberd_s2s.erl: untabify
...
SVN Revision: 944
2007-09-14 14:20:30 +00:00
5a0b8288d4
* src/ejabberd_s2s.erl: don't check blacklist for services.
...
SVN Revision: 943
2007-09-14 14:20:15 +00:00
de63c622c2
* src/ejabberd_s2s.erl: Fixed merge conflict (duplicate functions).
...
SVN Revision: 942
2007-09-14 14:20:01 +00:00
b3fb9d9100
Try to open all s2s connections at the same time, to guarantee the right order of the packets.
...
SVN Revision: 941
2007-09-14 14:19:48 +00:00
653e6c1791
Comment.
...
SVN Revision: 938
2007-09-14 14:19:07 +00:00
78e6eb58d4
max_s2s_connexions_number local parameter added.
...
SVN Revision: 937
2007-09-14 14:18:51 +00:00
f6bf5973ef
* src/ejabberd_s2s_out.erl: Implements s2s negociation timeouts and s2s connection retrial interval (EJAB-357, EJAB-294).
...
SVN Revision: 936
2007-09-14 14:18:32 +00:00
0efaacb24e
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 935
2007-09-14 14:18:17 +00:00
8d3d59535d
* src/ejabberd_c2s.erl: Hibernate inactive c2s processes (EJAB-356).
...
SVN Revision: 934
2007-09-14 14:18:01 +00:00
f787a3ed71
* src/ejabberd_c2s.erl: Implements timeouts during session opening negociation (EJAB-355).
...
SVN Revision: 933
2007-09-14 14:17:42 +00:00
afec054544
* src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP supervisor for transient processes (EJAB-354).
...
* src/ejabberd_s2s_in.erl: Likewise.
* src/ejabberd_s2s_out.erl: Likewise.
* src/mod_muc/mod_muc_room.erl: Likewise.
* src/configure.ac: Likewise.
* src/configure: Likewise.
* src/Makefile.in: Likewise.
* src/mod_muc/Makefile.in: Likewise.
SVN Revision: 931
2007-09-14 14:16:36 +00:00
b78d8ee55f
* src/ejabberd_s2s_out.erl: Moved s2s connexion information from INFO level to DEBUG level and more human readable information explaining what is going on (EJAB-353).
...
SVN Revision: 930
2007-09-14 14:16:20 +00:00
ffd7267082
* src/ejabberd_s2s_in.erl: Moved s2s connexion information from INFO level to DEBUG level (EJAB-353).
...
SVN Revision: 929
2007-09-14 14:16:04 +00:00
9fc203ee6d
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 928
2007-09-14 14:15:44 +00:00
e809c6c322
* src/gen_mod.erl: Added get_module_opt_host/3 (thanks to Badlop)
...
SVN Revision: 927
2007-09-11 11:20:36 +00:00
d26b8a0251
* src/mod_configure.erl: Virtual host support for mod_configure (Thanks to Badlop) (EJAB-285).
...
SVN Revision: 921
2007-09-06 07:45:01 +00:00
ef57d79093
* src/mod_offline_odbc.erl: Bugfix
...
SVN Revision: 920
2007-09-04 22:12:33 +00:00
dcc05ac8d0
* src/mod_register.erl: update ejabberd commands to support XEP-0133 (initial patch by Badlop) (EJAB-325).
...
* src/mod_configure.erl: Likewise.
* src/mod_announce.erl: Likewise.
* src/jlib.hrl: Likewise.
* src/ejabberd.cfg.example: Likewise.
* doc/guide.tex: Likewise.
SVN Revision: 918
2007-09-04 07:55:41 +00:00
5994816a27
* src/jlib.erl: Removed http_base_64:decode call
...
SVN Revision: 908
2007-09-02 15:56:17 +00:00
978b7aea12
* src/mod_muc/mod_muc_room.erl: Added logging of MUC admin/owner
...
queries
SVN Revision: 907
2007-09-01 21:15:40 +00:00
722563ed94
* src/mod_muc/mod_muc_room.erl: Added user_message_shaper and
...
room_shaper options
* src/mod_muc/mod_muc.erl: Likewise
SVN Revision: 906
2007-09-01 21:05:04 +00:00
2c57215904
* src/web/ejabberd_web_admin.erl: Make the web interface pages
...
"translatable" (Thanks to Badlop) (EJAB-11).
SVN Revision: 902
2007-08-31 16:13:35 +00:00
6cc2042fec
* src/ejabberd.cfg.example: Updated mod_muc 'host' option default
...
value (thanks to Badlop)
SVN Revision: 901
2007-08-29 18:29:07 +00:00
4a26e75992
* src/mod_muc/mod_muc_room.erl: The mod_muc option max_users now
...
limits max number of users in rooms and max_users_admin_threshold
sets a number of admin or owner accounts allowd to join after
max_users occupants
SVN Revision: 900
2007-08-29 17:54:45 +00:00
90ff184472
* src/mod_muc/mod_muc_log.erl: Added missed HTMLization in a
...
nickname change logging (thanks to Badlop)
SVN Revision: 896
2007-08-29 13:17:03 +00:00
52c10089aa
* src/mod_muc/mod_muc_room.erl: Changed default max number of user
...
in a room to 200 (EJAB-248)
SVN Revision: 895
2007-08-28 15:05:52 +00:00
b0bb9a79c3
* src/mod_offline_odbc.erl: Implements quota for offline messages
...
in relational database (EJAB-314)
* src/odbc/odbc_queries.erl: Likewise
SVN Revision: 893
2007-08-28 14:36:39 +00:00
a78037fc3c
* src/mod_muc/mod_muc_room.erl: Implements muc max users option
...
from XEP-0045 (Thanks to Jerome Sautret) (EJAB-248).
SVN Revision: 892
2007-08-28 14:35:50 +00:00
5dfa6edda3
* src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host'
...
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
SVN Revision: 888
2007-08-25 17:24:00 +00:00
24ff98d50d
Fixed conflict
...
SVN Revision: 887
2007-08-24 16:18:46 +00:00
a8bc3a46af
* src/web/ejabberd_web_admin.erl: Moved roster stuff to mod_roster*
...
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 886
2007-08-24 16:15:05 +00:00
38ad132ba2
* src/ejabberd_sm.erl: Removed check which denies resource to
...
receive its own presence
SVN Revision: 885
2007-08-24 03:54:42 +00:00
727a70c2cb
* src/web/ejabberd_web_admin.erl: Added hooks to allow plugins to
...
add their pages without modifying ejabberd_web_admin.erl (thanks
to Badlop)
* src/web/ejabberd_web_admin.hrl: Macro definitions moved here
* src/mod_shared_roster.erl: Updated
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
SVN Revision: 884
2007-08-23 00:51:54 +00:00
106cf7f963
* src/jlib.erl: Use http_base_64:decode if available
...
SVN Revision: 883
2007-08-21 22:28:41 +00:00
Jérôme Sautret