Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-07-14 23:44:18 +02:00
Code Releases Activity
2,551 Commits 7 Branches 107 Tags 60 MiB
0c30b012f7
Commit Graph

2551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Badlop
440eef74e9 Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
Christophe Romain
c849552177 fix add_rosteritem issue (TECH-1181) 2010-10-19 15:19:41 +02:00
Alexey Shchepin
6134c67df4 Merge remote branch '2.2.x/2.2.x' into 2.2.x-applepush 2010-10-19 14:02:14 +03:00
Alexey Shchepin
aa60140ba8 Revert "Merge ApplePush to 2.2.x" 
This reverts commit b8b6fc0da5.

Conflicts:

	src/mod_applepush.erl
	src/mod_applepush_service.erl
 2010-10-19 13:53:10 +03:00
Alexey Shchepin
59135cac6f Revert "ApplePush : previous merge missed timeout handler in c2s." 
This reverts commit 40625b29f2.
 2010-10-19 13:52:46 +03:00
Alexey Shchepin
8d69d4aaba Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test" 
This reverts commit 00d8b2ac30, reversing
changes made to cac23c39c9.
 2010-10-19 13:52:17 +03:00
Alexey Shchepin
426b7ca769 Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x" 
This reverts commit ba326eb976, reversing
changes made to 00d8b2ac30.
 2010-10-19 13:52:09 +03:00
Alexey Shchepin
b61d16dd33 Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x" 
This reverts commit f76dcd0d48, reversing
changes made to 7da8d9e4e3.
 2010-10-19 13:51:44 +03:00
Alexey Shchepin
807af3c08a Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x-applepush 2010-10-19 13:08:46 +03: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
Badlop
d07424365d Fix bug in mod_pubsub in_subscription return value 2010-10-19 00:25:14 +02:00
Badlop
70fe2948b9 Revert "Remove some compiled files" 
That removal was only intended for ejabberd master,
as it requires also changes in gitignore, Makefile.in and aclocal.m4

This reverts commit 179a0cf255.
 2010-10-18 23:17:12 +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
Evgeniy Khramtsov
a5166f3946 copied feature_inspect_packet hook from iphone svn repo 2010-10-15 23:13:29 +10: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
Juan Pablo Carlino
11b00b92e9 merge from Team Leader 2.2 (r973) 2010-10-14 19:00:19 -03: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
Alexey Shchepin
c10e43f95f Improved behaviour on SSL handshake failure 2010-10-14 15:59:23 +03:00
Evgeniy Khramtsov
eeffc77a1a ignore RPC timeout during migration 2010-10-14 20:29:45 +10:00
Evgeniy Khramtsov
254686ab46 fixes timeout calculation 2010-10-14 20:15:53 +10:00
Evgeniy Khramtsov
4a6fc46713 increase rehash timeout to 30 seconds; increase hashing points 2010-10-14 20:02:34 +10:00
Christophe Romain
bde3bce1e7 remove non generic comment 2010-10-13 15:26:38 +02:00
Christophe Romain
f76dcd0d48 Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x 2010-10-13 12:36:04 +02:00
Christophe Romain
7da8d9e4e3 merge resolved against latest 2.1.x 2010-10-13 11:02:22 +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
3a7d02dbd3 fixes anonymous sessions lookup 2010-10-09 00:44:23 +10:00
Evgeniy Khramtsov
350af319bf fixes annoying crash with controller change 2010-10-08 19:26:49 +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
Christophe Romain
f81473fc65 fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
Evgeniy Khramtsov
1f2c9b7971 fixes typo in stop_connection/1 2010-09-28 14:20:02 +10:00