Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #345 from weiss/last-pep-items | Evgeny Khramtsov | 2014-11-14 | 4 | -53/+114 | |
|\ \ | | | | | | | Fix sending of last published PEP items to newly-available resources | |||||
| * | | Send last PEP items to remote subscribers | Holger Weiss | 2014-11-14 | 2 | -16/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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". | |||||
| * | | Don't broadcast last published PEP items | Holger Weiss | 2014-11-14 | 4 | -11/+57 | |
| | | | | | | | | | | | | | | | 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. | |||||
| * | | Move routing of last PEP items into new function | Holger Weiss | 2014-11-14 | 2 | -65/+50 | |
| | | | | | | | | | | | | This doesn't change the behavior, but avoids some code duplication. | |||||
| * | | ODBC: Sync last item notifications with mod_pubsub | Holger Weiss | 2014-11-14 | 1 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | Merge pull request #346 from weiss/fix-type | Evgeny Khramtsov | 2014-11-14 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Cosmetic fix: Use correct type for initial c2s #state.user value | |||||
| * | | Use correct type for initial c2s #state.user value | Holger Weiss | 2014-11-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #341 from sezuan/fix-kick-user-command | Evgeny Khramtsov | 2014-11-10 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix kick_user command | |||||
| * | | Fix kick_user command | Matthias Rieber | 2014-11-10 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #340 from weiss/disable-mechanisms | Evgeny Khramtsov | 2014-11-10 | 2 | -3/+30 | |
|\ \ | | | | | | | New option: disable_sasl_mechanisms | |||||
| * | | New option: disable_sasl_mechanisms | Holger Weiss | 2014-11-10 | 2 | -3/+30 | |
| | | | | | | | | | | | | | | | | | | | | | The new "disable_sasl_mechanisms" option allows for restricting the list of SASL mechanisms offered to the client. Closes #339. | |||||
* | | | Merge pull request #337 from weiss/fix-install-without-json | Evgeny Khramtsov | 2014-11-06 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix "make install" without JSON support | |||||
| * | | | Fix "make install" without JSON support | Holger Weiss | 2014-11-06 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | | | | Don't bail out during "make install" when ./configure was called without "--enable-json". | |||||
* | | | Merge pull request #335 from weiss/avoid-carbon-dups | Evgeny Khramtsov | 2014-11-05 | 1 | -6/+14 | |
|\ \ \ | |/ / |/| | | Avoid duplicates of carbon copies | |||||
| * | | Avoid duplicates of carbon copies | Holger Weiss | 2014-11-05 | 1 | -6/+14 | |
|/ / | | | | | | | | | | | | | | | 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. | |||||
* | | Add xref test to travis. | Jerome Sautret | 2014-10-31 | 1 | -1/+1 | |
| | | | | | | | | | | Conflicts: .travis.yml | |||||
* | | Fix race in CSI test case | Evgeniy Khramtsov | 2014-10-31 | 1 | -1/+1 | |
| | | ||||||
* | | Add tests for mod_vcard_xupdate | Evgeniy Khramtsov | 2014-10-30 | 5 | -9/+165 | |
| | | ||||||
* | | Merge branch 'master' of github.com:processone/ejabberd | Christophe Romain | 2014-10-30 | 2 | -0/+36 | |
|\ \ | ||||||
| * \ | Merge branch 'master' of github.com:processone/ejabberd | Jerome Sautret | 2014-10-30 | 1 | -0/+1 | |
| |\ \ | ||||||
| * | | | Clean up rebar script. | Jerome Sautret | 2014-10-30 | 1 | -4/+1 | |
| | | | | ||||||
| * | | | Fix xref check when odbc driver is not used. | Jerome Sautret | 2014-10-30 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Ignore riak_object module call for xref check. | Jerome Sautret | 2014-10-30 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | It's used in map-reduce function called from riak vm. | |||||
| * | | | Add xref Makefile target. | Jerome Sautret | 2014-10-30 | 2 | -0/+34 | |
| | | | | | | | | | | | | | | | | | | | | Conflicts: rebar.config.script | |||||
* | | | | don't stop on error if jiffy.so symlink exists #309 | Christophe Romain | 2014-10-30 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | fix invalid path of jiffy.so on install #309 | Christophe Romain | 2014-10-30 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #328 from flygoast/master | Evgeny Khramtsov | 2014-10-29 | 1 | -0/+5 | |
|\ \ | | | | | | | Return an empty <vCard/> element in an IQ-result when no vCard exists. | |||||
| * | | Return an empty <vCard/> element in an IQ-result when no vCard exists. | Gu Feng | 2014-10-25 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
* | | | Add new option: store_empty_body | Evgeniy Khramtsov | 2014-10-27 | 2 | -4/+21 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:processone/ejabberd | Evgeniy Khramtsov | 2014-10-27 | 1 | -1/+6 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #330 from weiss/accept-newline | Evgeny Khramtsov | 2014-10-25 | 1 | -1/+6 | |
| |\ \ \ | | |/ / | |/| | | Accept trailing newline characters in Base64 strings | |||||
| | * | | Accept trailing whitespace in Base64 strings | Holger Weiss | 2014-10-25 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | Revert "fix mod_offline to store only chat messages with body xml element" | Evgeniy Khramtsov | 2014-10-27 | 1 | -2/+1 | |
|/ / / | | | | | | | | | | This reverts commit 436f0832c1d7cdd98c6629977d41700e5aa7e589. | |||||
* / / | Get rid of a hyphen in VSN | Evgeniy Khramtsov | 2014-10-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #325 from weiss/auth-after-tls | Evgeny Khramtsov | 2014-10-23 | 1 | -13/+19 | |
|\ \ | | | | | | | Don't advertise authentication mechanisms too early | |||||
| * | | Don't advertise auth mechanisms too early | Holger Weiss | 2014-10-23 | 1 | -13/+19 | |
|/ / | | | | | | | | | | | If "starttls_required: true" is specified for c2s connections, authentication mechanisms shouldn't be offered before negotiating the TLS connection. | |||||
* | | Merge pull request #321 from weiss/fix-http-request-record | Evgeny Khramtsov | 2014-10-21 | 1 | -6/+1 | |
|\ \ | | | | | | | Use 'request' record definition from header file | |||||
| * | | Use 'request' record definition from header file | Holger Weiss | 2014-10-16 | 1 | -6/+1 | |
| | | | | | | | | | | | | This fixes a 'badrecord' crash in mod_http_fileserver. | |||||
* | | | Merge pull request #324 from liudanking/master | Evgeny Khramtsov | 2014-10-21 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix odbc_keepalive_interval configuration bug | |||||
| * | | | fix odbc keepalive interval bug | liudan | 2014-10-21 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Remove append_host_config from ejabberd.yml.example | Evgeniy Khramtsov | 2014-10-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #322 from weiss/xep-0198 | Evgeny Khramtsov | 2014-10-17 | 1 | -7/+13 | |
|\ \ \ | |/ / |/| | | XEP-0198: Abort immediately on stanza queue overflow | |||||
| * | | XEP-0198: Abort immediately on queue overflow | Holger Weiss | 2014-10-17 | 1 | -7/+13 | |
|/ / | | | | | | | | | | | 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. | |||||
* | | Merge pull request #317 from weiss/xep-0198 | Evgeny Khramtsov | 2014-10-13 | 1 | -1/+2 | |
|\ \ | | | | | | | XEP-0198: Set #state.conn field on session resume | |||||
| * | | XEP-0198: Set #state.conn field on session resume | Holger Weiss | 2014-10-12 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #318 from weiss/remove-xmlrpc-dep | Evgeny Khramtsov | 2014-10-13 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Remove "xmlrpc" dependency for "make rel" | |||||
| * | | Remove "xmlrpc" dependency for "make rel" | Holger Weiss | 2014-10-12 | 1 | -1/+1 | |
|/ / | | | | | | | The "xmlrpc" library isn't used anymore. | |||||
* | | Merge pull request #316 from weiss/really-require-tls | Evgeny Khramtsov | 2014-10-12 | 1 | -2/+2 | |
|\ \ | | | | | | | Make sure "starttls_required" can't be bypassed | |||||
| * | | Make sure "starttls_required" can't be bypassed | Holger Weiss | 2014-10-12 | 1 | -2/+2 | |
|/ / | | | | | | | | | Don't allow clients to circumvent the "starttls_required" option by enabling XMPP stream compression. | |||||
* | | Fix list unblocking when Riak is used as a backend | Evgeniy Khramtsov | 2014-10-10 | 1 | -1/+2 | |
| | |