Christophe Romain
cf37f3977a
Fix typo, oups...
2015-04-21 16:13:23 +02:00
Christophe Romain
61f80396da
remove deferred Collection shim header
2015-04-21 16:11:00 +02:00
Christophe Romain
cbd45974e2
Owner can subscribe to its node ( #454 )
2015-04-21 15:24:31 +02:00
Christophe Romain
747d25b4ad
Fixed node type (thanks to saczawap) ( #435 )
2015-04-21 15:24:24 +02:00
Christophe Romain
e0563e3918
PubSub improvements
...
This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes
2015-04-21 15:24:16 +02:00
Christophe Romain
63926efd20
Improve join/leave cluster scripts
2015-04-21 13:32:14 +02:00
Christophe Romain
28090a3958
Merge pull request #540 from weiss/queue-error-stanza
...
Add privacy error stanza to XEP-0198 queue
2015-04-21 11:19:49 +02:00
Evgeniy Khramtsov
ed79a61752
Fix LDAP substrings filter (EJAB-1715)
2015-04-21 11:49:41 +03:00
Holger Weiss
94936b261e
Add privacy error stanza to XEP-0198 queue
2015-04-20 22:03:18 +02:00
Alexey Shchepin
fd54181435
Fixed error replying on blocked messages
2015-04-20 17:19:09 +03:00
Paweł Chmielowski
e8576c23c5
Make s2s port configurable in test runner
2015-04-20 16:16:30 +02:00
Badlop
c2e6ce0f04
Remove load_config command because is superseded by reload_config ( #532 )
2015-04-20 15:57:44 +02:00
Evgeny Khramtsov
837706e9d9
Merge pull request #536 from weiss/fail2ban-whitelist
...
Add mod_fail2ban option to whitelist IP addresses
2015-04-18 12:28:36 +03:00
Holger Weiss
aa36742a40
mod_fail2ban: Add 'access' option for whitelisting
...
Closes #535 .
2015-04-18 11:08:05 +02:00
Holger Weiss
c01940f33c
cyrsasl_scram: Return user name with error message
...
Let ejabberd_c2s run the 'c2s_auth_result' hook (which needs the user
name) on SCRAM authentication failure.
2015-04-17 20:21:11 +02:00
Holger Weiss
afdc269825
ejabberd_s2s_out: Remove Erlang/OTP version check
...
The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.
2015-04-16 23:51:16 +02:00
Holger Weiss
b447839592
CSI test: Simplify and improve readability
2015-04-16 23:20:14 +02:00
Holger Weiss
01b3defb86
CSI test: Fix race when slave becomes active again
...
Make sure the server processed the slave's active request after the
previous test stanzas were received by the slave and before the final
Chat State notification is sent by the master.
2015-04-16 08:45:17 +02:00
Badlop
d624753410
Update get_password_s description with SCRAM return values
2015-04-15 11:51:34 +02:00
Badlop
a5adaf5798
Revert "Hook on group message"
...
This reverts commit b81250d667
2015-04-15 11:51:29 +02:00
Paweł Chmielowski
63d6d68979
Make sure that server processed our inactive request before processing further in testing
2015-04-15 11:21:37 +02:00
badlop
31c5775025
Merge pull request #426 from hairyhum/master
...
Migration of scram passwords with piefxis (riak and internal only)
2015-04-15 11:04:29 +02:00
Paweł Chmielowski
ba69c469b5
Remove http_poll module
...
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
2015-04-15 10:47:10 +02:00
Paweł Chmielowski
a1f81057ca
Enable websocket connection in default config file
2015-04-15 10:35:17 +02:00
Holger Weiss
e408276283
Don't forget gen_tcp:listen/2 options
...
Fixes #530 .
2015-04-14 20:22:34 +02:00
Badlop
b67af5e036
Fix nick logging in mod_muc_log plaintext ( #522 )
2015-04-14 15:46:59 +02:00
Badlop
25449a076f
Clean multicast routing code detected by xref
2015-04-10 16:02:45 +02:00
Paweł Chmielowski
b9fdcc3985
Add ability to configure parameters used by "make test" with test/config.ctc
2015-04-09 17:14:30 +02:00
Paweł Chmielowski
e8701802ee
Give better error messages for tests failing on #...{} = recv() lines
2015-04-09 16:39:52 +02:00
Paweł Chmielowski
2797fa16a6
Show received input and expected input in ?recv* macros in case of failure
...
Throwing catch clause error is not that good for finding out what happened
2015-04-09 16:05:26 +02:00
Paweł Chmielowski
8732817c3c
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code
2015-04-09 13:35:37 +02:00
Badlop
f129c6530c
Fix bug when sorting the list of rooms in WebAdmin
2015-04-08 15:34:08 +02:00
Evgeniy Khramtsov
32b60d4250
Remove hack with binary to integer conversion
2015-04-08 16:11:06 +03:00
Evgeniy Khramtsov
7a89dda816
Merge branch 'master' of github.com:processone/ejabberd
2015-04-08 15:31:41 +03:00
Evgeniy Khramtsov
9b4942890d
Add virtual host support for SQLite
2015-04-08 15:31:28 +03:00
Badlop
0cf8d1fa6e
Copy multicast code from ejabberd-contrib to provide XEP-0033 ( #521 )
2015-04-08 14:01:16 +02:00
Evgeniy Khramtsov
fb0e82f743
Add SQLite3 library checks at the configure script
2015-04-08 14:49:14 +03:00
Evgeniy Khramtsov
675c428f21
Disable awkward trap_exit flag
2015-04-08 14:40:28 +03:00
Evgeniy Khramtsov
bdedcf8d8a
Enable FOREIGN KEYS by default
2015-04-08 14:39:47 +03:00
Evgeniy Khramtsov
2a3a2d9804
Make sure SQLite always returns binaries
2015-04-08 14:38:04 +03:00
Evgeny Khramtsov
5a820aca40
Merge pull request #486 from saa/sqlite_support
...
Add SQLite support
2015-04-08 14:34:56 +03:00
Jerome Sautret
c3280e9dad
Add mod_muc_admin contrib.
2015-04-07 17:05:43 +02:00
Holger Weiss
0fd4984c23
ejabberd_listener: Remove Erlang/OTP version check
...
We don't support Erlang/OTP versions older than R16 anyway.
2015-04-07 09:47:05 +02:00
Evgeny Khramtsov
b81b0d0be9
Merge pull request #518 from liudanking/master
...
fix otp version check in ejabberd_listener.erl listen_tcp/5
2015-04-07 10:34:18 +03:00
Mickael Remond
c140f98276
Explicitly start crypto with start
...
This is to please Elixir / Phoenix enviroment
2015-04-07 09:03:37 +02:00
liudan
f981a53f9a
fix otp version check in listen_tcp/5
2015-04-07 09:28:35 +08:00
Holger Weiss
2a94c68724
Don't call send_element/2 if previous call failed
...
Be sure not to try sending data over a TCP socket that is no longer
usable.
2015-04-06 22:34:48 +02:00
Paweł Chmielowski
81b0643036
Fix problem with c2s buffering on old style websocket connections
...
Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.
This fixes github issue #515 .
2015-04-06 17:54:45 +02:00
Paweł Chmielowski
64978b3d9c
Merge pull request #513 from weiss/ignore-header-case
...
ejabberd_websocket: Ignore case of HTTP header values
2015-04-06 17:49:51 +02:00
Mickael Remond
34f8f6d868
Explicitely start crypto module
...
Without explicit start, it causes issue when embedding ejabberd into other apps.
2015-04-06 13:46:09 +02:00
