Holger Weiss
dbbe3a9e62
Merge remote-tracking branch 'processone/pr/2203'
...
* processone/pr/2203:
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:33:18 +01:00
Marc Schink
264add87fa
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:31:06 +01:00
Holger Weiss
835360733b
mod_block_strangers: Bounce an error message
...
Return a stanza error when a message is rejected, in order to make
legitimate users aware of the issue.
Closes #2197 .
2018-01-03 15:41:30 +01:00
Mickael Remond
1fcb6d7f36
Make mysql and pgsql one of the default module for Mix
2017-12-29 17:22:59 +01:00
Mickael Remond
4ae688605f
Regenerated mix.lock file
2017-12-29 17:18:59 +01:00
Evgeniy Khramtsov
485100f907
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 21:37:19 +03:00
Evgeniy Khramtsov
240977a0da
Repair hosts check during certfiles validation
2017-12-28 21:36:57 +03:00
Christophe Romain
cdc9c93b9b
Fix stun/esip mix deps
2017-12-28 15:38:24 +01:00
Evgeniy Khramtsov
529d6d8a93
Return default certificate on domain mismatch
2017-12-28 17:24:23 +03:00
Christophe Romain
dd9281da13
Let mix pass compile ejabberd as dependency
2017-12-28 15:16:29 +01:00
Christophe Romain
1b8794c991
Update mix spec
2017-12-28 14:43:13 +01:00
Paweł Chmielowski
48c96dc1a9
Update stun and esip
2017-12-28 14:34:50 +01:00
Christophe Romain
439fe0b504
Fix check_opt_range when no boundary is configured
2017-12-28 13:51:26 +01:00
Evgeniy Khramtsov
e03d41647b
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 14:01:39 +03:00
Evgeniy Khramtsov
23c5fd9a4f
Return send() result to the caller
2017-12-28 14:01:34 +03:00
Christophe Romain
08e54dd621
Don't force rsm when max_items is not defined ( #2189 )
2017-12-28 11:48:54 +01:00
Christophe Romain
8918227fc3
Revert "Include os_mon application"
...
This reverts commit 56241feb58
2017-12-28 10:32:21 +01:00
Paweł Chmielowski
5ba13df519
Revert "Start os_mon application"
...
This reverts commit 82b3bbf360
2017-12-27 17:21:17 +01:00
Evgeniy Khramtsov
dd4d45fd28
Fix a regression in xmpp_socket
2017-12-27 18:49:25 +03:00
Paweł Chmielowski
82b3bbf360
Start os_mon application
2017-12-27 16:23:04 +01:00
Paweł Chmielowski
d59d4e27ec
Adopt tests to changes introduced by b54e1e49ba
2017-12-27 16:16:15 +01:00
Paweł Chmielowski
e6d1ff85f1
Use bare jid when processing roster subscriptions
2017-12-27 16:14:47 +01:00
Christophe Romain
ef6af11f17
Rename mnesiadb
2017-12-27 12:42:55 +01:00
Christophe Romain
6bdf29676c
Add missing application building with mix
2017-12-27 12:33:52 +01:00
Christophe Romain
56241feb58
Include os_mon application
2017-12-27 12:28:13 +01:00
Christophe Romain
9fcc12dca7
Prepare mix for 17.12
2017-12-27 11:42:37 +01:00
Evgeny Khramtsov
bbb1f7002d
Merge pull request #2188 from weiss/fix-acl-reload
...
Forget old access/shaper rules and ACLs on reload
2017-12-27 09:34:19 +03:00
Evgeniy Khramtsov
812acf0688
Update the test suite to support new XMPP socket API
2017-12-27 08:55:14 +03:00
Holger Weiss
60b6a508e0
Forget old access/shaper rules and ACLs on reload
2017-12-26 19:37:11 +01:00
Alexey Shchepin
34d09018a7
Add new schemas for SQLite and MySQL
2017-12-26 20:48:15 +03:00
Evgeniy Khramtsov
7cdc51becd
Merge branch 'no-more-ejabberd-receivers'
...
Conflicts:
rebar.config
2017-12-26 19:02:54 +03:00
Evgeniy Khramtsov
2d43c07c62
Get rid of ejabberd receiver
...
ejabberd receivers were meant to serve connections from frontends
to backends. However, this approach was not popular and frontend
related code was removed in previous releases. Now, ejabberd receiver's
code was also removed, making the code shorter and cleaner. Also, in
stress tests ejabberd now handles load more robustly, without
c2s processes overload (even with disabled shapers).
ejabberd_socket.erl is renamed to xmpp_socket.erl: it's supposed to
be finally moved into stand-alone xmpp library.
2017-12-26 18:55:57 +03:00
Christophe Romain
514df9ac18
Cleanup rebar.config
2017-12-26 11:16:48 +01:00
Christophe Romain
a8c3ed5ed4
Remove obsolete option
2017-12-26 11:13:47 +01:00
Christophe Romain
e7308b7d86
Update dependencies
2017-12-26 11:13:18 +01:00
Evgeniy Khramtsov
4e49919d16
Revert "Don't set twice"
...
This reverts commit 6dca89f616
2017-12-25 08:41:51 +03:00
Evgeniy Khramtsov
9ba471e210
Fix a typo in comment :)
2017-12-24 12:53:50 +03:00
Evgeniy Khramtsov
6dca89f616
Don't set twice
2017-12-24 12:34:47 +03:00
Evgeniy Khramtsov
1698956f34
Rely on Server Name Indication for incoming Direct-TLS connections
...
This commit also deprecates `certfile` option for ejabberd_http
listener.
2017-12-24 12:27:51 +03:00
Holger Weiss
b54e1e49ba
Don't let privacy list prevent local roster update
2017-12-23 22:45:01 +01:00
Holger Weiss
5e4c547856
mod_muc_admin: Fix last timestamp retrieval
2017-12-22 14:32:47 +01:00
Badlop
50b19b47e0
Fix commands rooms_unused_list and _destroy
2017-12-21 17:00:43 +01:00
Christophe Romain
a3083b5d71
Fix race between join_cluster and ejabberd_mnesia ( #2079 )
2017-12-21 14:07:29 +01:00
Paweł Chmielowski
32ad7d3761
Disable test for now
2017-12-21 11:49:33 +01:00
Paweł Chmielowski
7f073fbcd8
Update expected error type in test
2017-12-21 11:43:09 +01:00
Christophe Romain
826387446a
Let mix aware of unpackaged hex.pm dependencies ( #2170 )
2017-12-21 11:10:56 +01:00
Christophe Romain
af9183cd54
Add pubsub#multi-items to features list ( #2162 )
2017-12-20 11:54:12 +01:00
Christophe Romain
242c3c1da5
Fix mix_sql features and options
2017-12-20 11:53:18 +01:00
badlop
212d44f419
Merge pull request #2164 from angelo-chan/master
...
add muc_online_rooms_by_regex to mod_muc_admin to filter list online r…
2017-12-19 23:10:20 +01:00
Holger Weiss
63a60f1cd8
ejabberd_sm: Fix get_session_sid/3
...
Let get_session_sid/3 cope with multiple session table entries for a
given resource.
2017-12-19 18:59:25 +01:00
