Evgeny Khramtsov
946b64e166
Merge pull request #361 from weiss/parse-ldap-dn-filter
...
Fix parsing of "ldap_dn_filter" option
2014-11-22 10:36:21 +03:00
Holger Weiss
46d035c142
Fix parsing of "ldap_dn_filter" option
2014-11-22 01:33:23 +01:00
Evgeny Khramtsov
982215d644
Merge pull request #360 from lbanders/master
...
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 13:45:27 +03:00
Leif Bredgaard Honore
5afa1f6ade
Fix for ejabbed bug #359 - now strings are formatted correctly.
2014-11-20 14:21:51 +04:00
Holger Weiss
c566b1d01e
Respect privacy lists for incoming PEP messages
2014-11-18 01:25:12 +01:00
Holger Weiss
84c227e6ae
Don't duplicate last published PEP items
...
When a contact becomes available, usually both the 'caps_update' hook
and the 'presence_probe_hook' are called. For remote contacts, both
hooks triggered PEP notifications, so each item was sent twice. Fix
this by ignoring the 'presence_probe_hook' for remote contacts.
2014-11-18 01:13:22 +01:00
Evgeny Khramtsov
ab12270837
Merge pull request #351 from weiss/floating-muc-intervals
...
Support floating point message/presence intervals
2014-11-16 12:35:21 +03:00
Holger Weiss
3b96525550
Support floating point message/presence intervals
...
Let mod_muc support floating point values for "min_message_interval" and
"min_presence_interval", as documented in the guide.
2014-11-15 22:35:56 +01:00
Gu Feng
62ccf1cf0e
Used current working home as base directory to config relative path.
...
When a config relative path specified, get_absolute_path would not
return an absolute path. The patch fixed it using current working
home as base directory.
Signed-off-by: Gu Feng <flygoast@126.com>
2014-11-16 00:09:52 +08:00
Evgeny Khramtsov
d5ecd32cec
Merge pull request #345 from weiss/last-pep-items
...
Fix sending of last published PEP items to newly-available resources
2014-11-14 21:27:24 +03:00
Evgeny Khramtsov
e770d3174d
Merge pull request #346 from weiss/fix-type
...
Cosmetic fix: Use correct type for initial c2s #state.user value
2014-11-14 21:22:46 +03:00
Holger Weiss
2446b66016
Use correct type for initial c2s #state.user value
2014-11-14 15:32:48 +01:00
Holger Weiss
f69d1ca282
Send last PEP items to remote subscribers
...
When a remote subscriber becomes available, send him the last published
PEP items, as we do for local subscribers.
However, the current implementation depends on a running ejabberd_c2s
process of the publisher to send items to remote subscribers. So, for
those, the behavior is always like it is for local subscribers when
"ignore_pep_from_offline" is set to "true".
2014-11-14 01:33:11 +01:00
Holger Weiss
830fdccd21
Don't broadcast last published PEP items
...
When a client becomes available, don't send the last published PEP items
of all his peers to all his other peers, but only to that client.
2014-11-14 01:03:26 +01:00
Holger Weiss
5cc30c3977
Move routing of last PEP items into new function
...
This doesn't change the behavior, but avoids some code duplication.
2014-11-14 00:16:13 +01:00
Holger Weiss
8efae1f05b
ODBC: Sync last item notifications with mod_pubsub
...
A while back, mod_pubsub was modified to address EJAB-1456. However,
the change was only partially applied to mod_pubsub_odbc. This commit
adds the remaining part.
2014-11-14 00:02:59 +01:00
Evgeny Khramtsov
de3e1c3508
Merge pull request #341 from sezuan/fix-kick-user-command
...
Fix kick_user command
2014-11-10 23:14:34 +03:00
Matthias Rieber
8184326eb9
Fix kick_user command
2014-11-10 20:53:00 +01:00
Evgeny Khramtsov
f47a59de2f
Merge pull request #340 from weiss/disable-mechanisms
...
New option: disable_sasl_mechanisms
2014-11-10 11:47:10 +03:00
Holger Weiss
ee0ecd2419
New option: disable_sasl_mechanisms
...
The new "disable_sasl_mechanisms" option allows for restricting the list
of SASL mechanisms offered to the client.
Closes #339 .
2014-11-10 01:10:04 +01:00
Evgeny Khramtsov
7138cc5633
Merge pull request #337 from weiss/fix-install-without-json
...
Fix "make install" without JSON support
2014-11-06 21:11:17 +03:00
Holger Weiss
f95f22aea0
Fix "make install" without JSON support
...
Don't bail out during "make install" when ./configure was called without
"--enable-json".
2014-11-06 17:11:15 +01:00
Evgeny Khramtsov
25e5253f33
Merge pull request #335 from weiss/avoid-carbon-dups
...
Avoid duplicates of carbon copies
2014-11-05 23:17:45 +03:00
Holger Weiss
41dc1efde4
Avoid duplicates of carbon copies
...
When multiple resources have the same (highest) priority, the session
manager routes messages sent to their bare JID to each of these
resources. When another resource has a lower priority but receives
carbon copies, make sure it won't receive multiple copies of such
messages.
2014-11-05 19:04:02 +01:00
Jerome Sautret
1d2efcc168
Add xref test to travis.
...
Conflicts:
.travis.yml
2014-10-31 11:24:56 +01:00
Evgeniy Khramtsov
dfb21e802e
Fix race in CSI test case
2014-10-31 00:26:22 +03:00
Evgeniy Khramtsov
9a0b951855
Add tests for mod_vcard_xupdate
2014-10-30 23:57:15 +03:00
Christophe Romain
7819986ec0
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:44:04 +01:00
Christophe Romain
295681283a
don't stop on error if jiffy.so symlink exists #309
2014-10-30 17:43:57 +01:00
Jerome Sautret
5b0d8b7776
Merge branch 'master' of github.com:processone/ejabberd
2014-10-30 17:19:37 +01:00
Jerome Sautret
1d2ef85b33
Clean up rebar script.
2014-10-30 16:51:01 +01:00
Christophe Romain
b550f247e7
fix invalid path of jiffy.so on install #309
2014-10-30 15:47:33 +01:00
Jerome Sautret
565f064b15
Fix xref check when odbc driver is not used.
2014-10-30 15:21:42 +01:00
Jerome Sautret
7db4587eeb
Ignore riak_object module call for xref check.
...
It's used in map-reduce function called from riak vm.
2014-10-30 15:21:35 +01:00
Jerome Sautret
fad0d867fc
Add xref Makefile target.
...
Conflicts:
rebar.config.script
2014-10-30 15:21:25 +01:00
Evgeny Khramtsov
56dab7ddbe
Merge pull request #328 from flygoast/master
...
Return an empty <vCard/> element in an IQ-result when no vCard exists.
2014-10-29 16:43:49 +03:00
Evgeniy Khramtsov
74b67fa0dc
Add new option: store_empty_body
2014-10-27 14:18:09 +03:00
Evgeniy Khramtsov
067958d705
Merge branch 'master' of github.com:processone/ejabberd
2014-10-27 13:44:59 +03:00
Evgeniy Khramtsov
dec1e1f67f
Revert "fix mod_offline to store only chat messages with body xml element"
...
This reverts commit 436f0832c1
2014-10-27 13:44:46 +03:00
Evgeny Khramtsov
76b9098a25
Merge pull request #330 from weiss/accept-newline
...
Accept trailing newline characters in Base64 strings
2014-10-25 21:17:56 +04:00
Holger Weiss
2399aba67d
Accept trailing whitespace in Base64 strings
2014-10-25 02:05:02 +02:00
Gu Feng
94cdcd7b34
Return an empty <vCard/> element in an IQ-result when no vCard exists.
...
According to XEP-0054, if no vCard exists, the server MUST return a stanza
error (which SHOULD be <item-not-found/>) or an IQ-result containing an
empty <vCard/> element.
Signed-off-by: Gu Feng <flygoast@126.com>
2014-10-25 00:55:49 +08:00
Evgeniy Khramtsov
bf33f74ef8
Get rid of a hyphen in VSN
2014-10-24 18:01:42 +04:00
Evgeny Khramtsov
8cf43cf750
Merge pull request #325 from weiss/auth-after-tls
...
Don't advertise authentication mechanisms too early
2014-10-23 14:56:15 +04:00
Holger Weiss
2d748115ee
Don't advertise auth mechanisms too early
...
If "starttls_required: true" is specified for c2s connections,
authentication mechanisms shouldn't be offered before negotiating the
TLS connection.
2014-10-23 10:04:14 +02:00
Evgeny Khramtsov
0b22277b11
Merge pull request #321 from weiss/fix-http-request-record
...
Use 'request' record definition from header file
2014-10-21 12:12:55 +04:00
Evgeny Khramtsov
c7d9b46b6f
Merge pull request #324 from liudanking/master
...
fix odbc_keepalive_interval configuration bug
2014-10-21 11:03:16 +04:00
liudan
d2edcf1288
fix odbc keepalive interval bug
2014-10-21 10:05:44 +08:00
Evgeniy Khramtsov
160c9d7698
Remove append_host_config from ejabberd.yml.example
2014-10-20 12:59:30 +04:00
Evgeny Khramtsov
ecd35f7ba8
Merge pull request #322 from weiss/xep-0198
...
XEP-0198: Abort immediately on stanza queue overflow
2014-10-17 11:56:25 +04:00
