Badlop
8bb58ba3c3
Extract new strings
2012-04-15 00:21:15 +02:00
Badlop
49859683b0
Document how to provide a long announcement (EJAB-1553)
2012-04-14 23:29:55 +02:00
Badlop
169b83b36d
Handle the scenario of disabled mod_muc (EJAB-1553)
2012-04-14 23:29:30 +02:00
Evgeniy Khramtsov
86435ba9aa
ODBC support for mod_blocking
2012-04-12 14:22:56 +10:00
Paweł Chmielowski
e2d6bc95a4
Parse and encode https header names like native http parser does
...
This code adds case normalization step to https headers parsing, making
it correctly use atoms for some special header no matter how upper/lower
case letters are used in input string
2012-04-11 17:28:18 +02:00
Christophe Romain
06f570f4ff
return user affiliation for a specified node (thanks to Karim Gemayel) (EJAB-1294)
2012-04-11 16:50:36 +02:00
Badlop
730dfe8fc7
Add comments about Dialyzer warnings
2012-04-11 16:34:03 +02:00
Evgeniy Khramtsov
5619d39bd3
Add odbc modules to Makefile.win32
2012-04-09 14:53:15 +10:00
Evgeniy Khramtsov
959e0ff1c9
Remove obsoleted function call
2012-04-09 10:43:49 +10:00
Paweł Chmielowski
2c228e6414
Don't use binary:match to extract lines from binaries
...
This was added in R13B3, lets roll our own implementation to make sure it
works on older erlang versions.
2012-04-06 18:55:27 +02:00
Paweł Chmielowski
82468bff00
Fix makefile rules for building dll-s in Makefile.win32 files
2012-04-06 16:31:17 +02:00
Paweł Chmielowski
5f82846732
Parse correctly https request split into multiple packets
...
This fixes case when SockMod:recv() calls returns only part of first line
of http request (GET/POST/OPTION/HEAD line). Before that change request
like that (and if keep-alive was active, all further request) were dropped.
This fixes EJAB-1537.
2012-04-06 16:22:08 +02:00
Paweł Chmielowski
09c75af15c
Make sure that res is initialized in all cases
2012-04-06 12:00:43 +02:00
Alexey Shchepin
91964b1aba
Added missed tls:recv_data/2
2012-04-06 11:53:53 +02:00
Paweł Chmielowski
af2e9169e6
Don't ignore Length parameter in tls:recv
2012-04-06 11:53:21 +02:00
Alexey Shchepin
4637e2c66b
Avoid quadratic behavior in reading SSL data
2012-04-06 11:47:53 +02:00
Paweł Chmielowski
1f1a98d7ae
Properly handle HEAD request in mod_http_bind (this fixes EJAB-1538)
2012-04-06 11:47:38 +02:00
Evgeniy Khramtsov
cea23b055b
Get rid of duplicated code
2012-04-06 12:31:29 +10:00
Evgeniy Khramtsov
41a0eae0bd
ODBC support for mod_shared_roster
2012-04-04 20:37:43 +10:00
Evgeniy Khramtsov
5fab00011e
ODBC support for mod_irc
2012-04-03 20:23:41 +10:00
Evgeniy Khramtsov
ca5f028016
ODBC support for mod_vcard_xupdate
2012-04-02 15:21:54 +10:00
Evgeniy Khramtsov
b43444f674
ODBC support for mod_announce
2012-04-02 14:49:13 +10:00
Evgeniy Khramtsov
866085c918
Add ODBC exporting function for privacy table
2012-04-02 12:39:23 +10:00
Evgeniy Khramtsov
6ec5c7c4d8
Use proper module name
2012-03-31 22:56:51 +10:00
Evgeniy Khramtsov
6b3875814c
ODBC support for mod_muc
2012-03-31 21:41:54 +10:00
Evgeniy Khramtsov
3a51c801e1
Change log level from informational to error
2012-03-19 18:52:20 +10:00
Badlop
983da9c887
Relax digest-uri handling (thanks to Daniel Willmann)(EJAB-1529)
...
This patch introduces a new config option - fqdn - to set the fully
qualified domain name of the host:
{fqdn, "foo.example.com"}.
This fixes a problem with Pidgin not being able to log in on a server
that used SRV records.
2012-03-16 14:16:17 +01:00
Evgeniy Khramtsov
f7b6446c74
Assume we have only one CPU when an auto-detection fails (EJAB-1516)
2012-02-29 00:45:45 +10:00
Evgeniy Khramtsov
deb87f2dfa
Cache caps timestamp before the IQ-request is done
2012-02-28 16:38:24 +10:00
Alexey Shchepin
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
Christophe Romain
f7ffdfa15d
Fix typo in xep number, bosh is xep0206 (thanks to Ludovic Bocquet)
2012-02-20 14:15:08 +01:00
Badlop
112a18f966
Work also with some unicode strings in PgSQL (EJAB-1490)
2012-02-14 13:18:18 +01:00
Badlop
7d623d5eb4
Option default_host for handling HTTP requests with ambiguous Host (EJAB-1261)
2012-02-14 11:35:52 +01:00
Evgeniy Khramtsov
4819738e8f
Receiver should not generate an exception
2012-02-14 17:03:08 +10:00
Evgeniy Khramtsov
89aa7baa5b
Replace a single quote with double quotes in
...
an ODBC escape (thanks to Vladislav Chugunov)
2012-01-31 11:18:37 +10:00
Badlop
95928a7cd4
http_bind webserver TLS fail on Chrome (thanks to Adam Langley)(EJAB-1530)
2012-01-19 13:21:25 +01:00
Alexey Shchepin
1ecc9ac48c
Fixed ejabberd_http:get_line
2012-01-19 12:20:48 +02:00
Badlop
288196c7e8
Foreign shared rosters items not pushed (thanks to Nathan Bruning)(EJAB-1509)
2012-01-04 19:21:31 +01:00
Badlop
0283c6cdfe
Revert "Update ejabberd version number to 2.1.10"
...
This reverts commit bcdae19141
2011-12-31 20:40:04 +01:00
Alexey Shchepin
d4e7b0cda0
mod_private.erl: misc errors cases fixes (thanks to Karim Gemayel)
2011-12-30 16:08:24 +02:00
Badlop
bcdae19141
Update ejabberd version number to 2.1.10
2011-12-23 12:27:30 +01:00
Badlop
684cac274d
Support undefinition of ssl:seed in R15B
2011-12-23 12:19:38 +01:00
Badlop
ce7b008b8f
Use the regexp frontend module (EJAB-921)
2011-12-23 11:33:33 +01:00
Alexey Shchepin
a3c58f2896
Always allow packets from user's server and bare jid in mod_privacy*
2011-12-22 16:37:47 +02:00
Alexey Shchepin
3839f1055a
Fixed the previous mod_blocking patch
2011-12-21 18:28:04 +02:00
Alexey Shchepin
94350ddb3a
Corrected mod_blocking hooks return value, activate "Blocked Contacts" privacy list after it is changed
2011-12-21 16:25:01 +02:00
Badlop
919cdc27db
Fix update with stripped beams (thanks to Jose M Herrero)(EJAB-1520)
2011-12-21 12:58:58 +01:00
Badlop
2029e39299
Support Erlang/OTP R15B driver (EJAB-1521)
2011-12-21 12:15:21 +01:00
Evgeniy Khramtsov
707bb0a321
Replace regexp with ejabberd_regexp
2011-12-19 16:10:48 +10:00
Evgeniy Khramtsov
298a4a3acf
Get rid of +driver option because it is incompatible with R15B
2011-12-19 16:01:04 +10:00
Badlop
262157c88d
Preliminary support for groupname@vhost in Displayed Groups (EJAB-506)
2011-12-15 17:27:28 +01:00
Badlop
37107af7b4
Fix command "update" to return response in the expected format
2011-12-08 19:39:36 +01:00
Badlop
13a9ca65a4
Don't reveal invitee's resource when room informs invitor
2011-12-08 16:35:31 +01:00
Badlop
d3369c83e7
Add callback function print_state/1 for behavior p1_fsm
2011-12-08 12:50:40 +01:00
Badlop
48308042b6
Use the regexp frontend module (EJAB-921)
2011-12-08 12:40:04 +01:00
Badlop
d30ad8ba28
Frontend module to Re and Regexp (EJAB-921)
2011-12-08 12:39:58 +01:00
Pablo Polvorin
cf973f27bb
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:30:20 -03:00
Pablo Polvorin
87df27109a
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:16:21 -03:00
Christophe Romain
89e4e822bf
add hooks for node creation/deletion (EJAB-1470)
2011-11-29 14:13:13 +01:00
Badlop
b89d4c7476
Use httpc instead of the deprecated http
2011-11-26 17:20:06 +01:00
Badlop
ee968b5573
Fix error in mod_vcard when lowercasing some vjud search result fields (EJAB-1490)
2011-11-26 17:08:17 +01:00
Badlop
1f97740cfa
Avoid a possible race condition
2011-11-26 17:03:24 +01:00
Evgeniy Khramtsov
944791e888
Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466)
2011-11-09 15:09:02 +10:00
Badlop
0656377165
Support to update modules in R14B04 and higher
2011-11-03 19:47:11 +01:00
Evgeniy Khramtsov
96800e9b75
Get rid of useless mnesia transaction (EJAB-1502)
2011-10-14 16:57:51 +10:00
Badlop
c1d479f863
Set ejabberd version to 2.1.x
2011-10-13 17:56:19 +02:00
Badlop
4be7984a0e
Update ejabberd version number to 2.1.9
2011-09-26 18:11:18 +02:00
Evgeniy Khramtsov
39bc499b10
Fix instruction and error text
2011-09-26 20:00:43 +10:00
Evgeniy Khramtsov
de4d4a4bbb
Change "muc#role" field type to "hidden"
2011-09-26 19:54:55 +10:00
Evgeniy Khramtsov
8631dd14e9
Correct lists:keysearch output processing and fix dialyzer warning
2011-09-26 19:06:34 +10:00
Evgeniy Khramtsov
e7d12f4b9e
Code cleanup
2011-09-26 18:44:41 +10:00
Maxim Ignatenko
f17a531e15
Use treap correctly
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
ff57c8a58c
Apply patch from Evgeniy Khramtsov
2011-09-26 11:16:30 +03:00
Maxim Ignatenko
499b884c67
Use treap for keeping last voice request timestamps
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
0c261fb903
Fix voice request/approvement detection and extract_jid_from_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
322263fd5c
Fix typo
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
845f5cabec
Fix patterns in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
f919349173
Use more pattern-matching
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
a91ae03dc6
Remove try/catch
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
faed7698c2
Use pattern matching in check_voice_request_fields/2 and check_voice_approvement_fields/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
eb8347f92b
Reverse arguments order for timer:now_diff/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
c53ffe6dc5
Fix return value inconsistency in last_voice_request_time/2
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
7c8eab4f43
Use jlib:parse_xdata_submit/1 in is_voice_request/1 and is_voice_approvement/1
2011-09-26 11:16:29 +03:00
Maxim Ignatenko
b1d8168dd3
Use bare JID as key in state.last_voice_request_time
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
c196c1f5e5
Use lists:foreach instead of lists:map in send_voice_request/2
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
604563af76
Remove needless time conversions
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6848d3affe
Ignore any extra elements in voice approvement form submission
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6708914e99
Add 2 room config options
...
- Allow voice requests?
- Minimum interval between voice requests
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
5921f9c506
Simple rate control
...
Visitor allowed to send new voice request only after specified amount of
time (or after rejoining).
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
6193ed63b1
Voice approvement support
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
18dd0d08cb
Implement basic voice request processing logic.
...
No rate control or configuration for now
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
8dd6f128bf
Implement voice approvement detection and remove some debug code
2011-09-26 11:16:28 +03:00
Maxim Ignatenko
04267930de
Fix form instructions
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
d83716dece
Use ejabberd_router:route/3 directly, instead of send_packet_to/3
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
c77358bdc1
Use exception handling in is_invitation/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
44987479a5
Fix exception handling in is_voice_request/1
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
30d89abf66
Implemented sending voice request and fixed some bugs
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
f175be6b78
Add function for detecting voice requests
2011-09-26 11:16:27 +03:00
Maxim Ignatenko
2a41ca0628
More correct dispatching of normal messages to conference room
...
is_invitation/1 function returns true if <x> element of message is
an invitation
2011-09-26 11:16:27 +03:00
Janusz Dziemidowicz
c4f9a050c9
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:23:31 +02:00
Badlop
32ff6b56eb
Fix mod_muc_log crash when first log entry is room being destroyed (EJAB-1499)
2011-09-23 17:00:50 +02:00
Christophe Romain
33c0ebb100
fix broken PEP after EJAB-1498 (thanks to Karim Gemayel)
2011-09-22 20:51:59 +02:00
Badlop
cb9aecf35e
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:04 +02:00
Christophe Romain
d5b4d67858
Fix Denial of Service when user sends malformed publish stanza (thanks to Oleg Smirnov) (EJAB-1498)
2011-09-21 14:39:50 +02:00
Badlop
9f4ae07100
added svg mimetype to default content types (thanks to Markus Kohlhase)
2011-09-20 16:50:22 +02:00
Badlop
32fc36b17d
Add support for @online@ to add_user_to_group
2011-09-20 16:44:51 +02:00
Evgeniy Khramtsov
33766a124d
New option support: ldap_deref_aliases (EJAB-639)
2011-09-19 16:58:55 +10:00
Evgeniy Khramtsov
ede8d57373
Fix dialyzer warnings
2011-09-17 10:48:52 +10:00
Evgeniy Khramtsov
2494e39c9e
Fix dialyzer warnings
2011-09-15 16:59:45 +10:00
Badlop
07fdd089a0
No need to explicitly skip old useless tables, simply fix keep_tables
2011-09-14 12:15:53 +02:00
Evgeniy Khramtsov
228a587fc5
Fix previous commit
2011-09-09 12:40:07 +10:00
Evgeniy Khramtsov
e432ff58f9
Avoid crash when performing admin action
2011-09-09 12:34:06 +10:00
Badlop
b8969f68e0
Fixed support for multi-resource occupants (EJAB-305)
2011-09-08 16:10:38 +02:00
Badlop
dbb2d1c229
Fix room config change logging, due to allow_private_messages_from_visitors
2011-09-08 12:34:25 +02:00
Badlop
609b7ed5c5
Support to import XML files without password-format attribute
2011-09-08 11:41:45 +02:00
Badlop
20f3fc96c3
Fix SCRAM to support attributes which value has only one character
2011-09-05 23:21:38 +02:00
Evgeniy Khramtsov
0fde148a9f
Fix dialyzer warnings
2011-09-05 22:00:50 +10:00
Evgeniy Khramtsov
6b0eb1f09d
Reorganize the code to shut up the dialyzer
2011-09-05 21:27:31 +10:00
Evgeniy Khramtsov
f3c90ee266
Get rid of useless check
2011-09-05 21:06:18 +10:00
Evgeniy Khramtsov
2482c9c5ed
Merge set_affiliation/3 and set_affiliation_and_reason/4 into set_affiliation/4
2011-09-05 20:53:01 +10:00
Badlop
da555fb908
Fix SCRAM auth of uppercase passwords (EJAB-1196)
2011-09-05 12:50:24 +02:00
Evgeniy Khramtsov
7ae7d6315f
Remove useless clauses
2011-09-05 18:07:50 +10:00
Evgeniy Khramtsov
eccb499346
Add some magic in order to shut up the dialyzer (because I do not want to replace the macro with a function)
2011-09-05 17:33:51 +10:00
Evgeniy Khramtsov
0c1796ea40
Fix potential case-clause crash
2011-09-05 17:27:15 +10:00
Evgeniy Khramtsov
826fab9999
Remove useless case clause
2011-09-05 17:12:45 +10:00
Evgeniy Khramtsov
3b95108a3a
Replace VVALUEL macro with function in order to shut up the dialyzer
2011-09-05 17:09:36 +10:00
Evgeniy Khramtsov
ab2a298ebf
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2011-09-05 16:53:10 +10:00
Evgeniy Khramtsov
8b5fa88b6f
Export do_client_version/3 in order to shut up the dialyzer
2011-09-05 16:52:36 +10:00
Evgeniy Khramtsov
de712e5ccb
Remove useless case clauses
2011-09-05 16:48:04 +10:00
Evgeniy Khramtsov
ffdf5cb206
Remove useless case clause
2011-09-05 16:47:18 +10:00
Evgeniy Khramtsov
f1a91108ef
Correct some function clauses and value types
2011-09-05 16:31:58 +10:00
Evgeniy Khramtsov
ffe063a0e9
Get rid of useless code
2011-09-05 15:59:30 +10:00
Evgeniy Khramtsov
d74f02e367
ejabberd_auth:remove_user/2 always returns ok
2011-09-05 15:39:55 +10:00
Evgeniy Khramtsov
0da2107974
Fix some case clauses
2011-09-05 15:35:46 +10:00
Evgeniy Khramtsov
1994c8a174
Change argument of open_port/2 to string in order to shut up the dialyzer
2011-09-05 15:28:14 +10:00
Evgeniy Khramtsov
2434be4803
Get rid of useless function clause
2011-09-05 15:13:54 +10:00
Badlop
d6fcee4faa
Replace calls of OTP's Binary, since they would require R14
2011-09-04 14:56:56 +02:00
Badlop
41d028d101
First check occupant existence, later check the message
2011-09-04 13:28:32 +02:00
Christophe Romain
75fc431fb8
enable pubsub#deliver_notification checking (thanks to Karim Gemayel)(EJAB-1453)
2011-08-31 16:11:01 +02:00
Badlop
917d1be994
Explicitly skip useless ejabberd 2.0* mnesia tables when restoring backup
...
Reference:
http://www.ejabberd.im/node/4867
2011-08-29 12:36:49 +02:00
Christophe Romain
900b013658
typo fix (thanks to Artem Sh)(EJAB-1424)
2011-08-25 17:22:48 +02:00
Badlop
84486dcb2c
Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305)
2011-08-23 21:53:41 +02:00
Badlop
9a190f3bc4
Send private messages to all the sessions with same nick (EJAB-305)
2011-08-23 21:53:30 +02:00
Badlop
c76bbdf16f
Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305)
2011-08-23 21:53:19 +02:00
Badlop
24c5063b99
Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305)
2011-08-23 21:52:20 +02:00
Badlop
a0f8a2c3a4
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:39 +02:00
Badlop
3edea6c806
Fix bug in scram is_alpha
2011-08-17 19:33:58 +02:00
Badlop
abebabc487
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
2011-08-16 19:33:22 +02:00
Badlop
1ee6eae684
Fix and improve support for SCRAM auth method (EJAB-1196)
2011-08-16 00:26:49 +02:00
Badlop
24852b9be8
Indicate license and copyright (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:40 +02:00
