aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #345 from weiss/last-pep-itemsEvgeny Khramtsov2014-11-144-53/+114
|\ \ | | | | | | Fix sending of last published PEP items to newly-available resources
| * | Send last PEP items to remote subscribersHolger Weiss2014-11-142-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 itemsHolger Weiss2014-11-144-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 functionHolger Weiss2014-11-142-65/+50
| | | | | | | | | | | | This doesn't change the behavior, but avoids some code duplication.
| * | ODBC: Sync last item notifications with mod_pubsubHolger Weiss2014-11-141-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-typeEvgeny Khramtsov2014-11-141-1/+1
|\ \ \ | |/ / |/| | Cosmetic fix: Use correct type for initial c2s #state.user value
| * | Use correct type for initial c2s #state.user valueHolger Weiss2014-11-141-1/+1
|/ /
* | Merge pull request #341 from sezuan/fix-kick-user-commandEvgeny Khramtsov2014-11-101-1/+1
|\ \ | | | | | | Fix kick_user command
| * | Fix kick_user commandMatthias Rieber2014-11-101-1/+1
|/ /
* | Merge pull request #340 from weiss/disable-mechanismsEvgeny Khramtsov2014-11-102-3/+30
|\ \ | | | | | | New option: disable_sasl_mechanisms
| * | New option: disable_sasl_mechanismsHolger Weiss2014-11-102-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-jsonEvgeny Khramtsov2014-11-061-1/+1
|\ \ \ | | | | | | | | Fix "make install" without JSON support
| * | | Fix "make install" without JSON supportHolger Weiss2014-11-061-1/+1
|/ / / | | | | | | | | | | | | Don't bail out during "make install" when ./configure was called without "--enable-json".
* | | Merge pull request #335 from weiss/avoid-carbon-dupsEvgeny Khramtsov2014-11-051-6/+14
|\ \ \ | |/ / |/| | Avoid duplicates of carbon copies
| * | Avoid duplicates of carbon copiesHolger Weiss2014-11-051-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 Sautret2014-10-311-1/+1
| | | | | | | | | | Conflicts: .travis.yml
* | Fix race in CSI test caseEvgeniy Khramtsov2014-10-311-1/+1
| |
* | Add tests for mod_vcard_xupdateEvgeniy Khramtsov2014-10-305-9/+165
| |
* | Merge branch 'master' of github.com:processone/ejabberdChristophe Romain2014-10-302-0/+36
|\ \
| * \ Merge branch 'master' of github.com:processone/ejabberdJerome Sautret2014-10-301-0/+1
| |\ \
| * | | Clean up rebar script.Jerome Sautret2014-10-301-4/+1
| | | |
| * | | Fix xref check when odbc driver is not used.Jerome Sautret2014-10-301-0/+2
| | | |
| * | | Ignore riak_object module call for xref check.Jerome Sautret2014-10-301-0/+3
| | | | | | | | | | | | | | | | It's used in map-reduce function called from riak vm.
| * | | Add xref Makefile target.Jerome Sautret2014-10-302-0/+34
| | | | | | | | | | | | | | | | | | | | Conflicts: rebar.config.script
* | | | don't stop on error if jiffy.so symlink exists #309Christophe Romain2014-10-301-1/+1
| |/ / |/| |
* | | fix invalid path of jiffy.so on install #309Christophe Romain2014-10-301-0/+1
|/ /
* | Merge pull request #328 from flygoast/masterEvgeny Khramtsov2014-10-291-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 Feng2014-10-251-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_bodyEvgeniy Khramtsov2014-10-272-4/+21
| | |
* | | Merge branch 'master' of github.com:processone/ejabberdEvgeniy Khramtsov2014-10-271-1/+6
|\ \ \
| * \ \ Merge pull request #330 from weiss/accept-newlineEvgeny Khramtsov2014-10-251-1/+6
| |\ \ \ | | |/ / | |/| | Accept trailing newline characters in Base64 strings
| | * | Accept trailing whitespace in Base64 stringsHolger Weiss2014-10-251-1/+6
| | | |
* | | | Revert "fix mod_offline to store only chat messages with body xml element"Evgeniy Khramtsov2014-10-271-2/+1
|/ / / | | | | | | | | | This reverts commit 436f0832c1d7cdd98c6629977d41700e5aa7e589.
* / / Get rid of a hyphen in VSNEvgeniy Khramtsov2014-10-241-1/+1
|/ /
* | Merge pull request #325 from weiss/auth-after-tlsEvgeny Khramtsov2014-10-231-13/+19
|\ \ | | | | | | Don't advertise authentication mechanisms too early
| * | Don't advertise auth mechanisms too earlyHolger Weiss2014-10-231-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-recordEvgeny Khramtsov2014-10-211-6/+1
|\ \ | | | | | | Use 'request' record definition from header file
| * | Use 'request' record definition from header fileHolger Weiss2014-10-161-6/+1
| | | | | | | | | | | | This fixes a 'badrecord' crash in mod_http_fileserver.
* | | Merge pull request #324 from liudanking/masterEvgeny Khramtsov2014-10-211-1/+1
|\ \ \ | | | | | | | | fix odbc_keepalive_interval configuration bug
| * | | fix odbc keepalive interval bugliudan2014-10-211-1/+1
|/ / /
* | | Remove append_host_config from ejabberd.yml.exampleEvgeniy Khramtsov2014-10-201-1/+1
| | |
* | | Merge pull request #322 from weiss/xep-0198Evgeny Khramtsov2014-10-171-7/+13
|\ \ \ | |/ / |/| | XEP-0198: Abort immediately on stanza queue overflow
| * | XEP-0198: Abort immediately on queue overflowHolger Weiss2014-10-171-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-0198Evgeny Khramtsov2014-10-131-1/+2
|\ \ | | | | | | XEP-0198: Set #state.conn field on session resume
| * | XEP-0198: Set #state.conn field on session resumeHolger Weiss2014-10-121-1/+2
| | |
* | | Merge pull request #318 from weiss/remove-xmlrpc-depEvgeny Khramtsov2014-10-131-1/+1
|\ \ \ | |/ / |/| | Remove "xmlrpc" dependency for "make rel"
| * | Remove "xmlrpc" dependency for "make rel"Holger Weiss2014-10-121-1/+1
|/ / | | | | | | The "xmlrpc" library isn't used anymore.
* | Merge pull request #316 from weiss/really-require-tlsEvgeny Khramtsov2014-10-121-2/+2
|\ \ | | | | | | Make sure "starttls_required" can't be bypassed
| * | Make sure "starttls_required" can't be bypassedHolger Weiss2014-10-121-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 backendEvgeniy Khramtsov2014-10-101-1/+2
| |