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
Badlop
75298b4c27
Improve example of outoging_s2s_options
2010-10-22 23:14:24 +02: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
6ff3fda14b
Document new loglevel configuration form.
2010-10-15 13:15:49 +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
Badlop
95ce77f80d
Include a gitignore file in the ejabberd git repository (EJAB-1312)
2010-10-14 19:53:31 +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
4b5ef8f2ce
Add mod_pubsub_odbc to list of ODBC modules (EJAB-1293)
2010-08-21 18:56:01 +02: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