Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity
3,472 Commits 7 Branches 109 Tags 65 MiB
9dc9d75502
Commit Graph

3472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Holger Weiss
0c24e18b5e XEP-0198: Abort immediately on queue overflow 
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected.  This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
 2014-10-17 01:35:30 +02:00
Holger Weiss
96d6aacede Use 'request' record definition from header file 
This fixes a 'badrecord' crash in mod_http_fileserver.
 2014-10-16 13:51:13 +02:00
Evgeny Khramtsov
adaa067333 Merge pull request #317 from weiss/xep-0198 
XEP-0198: Set #state.conn field on session resume
 2014-10-13 20:38:15 +04:00
Evgeny Khramtsov
724a31fa13 Merge pull request #318 from weiss/remove-xmlrpc-dep 
Remove "xmlrpc" dependency for "make rel"
 2014-10-13 20:37:28 +04:00
Holger Weiss
1ccc0d8bcb XEP-0198: Set #state.conn field on session resume 2014-10-12 19:44:35 +02:00
Holger Weiss
3f3f64c217 Remove "xmlrpc" dependency for "make rel" 
The "xmlrpc" library isn't used anymore.
 2014-10-12 17:23:25 +02:00
Evgeny Khramtsov
97fa57c360 Merge pull request #316 from weiss/really-require-tls 
Make sure "starttls_required" can't be bypassed
 2014-10-12 11:05:49 +04:00
Holger Weiss
7bdc1151b1 Make sure "starttls_required" can't be bypassed 
Don't allow clients to circumvent the "starttls_required" option by
enabling XMPP stream compression.
 2014-10-12 02:08:08 +02:00
Evgeniy Khramtsov
4bbf16b21a Fix list unblocking when Riak is used as a backend 2014-10-10 11:38:13 +04:00
Evgeniy Khramtsov
d87ca9fb7b Fix format of an XML-RPC response 2014-10-04 12:55:59 +04:00
Evgeniy Khramtsov
7b3209cc7f Switch to P1 implementation of XML-RPC 2014-10-04 12:49:33 +04:00
Evgeniy Khramtsov
1d782db84f Process XML-RPC requests via p1_xml and ejabberd_http 2014-10-04 12:49:12 +04:00
Evgeniy Khramtsov
e109f352e3 Make directory creation more robust 2014-10-02 14:21:27 +04:00
Evgeny Khramtsov
6e63ee480e Merge pull request #310 from weiss/ignore-rel-dir 
Let Git ignore the "rel/ejabberd" directory
 2014-09-30 13:50:32 +04:00
Holger Weiss
90fb19797d Let Git ignore the "rel/ejabberd" directory 2014-09-30 11:35:58 +02:00
Evgeny Khramtsov
415936146b Merge pull request #303 from weiss/no-csi-if-unconfigured 
Offer CSI stream feature only if mod_client_state is enabled
 2014-09-26 13:16:28 +04:00
Holger Weiss
277e1dc3ff Offer CSI stream feature only if configured 
Don't offer the CSI stream feature when mod_client_state isn't actually
configured to filter stanzas.  This makes sure clients won't send CSI
tags that end up being ignored.
 2014-09-25 18:28:20 +02:00
Holger Weiss
56175fef1b Add new hook: c2s_post_auth_features 
The c2s_post_auth_features hook can be used to extend the list of stream
features offered after authentication.
 2014-09-25 18:15:33 +02:00
Evgeny Khramtsov
ef89497d3f Merge pull request #307 from weiss/remove-invisible-presence 
Remove invisible presence fields from c2s #state
 2014-09-25 17:20:45 +04:00
Holger Weiss
7aec0337e1 Remove invisible presence fields from c2s #state 
Invisible presence isn't supported anymore, so the corresponding
ejabberd_c2s #state fields were unused.
 2014-09-25 00:08:56 +02:00
Evgeny Khramtsov
e49cf604e9 Merge pull request #302 from weiss/ldap-deref-aliases 
Rename deref_aliases back to ldap_deref_aliases
 2014-09-23 13:54:22 +04:00
Holger Weiss
61c8836740 Rename deref_aliases back to ldap_deref_aliases 
The "ldap_deref_aliases" option has accidentally been renamed to
"deref_aliases".  Revert that change (but accept both names for a
while), so that the option name now matches the documentation again.
 2014-09-23 11:31:44 +02:00