Commit Graph

3368 Commits

Author SHA1 Message Date
badlop 9fe0eff75e Merge pull request #27 from gcapital/master
NULL handling in gen_storage_odbc
2012-08-08 04:55:30 -07:00
Ben Homnick b1ef38f627 Merge remote-tracking branch 'upstream/master' 2012-03-07 16:08:48 +08:00
Alexey Shchepin 2905b90c41 Update copyright dates 2012-02-23 17:47:43 +02:00
Brendon Hogger 118b006cac Handle NULL<->undefined correctly in gen_storage_odbc 2012-02-21 06:30:30 +08:00
Brendon Hogger b4c2a3b85f Fix a crash in debug prints of XML messages 2012-02-21 05:28:08 +08:00
Evgeniy Khramtsov 89481baedd Replace a single quote with double quotes in
an ODBC escape (thanks to Vladislav Chugunov)
2012-01-31 11:23:02 +10:00
Badlop 944c15a969 http_bind webserver TLS fail on Chrome (thanks to Adam Langley)(EJAB-1530) 2012-01-19 13:17:05 +01:00
Badlop 3573fbcd21 Foreign shared rosters items not pushed (thanks to Nathan Bruning)(EJAB-1509) 2012-01-04 19:30:35 +01:00
Badlop 8c942e31e0 Update ejabberd version number to 3.0.0-alpha-5 2011-12-23 12:32:59 +01:00
Badlop 9912e1b548 Support undefinition of ssl:seed in R15B 2011-12-23 12:19:18 +01:00
Badlop 09a5fafc8a Always allow packets from user's server and bare jid (thanks to Alexey Shchepin) 2011-12-23 11:55:01 +01:00
Alexey Shchepin 64036bc121 Corrected mod_blocking hooks return value, activate "Blocked Contacts" privacy list after it is changed (EJAB-1519) (thanks to Karim Gemayel) 2011-12-21 19:00:17 +02:00
Badlop 33973677f2 Fix update with stripped beams (thanks to Jose M Herrero)(EJAB-1520) 2011-12-21 12:59:56 +01:00
Badlop c4c0b45ced Support Erlang/OTP R15B driver (EJAB-1521) 2011-12-21 12:13:44 +01:00
Evgeniy Khramtsov 4e9c81b66a Get rid of +driver option because it is incompatible with R15B 2011-12-19 16:01:52 +10:00
Badlop 7a53b66e46 Preliminary support for groupname@vhost in Displayed Groups (EJAB-506) 2011-12-15 17:28:37 +01:00
Badlop d5ebef1362 Fix command "update" to return response in the expected format 2011-12-08 19:40:29 +01:00
Badlop 26b814e367 Don't reveal invitee's resource when room informs invitor 2011-12-08 16:54:25 +01:00
Badlop f675ae1e8c Add callback function print_state/1 for behavior p1_fsm 2011-12-08 12:58:52 +01:00
Badlop b03828d2f7 Fix a recent commit 2011-12-08 12:55:50 +01:00
Pablo Polvorin df2e050780 Prevent overload of incomming s2s connections
Three changes were introduced:

1) ejabberd_s2s_in now uses p1_fsm instead of gen_fsm.  And uses
   the {max_queue, N} option to kill the process if its input
   queue grows too much.
2) If a ejabberd_s2s_in process is overload and killed, the server
   that originated that connection is not allowed to connect back
   to us for X seconds (set to 60seconds on the source)
3) The list of blocked (both statically and dynamically by the above
   method) host is now also checked for hosts authenticating by
   starttls+sasl. Previusly it was only used during dialback.
