Evgeniy Khramtsov
0a1b0498a6
* Rename option captcha to captcha_protected for consistency.
...
* Document captcha_protected option
2010-10-24 15:45:42 +10:00
Evgeniy Khramtsov
a6858a6ce4
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-10-24 15:30:37 +10:00
Evgeniy Khramtsov
f4beeb1706
CAPTCHA IBR support (EJAB-1262)
2010-10-24 15:30:16 +10:00
Christophe Romain
011464e6ac
improve documentation (thanks to Karim Gemayel)
2010-10-21 11:14:24 +02:00
Peter Lemenkov
c53e8012b2
Change directory before any operation to one readable by INSTALLUSER (EJAB-1322)
...
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686 :
https://bugzilla.redhat.com/564686
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-10-19 01:05:31 +02:00
Badlop
fe04d57284
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:26:36 +02:00
Christophe Romain
0f3bd782c4
documentation update (thanks to Karim Gemayel)
2010-10-18 16:53:21 +02:00
Badlop
91cf9194d8
When privacy list denies local user's outgoing stanza, try to return error (EJAB-1320)
...
See:
http://xmpp.org/extensions/xep-0016.html#example-51
Example 51. Error: contact is blocked
2010-10-16 22:53:12 +02:00
Badlop
e2dbad6242
Check privacy of outgoing IQ stanzas (EJAB-1320)
2010-10-16 22:53:10 +02:00
Badlop
84d4a1619b
Check privacy of incoming IQ stanzas (EJAB-1320)
2010-10-16 22:53:08 +02:00
Badlop
16fae4d117
Add support to ejabberd_ctl to handle anonymous command arguments
2010-10-15 21:53:03 +02:00
Badlop
76f7548935
Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler)
...
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.
Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
2010-10-15 16:29:47 +02:00
Badlop
2d08dcf11a
Fix errors detected by Dialyzer
2010-10-15 13:17:32 +02:00
Badlop
7af47b9dbe
Document ejabberd_loglevel using EDoc (EJAB-225)
2010-10-15 13:17:19 +02:00
Andreas Köhler
437da38342
Fix unused variable warning in ejabberd_loglevel
2010-10-15 13:15:52 +02:00
Andreas Köhler
801ee586b7
Add set_custom/2, clear_custom/0 and clear_custom/1 to ejabberd_loglevel
2010-10-15 13:15:50 +02:00
Andreas Köhler
cfca2b502a
Add support for changing the loglevels for given modules (EJAB-225)
...
ejabberd_loglevel:set/1 now understands more input formats:
set(Param) -> {module, ejabberd_logger}
Param = Level | {Level, CustomLevels}
CustomLevels = [CustomLevel]
CustomLevel = {Module, Level}
Module = atom()
Level = integer() | atom()
set(Level) is equivalent to set({Level, []}), so it clears all module
level customizations. log_src/2 adds additional function heads for those
_msg function and module combinations that need non-default behavior,
i.e. add or filter logging.
ejabberd_loglevel:get/0 only returns the default log level. To retrieve
the complete setting use ejabberd_logger:get/0 instead.
2010-10-15 13:15:48 +02:00
Andreas Köhler
e1a4ae8264
Use warning_msg event type for warning log level.
2010-10-15 13:15:46 +02:00
Andreas Köhler
19826858a4
Add warning message and report handlers to ejabberd_logger_h.erl.
2010-10-15 13:15:45 +02:00
Andreas Köhler
0c2677bc50
Improve ejabberd_logger code generation
...
Split the monolithic function ejabberd_loglevel:ejabberd_logger_src/1
into separate functions returning deep lists.
log_src/2 now returns the code for any of *_msg/4. Its parameters are
the current loglevel (integer()) and a loglevel specification
(#loglevel{}), with added information in #loglevel:
- function: The api function enabled by this level, may be no_log
- event_type: The type of the event sent to the error_logger
- msg_prefix: One character used in the message (one of "DIWEC")
If the current loglevel is too low for logging, the api function is
optimized at compile time.
2010-10-15 13:15:44 +02:00
Andreas Köhler
d1c1902687
Use records for encoding static loglevel information.
2010-10-15 13:15:42 +02:00
Badlop
a5230c46c2
Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319)
...
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
2010-10-14 21:15:40 +02:00
Christophe Romain
a93f4f7750
make http-bind restartable (thanks to Andreas Köhler)(EJAB-1318)
2010-10-13 10:54:12 +02:00
Evgeniy Khramtsov
ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
50b747041f
use one_queue IQ discipline by default
2010-10-05 21:28:45 +10:00
Evgeniy Khramtsov
36df8c9035
implement lifetime for broken hashes
2010-10-05 21:27:28 +10:00
Evgeniy Khramtsov
58a5ed9cdc
change caps hook name
2010-10-03 16:04:29 +10:00
Evgeniy Khramtsov
5ea909885e
call caps hook when caps is changed
2010-10-03 16:02:50 +10:00
Evgeniy Khramtsov
1f2c9b7971
fixes typo in stop_connection/1
2010-09-28 14:20:02 +10:00
Evgeniy Khramtsov
c13940e1de
new CAPS processing
2010-09-28 14:18:57 +10:00
Evgeniy Khramtsov
8e5297f4c3
fixes default value for cache_life_time
2010-09-21 04:31:18 +10:00
Andreas Köhler
3278f019cb
Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.
2010-09-17 18:48:45 +02:00
Andreas Köhler
e2c3925b7d
Discard unmatched INFO messages in ejabberd services.
...
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
2010-09-17 18:48:43 +02:00
Badlop
8a0ccfc401
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:06:13 +02:00
Evgeniy Khramtsov
c29b2fda99
cache lifetime should be converted in microseconds
2010-09-08 02:33:49 +10:00
Evgeniy Khramtsov
c75b7b2b12
Implemented dirty (non-atomic) functions; added copyright notice
2010-08-31 18:06:02 +10:00
Badlop
c754c91ad1
Add IPv6 support to mod_irc (thanks to Matthias Schiffer)(EJAB-1298)
2010-08-30 23:25:02 +02:00
Evgeniy Khramtsov
6952324509
implemented backend-independed key-value cacheing table; applied to mod_caps.erl first
2010-08-30 14:02:47 +10:00
Badlop
d87fff1a4c
Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov)
2010-08-19 17:38:38 +02:00
Evgeniy Khramtsov
3024bb0cbf
fixes ampersand escaping (EJAB-1258)
2010-08-19 16:28:31 +10:00
Evgeniy Khramtsov
f8dd973373
fixes typo for table copy
2010-08-10 19:42:22 +10:00
Badlop
972440c2ca
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 20:48:36 +02:00
Badlop
b14899d41a
Update the 'configure' script
2010-08-07 19:42:56 +02:00
Evgeniy Khramtsov
d2d8a09b4a
Make MD2 autodetected (EJAB-1285)
2010-08-07 22:04:57 +10:00
Evgeniy Khramtsov
1ea09b09a2
Make xml.c correctly compiles on R14A (EJAB-1288)
2010-08-07 21:06:50 +10:00
Badlop
071c0a1afe
Go back to the 2.1.x branch name
2010-08-05 20:39:55 +02:00
Badlop
4ed00c3d1f
Fix detection of Erlang R11 and older (thanks to Mathias Ertl)(EJAB-1287)
2010-08-05 20:27:12 +02:00
Evgeniy Khramtsov
c9ff370278
Loading ASN.1 driver explicitly to avoid races in LDAP (EJAB-1284)
2010-08-04 19:23:52 +10:00
Badlop
8ab8da82c4
Update ejabberd version number to 2.1.5
2010-08-02 17:38:36 +02:00
Christophe Romain
8a251ccafe
enforce disco features results (thanks to Karim)(EJAB-1033, EJAB-1228, EJAB-1238)
2010-08-02 17:07:23 +02:00
Badlop
550363cd52
Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280)
2010-07-30 20:33:03 +02:00
Badlop
367353100b
Don't say v1.2, because that number is never increased and is confusing
2010-07-28 19:59:39 +02:00
Badlop
5113d28bb4
Return Registered element when account exists (thanks to PioneerMike)
2010-07-28 19:32:42 +02:00
Badlop
c8df607173
Fix typo (thanks to Evgeniy Khramtsov)
2010-07-23 00:38:15 +02:00
Badlop
c8033833f9
When logging s2s out connection attempt or success, log if TLS is used
2010-07-23 00:25:43 +02:00
Badlop
cf4f0dbe6d
The command Update now returns meaningful message and exit-status (EJAB-1237)
2010-07-22 16:32:55 +02:00
Evgeniy Khramtsov
8c4884d665
Use driver allocators in iconv_erl.c for reflecting memory in erlang:memory(system)
2010-07-20 15:28:22 +10:00
Evgeniy Khramtsov
26f6eebaa9
Use driver allocators in ejabberd_zlib_drv.c for reflecting memory in erlang:memory(system)
2010-07-20 14:57:23 +10:00
Evgeniy Khramtsov
5030f35558
correct handling of SQL boolean types (EJAB-1275)
2010-07-14 21:23:21 +10:00
Evgeniy Khramtsov
d7930d7f82
Use driver allocators in expat for reflecting memory in erlang:memory(system)
2010-07-14 14:19:16 +10:00
Badlop
42ddc297fe
Fix my flock change from last friday
2010-07-12 18:53:16 +02:00
Badlop
e82db8cc7f
Remove ejabberd_debug because p1_prof provides similar and better features
2010-07-12 16:02:52 +02:00
Badlop
10d43c7cc6
Only compile and install p1_prof when: make debugtools=true
2010-07-12 16:02:41 +02:00
Badlop
d539fd28c1
Recompile the 'configure' script
2010-07-12 15:18:15 +02:00
Badlop
12e00c57f9
When using OTP R14, use public_key library instead of old ssl (EJAB-953)
2010-07-12 13:57:07 +02:00
Badlop
d106f741d9
Some systems delete the lock dir; in such case don't use flock at all
2010-07-09 22:39:13 +02:00
Evgeniy Khramtsov
6c96157d1b
Added functions to collect statistics about queues, memory, reductions etc. Several cleanups
2010-07-10 01:36:12 +10:00
Evgeniy Khramtsov
a42a012f94
Added new ejabberd profiler
2010-07-05 13:43:44 +10:00
Badlop
7e90d6cf92
Fix print of command result that contains ~ (thanks to Tsukasa Hamano)
2010-07-03 00:42:54 +02:00
Badlop
e19ac27803
Show some more room options in the log file
2010-07-02 15:19:54 +02:00
Evgeniy Khramtsov
4c2e7e38a1
Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 (Thanks to Alexey Shchepin)
2010-07-02 20:31:42 +10:00
Badlop
fa22b23435
Recompile the Guide and Configure
2010-07-01 17:03:36 +02:00
Badlop
ae6545989e
Fix typo in --enable-transient_supervisors
2010-07-01 16:59:26 +02:00
Badlop
0ac5684bf0
Clarify that to use the optional --enable-nif, R13B04 is needed.
2010-07-01 16:51:26 +02:00
Evgeniy Khramtsov
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
Badlop
d9e2931ed9
Fix privacy check when serving local Last (thanks to Brian Acton)(EJAB-1271)
2010-06-29 11:58:05 +02:00
Badlop
1531541331
Fix problem when FIREWALL_WINDOW options for erl kernel were used
...
http://www.ejabberd.im/node/4120
2010-06-28 13:17:55 +02:00
Badlop
b7e02cc42e
Inform client that SSL session caching is disabled (thanks to Pawel Chmielowski)
2010-06-25 18:33:49 +02:00
Badlop
3ab90c9d3a
Don't ask for client certificate when using tls (EJAB-1267)
2010-06-25 18:33:46 +02:00
Badlop
fe23dbd76e
When account is deleted, delete also member of stored shared rosters.
2010-06-24 00:02:16 +02:00
Evgeniy Khramtsov
21d2f4efab
now admins are able to see private rooms in disco (EJAB-1269)
2010-06-23 17:44:35 +10:00
Evgeniy Khramtsov
f66f049ef3
Added support for all hash functions required by XEP-0115
2010-06-22 03:10:41 +10:00
Evgeniy Khramtsov
49dd83e731
Added md2/1 support
2010-06-22 02:56:34 +10:00
Evgeniy Khramtsov
9cd2d5e0cf
New OpenSSL functions wrapper: sha224/1, sha256/1, sha384/1, sha512/1
2010-06-22 02:30:16 +10:00
Badlop
fab705dc13
Rebuilt the configure script with: autoconf
2010-06-16 16:05:45 +02:00
Peter Lemenkov
a84f8bc9ef
Pass correct version to autoreconf
...
It seems that AC_INIT macro is wrongly initialized. See this link
for explanation of a particular AC_INIT variables:
http://www.gnu.org/software/autoconf/manual/html_node/Initializing-configure.html
Briefly, AC_INIT macro should be populated with the following data:
AC_INIT (package, version, [bug-report], [tarname], [url])
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
2477b735bf
Install COPYING file along with other docs
...
It's a generally good idea to provide file with licensing terms.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Peter Lemenkov
8db328af60
Install dev.html, and guide.pdf if it exists
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-06-16 16:05:07 +02:00
Badlop
a28aaa1fdd
Log error when HTTP request has ambiguous Host header (EJAB-1261)
2010-06-16 11:33:17 +02:00
Badlop
afa0f4d403
Fix for Erlang R12, that doesn't support: true andalso ok
2010-06-15 22:59:53 +02:00
Jerome Sautret
0e5b930b22
Discard queued requests that are too old (the caller has already got a timeout).
2010-06-11 16:35:45 +02:00
Badlop
a7924adee9
Fix typo in update_list command (EJAB-1237)
2010-06-07 15:58:16 +02:00
Badlop
d4ec7a2f01
New optional BOSH connection attribute process-delay (EJAB-1257)
2010-06-07 13:44:55 +02:00
Badlop
e0fab19345
Revert version number from 2.1.4 tag to 2.1.x branch
2010-06-04 11:26:42 +02:00
Evgeniy Khramtsov
4646a5dbb8
fixes wrong SQL escaping when --enable-full-xml is set
2010-06-04 13:31:34 +10:00
Badlop
1567592ac7
Update ejabberd version number to 2.1.4
2010-06-02 18:48:55 +02:00
Christophe Romain
c544384c83
sync last changes in pubsub_odbc patch
2010-06-02 16:46:02 +02:00
Christophe Romain
d56522c8a0
final fix on created node notification (EJAB-1225)
2010-06-02 14:37:18 +02:00
Badlop
b83e77ca21
Update the Norwegian translation (thanks to Stian B. Barmen)
2010-06-01 19:44:27 +02:00
Badlop
ba9247c530
Update the Slovak translation (thanks to Marek Bečka)
2010-05-31 00:27:58 +02:00
Badlop
91d22109c8
Update the Czech translation (thanks to Lukáš Polívka)
2010-05-28 18:46:08 +02:00
Badlop
cb702a770d
Update the Russian translation (thanks to Evgeniy Khramtsov)
2010-05-28 18:46:06 +02:00
Christophe Romain
db059bdfaf
fix error code when unsubscribing from a non-existent ODBC node (EJAB-1227)
2010-05-28 13:42:35 +02:00
Christophe Romain
2291a6afea
fix error code when unsubscribing from a non-existent node (thanks to Karim Gemayel)(EJAB-1227)
2010-05-28 13:37:20 +02:00
Christophe Romain
af7fe0c21e
send created node notifications (EJAB-1225)
2010-05-28 13:34:05 +02:00
Christophe Romain
7ce3291603
fix jlib calls from previous patch
2010-05-28 12:33:11 +02:00
Christophe Romain
07e870271e
make last_item_cache feature cluster aware (EJAB-1234)
2010-05-28 11:56:09 +02:00
Badlop
a5f8aeb6da
Handle error response from auth modules (thanks to Eric Liang)
2010-05-28 01:36:19 +02:00
Badlop
1777ecd15a
Makefile with optional ejabberd_debug.erl compilation (EJAB-1242)
...
Only compile and install ejabberd_debug.erl when running:
make ejabberd_debug=true
2010-05-28 00:51:25 +02:00
Christopher tofu Zorn
d4d45f3a50
remove the silly loop that isnt needed, this speeds up all requests by 100 milliseconds. Clean up prepare response function and add two new functions to handle out going payloads based of whether its a new session or not.
2010-05-27 21:21:17 +02:00
Badlop
9900be3d68
Update the Portuguese Brazil translation (thanks to Otávio Fernandes)
2010-05-26 19:53:32 +02:00
Badlop
b88372c313
Update the Ukrainian translation (thanks to Konstantin Khomoutov)
2010-05-26 19:53:29 +02:00
Badlop
e4aab7f749
Add created_at column also to PostgreSQL schema (thanks to Mathias Ertl)(EJAB-1240)
2010-05-26 16:13:45 +02:00
Badlop
42cbd0c1c4
Update the Catalan translation (thanks to Jan Kusanagi)
2010-05-25 20:11:16 +02:00
Badlop
9318678e08
Mix the commands update_all/0 and update_module/1 into update/1 (EJAB-1237)
2010-05-25 20:01:04 +02:00
Badlop
bd992bcb87
Update the Italian translation (thanks to Luca Brivio)
2010-05-25 12:18:16 +02:00
Badlop
01d2bcfd92
Update the Greek translation (thanks to James Iakovos Mandelis)
2010-05-24 20:44:23 +02:00
Badlop
0bfda4e628
New ejabberd commands to update modified modules (EJAB-1237)
2010-05-24 13:58:11 +02:00
Badlop
a2f659a2c6
Only log when script errors are found
2010-05-24 13:58:10 +02:00
Badlop
9a04a60c7d
Update the Polish translation (thanks to Zbyszek Żółkiewski)
2010-05-24 13:34:54 +02:00
Badlop
7238ab6f05
Update the Dutch translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:41 +02:00
Badlop
dd954ef1c2
Update the Esperanto translation (thanks to Andreas van Cranenburgh)
2010-05-24 11:10:30 +02:00
Badlop
f1b8853339
Update the German translation (thanks to Nikolaus Polak)
2010-05-23 16:21:44 +02:00
Badlop
479a2adaae
Recompile Japanese translation
2010-05-23 02:30:30 +02:00
Tsukasa Hamano
dd3c939025
update ja.po
2010-05-23 02:30:21 +02:00
Badlop
767e7d65ef
Update the French translation (thanks to Nicolas Vérité)
2010-05-23 02:29:44 +02:00
Badlop
5feb20afd0
Update the Chinese translation (thanks to Shelley Shyan)
2010-05-23 02:28:57 +02:00
Badlop
9038bbd3e7
Update the Spanish translation
2010-05-23 02:28:26 +02:00
Badlop
506fbbe7f7
Update translations
2010-05-20 21:12:36 +02:00
Christopher tofu Zorn
08f1f55e0c
typo on exported function
2010-05-20 20:45:37 +02:00
Christopher tofu Zorn
5ea9a0ddb7
expose more functions so developers can implement prebinding methods
2010-05-20 20:32:07 +02:00
Christophe Romain
d4e0fab06b
fix EJAB-1233 on pubsub_odbc patch
2010-05-19 11:05:02 +02:00
Christophe Romain
217aaf78f9
prevent orphaned pubsub node (EJAB-1233)
2010-05-19 10:47:47 +02:00
Badlop
2ee788e0bf
Fix English typos
2010-05-17 11:54:22 +02:00
Christophe Romain
f0f4b2719c
sync pubsub_odbc with latest code
2010-05-12 13:54:44 +02:00
Christophe Romain
406a31c8be
Enforce pubsub#show_values subscription option (EJAB-1096)(thanks to Karim Gemayel)
2010-05-12 13:45:56 +02:00
Badlop
c32332898b
Show HTTP auth username and IP address in logs, not the password (EJAB-1231)
2010-05-12 10:27:47 +02:00
Badlop
4bbf6684b4
Don't show HTTP request in logs, because reveals password (EJAB-1231)
2010-05-10 23:23:31 +02:00
Badlop
9476d8a2c3
Optionally cache extauth users in mnesia (EJAB-641)
2010-05-10 16:42:54 +02:00
Badlop
6ac46c6171
Fix EDoc comment
2010-05-10 16:12:48 +02:00
Badlop
6ae8b9c4d6
Use a standard method to get a random seed (EJAB-1229)
2010-05-10 15:38:38 +02:00
Badlop
39119192a1
New option pam_userinfotype to provide username or JID (EJAB-652)
2010-05-10 15:14:49 +02:00
Evgeniy Khramtsov
f58d03c12e
new option ldap_tls_verify is added (EJAB-1229)
2010-05-10 19:37:37 +10:00
Evgeniy Khramtsov
58590cf08d
full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189)
2010-05-08 02:32:57 +10:00
Christopher tofu Zorn
cce57310b0
Change max inactivity from 30 to 120 seconds
2010-05-06 20:52:40 +02:00
Christopher tofu Zorn
516d369174
Use dirty_delete when removing the session.
...
There is no need for a transaction and has less overhead
2010-05-06 20:52:36 +02:00
Christophe Romain
7fc1207661
enforce pubsub#presence_based_delivery (EJAB-1221) (thanks to Karim Gemayel)
2010-05-05 15:42:49 +02:00
Badlop
951808658d
Indicate explicitly what nodes are handled by mod_configure
2010-05-04 11:37:44 +02:00
Badlop
cd9e1621f9
Add xml default content type (thanks to Aaron Winborn)(EJAB-1214)
2010-04-28 20:06:27 +02:00
Badlop
2a99af8cce
Rename some JEP references to XEP
2010-04-28 20:06:27 +02:00