2011-12-02 15:36:51 -03:00
Pablo Polvorin 089331caf0 Fix bug on s2s shaper when TLS is used
The shaper was not enabled if the remote server authenticates
using a certificate instead of dialback.
2011-12-01 13:22:36 -03:00
Christophe Romain db834ca421 add hooks for node creation/deletion (EJAB-1470) 2011-11-29 15:48:49 +01:00
Badlop 5594e1470f Use httpc instead of the deprecated http 2011-11-26 17:20:13 +01:00
Badlop f7076f49b6 Avoid a possible race condition 2011-11-26 17:04:18 +01:00
Janusz Dziemidowicz 5c40d38b69 Remove some leftovers of XEP-0018.
Support for XEP-0018 was dropped long ago, but there are some
leftovers. Remove them.
2011-11-17 18:07:57 +01:00
Badlop e2763b7d11 Comment section 6.3.1 because it has no content at all 2011-11-15 16:49:50 +01:00
Evgeniy Khramtsov 80188d3a52 Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466) 2011-11-09 15:11:50 +10:00
Badlop 6575f899b6 Support to update modules in R14B04 and higher 2011-11-03 19:56:38 +01:00
Badlop 3cd9cd0e36 Only verify if passwd table is SCRAMmed when starting module. Some format fixes. 2011-10-28 16:43:07 +02:00
Badlop 576dda5c87 Fix previous commit about language name 2011-10-20 17:33:33 +02:00
Badlop 35a71fc493 Fix extraction of language name from PO files 2011-10-20 15:46:17 +02:00
Badlop 1a3abf15c0 Use the 'host' option also for static_modules, instead of 'prefix' 2011-10-20 11:13:36 +02:00
Badlop c7c59766b2 When a vhost is removed, remove also its accounts and rooms (EJAB-1371) 2011-10-20 11:13:23 +02:00
Badlop e681f4d4cf Remove workaround, as now the correct #roster format is received 2011-10-10 17:15:16 +02:00
Badlop b2a6eccded Revert "Update ejabberd version number to 3.0.0-alpha-4"
This reverts commit a6e5fb269c.
2011-10-04 11:19:04 +02:00
Badlop a6e5fb269c Update ejabberd version number to 3.0.0-alpha-4 2011-09-26 18:07:01 +02:00
Badlop 96c99b6427 Added relevant changes of 'master' branch. 2011-09-26 18:03:30 +02:00
Janusz Dziemidowicz 3fd5513549 Decrease CPU usage caused by tls:send with large data.
Sending one large chunk of data with tls:send eats lots of
CPU power and blocks whole Erlang emulator. This is caused by the
fact that encrypted output is read from memory BIO in 1k chunks.
Memory BIO, after reading data, shifts the remaining part.
If large chunks of data (few MB) is sent and then read in 1k
chunks, then a _lot_ of shifting is performed eating CPU.

The solution is to simply allocate binary of the needed size
(amount of data in memory BIO can be retrieved with
BIO_ctrl_pending) and then issue only one read that reads the
whole data.
2011-09-25 00:56:15 +02:00
Badlop 804549415d Fix mod_muc_log crash when first log entry is room being destroyed (EJAB-1499) 2011-09-23 17:02:00 +02:00
Christophe Romain fa08db7091 fix broken PEP after EJAB-1498 (thanks to Karim Gemayel) 2011-09-22 20:49:56 +02:00
Badlop df0754ade9 ejabberdctl doesn't support parameters with blankspaces (EJAB-1458)
Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"

This reverts commit 6dea2d2307.
2011-09-22 16:18:44 +02:00
Christophe Romain d3c4eab46f Fix Denial of Service when user sends malformed publish stanza (thanks to Oleg Smirnov) (EJAB-1498) 2011-09-21 14:40:47 +02:00
Badlop 1c62edc53c added svg mimetype to default content types (thanks to Markus Kohlhase) 2011-09-20 16:50:32 +02:00
Badlop 17099eaaca Add support for @online@ to add_user_to_group 2011-09-20 16:45:08 +02:00
Evgeniy Khramtsov f3f80ea0ea New option support: ldap_deref_aliases (EJAB-639)
Conflicts:

	src/ejabberd_auth_ldap.erl
2011-09-19 17:03:36 +10:00
Badlop 8b45ee5208 Use NS_XBOSH instead of NS_BOSH (thanks to Janusz Dziemidowicz)
There are two, exactly the same defines for urn:xmpp:xbosh
namespace: NS_BOSH and NS_XBOSH. Both are used in http_bind
module. Stick with NS_XBOSH everywhere.
2011-09-16 01:17:26 +02:00
Janusz Dziemidowicz 1dc1795f2a Update http_bind module to latest XEP-0124 and XEP-0206
Only cosmetic changes, version bumped to 1.10 and added
'restartlogic' attribute.
2011-09-16 01:17:23 +02:00
Badlop a435c4b123 No need to explicitly skip old useless tables, simply fix keep_tables 2011-09-14 16:19:23 +02:00
Badlop 151994c8d5 Avoid crash when performing admin action (thanks to Evgeniy Khramtsov) 2011-09-09 11:29:46 +02:00