Mickaël Rémond
b8f094b080
* trunk/src/odbc/ejabberd_odbc.erl: Support for nested transaction (EJABS-859) (EJAB-940) (CR-EJAB-10)
...
SVN Revision: 2092
2009-05-21 16:19:33 +00:00
Christophe Romain
dffe808895
PubSub: improve get_entity_* API
...
SVN Revision: 2090
2009-05-19 21:59:15 +00:00
Badlop
b5964c2a5f
Added API function to get current S2S connections with information
...
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)
SVN Revision: 2088
2009-05-19 09:38:17 +00:00
Evgeniy Khramtsov
5f67072e06
* src/eldap/eldap.erl: log warnings on unsuccessful LDAP bind attempts. Increase timeout before the next LDAP bind attempt up to five seconds if the last bind attempt was rejected by the LDAP server ("soft" error). Thanks to Konstantin Khomoutov.
...
SVN Revision: 2086
2009-05-16 13:18:15 +00:00
Badlop
5a68b44be1
New command to convert mnesia nodename, copied from OTP and Debian
...
SVN Revision: 2080
2009-05-15 22:38:46 +00:00
Badlop
dfc97beaef
Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan)
...
SVN Revision: 2079
2009-05-15 22:10:53 +00:00
Badlop
4c1eefb791
The --node argument overwrites the value of ejabberdctl.cfg
...
SVN Revision: 2078
2009-05-15 22:08:00 +00:00
Badlop
e3eac4f00d
No longer edit ChangeLog, will be auto generated for ejabberd releases.
...
Added new call 'make changelog' which generates a ChangeLog file by
prepending to the old file obtained from SVN the new lines obtained
from SVN Log and formatted with svn2cl.
ChangeLog will be generated and included in ejabberd releases.
SVN Revision: 2076
2009-05-14 21:12:12 +00:00
Christophe Romain
257efddd1b
Fix bad transaction returncode in unsubscribe presence handler
...
SVN Revision: 2073
2009-05-12 20:57:38 +00:00
Christophe Romain
20088d8a92
Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934)
...
SVN Revision: 2071
2009-05-11 17:16:25 +00:00
Mickaël Rémond
077b9cd4db
* src/ejabberd_debug.erl: Handled fprof based profiling (EJABS-872).
...
* src/ejabberd_app.erl: Likewise.
SVN Revision: 2070
2009-05-11 16:48:56 +00:00
Christophe Romain
7e370d0201
handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr
...
SVN Revision: 2068
2009-05-08 01:18:02 +00:00
Christophe Romain
90263cf0e7
Allow to get subscriptions on a given node (EJAB-712), and presence based fixes
...
SVN Revision: 2066
2009-05-07 23:35:59 +00:00
Badlop
18af5f8675
Merge misplaced 2055 2058 and 2062 from ejabberd-2.0.4.
...
* src/ejabberd_app.erl: Better support for profiling.
* src/ejabberd.erl: Likewise
* src/ejabberd_ctl.erl: Likewise
* src/ejabberd_debug.erl: Likewise
SVN Revision: 2063
2009-05-07 22:46:51 +00:00
Christophe Romain
3d766c1cb5
several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871
...
SVN Revision: 2059
2009-05-07 00:09:02 +00:00
Badlop
fec3742aaa
Replace TYPE/1 with is_TYPE/1 (EJAB-922)
...
SVN Revision: 2057
2009-05-06 16:54:43 +00:00
Badlop
90abb578e6
* src/Makefile.in: Prevent Erlang R13B compilation warning:
...
behaviour X undefined (EJAB-920)
SVN Revision: 2056
2009-05-06 15:15:09 +00:00
Badlop
dff6e28b2d
* src/ejabberd_loglevel.erl: Use dynamic_compile instead of
...
ram_file_io_server. Support definition of loglevels with integer
or atom. (thanks to Geoff Cant)(EJAB-919)
* src/dynamic_compile.erl: Added erlang module that converts
string to binary loadable code by Mats Cronqvist, Chris Newcombe,
and Jacob Vorreuter.
* src/ram_file_io_server.erl: Remove file not longer useful.
* src/ejabberd.app: Likewise
SVN Revision: 2054
2009-05-06 14:51:51 +00:00
Badlop
9b370787c2
* src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899)
...
SVN Revision: 2053
2009-05-03 11:26:18 +00:00
Christophe Romain
a4b715516e
typo fix
...
SVN Revision: 2051
2009-04-30 21:36:33 +00:00
Christophe Romain
0ed0c45aba
mod_caps: reduce memory and remove mnesia lock
...
SVN Revision: 2050
2009-04-30 21:09:45 +00:00
Christophe Romain
f8780bc6ee
PubSub/PEP API change for major optimization
...
SVN Revision: 2048
2009-04-30 05:18:06 +00:00
Badlop
b2659e4a6f
* src/ejabberd_hooks.erl: Support distributed hooks (EJAB-829)
...
SVN Revision: 2047
2009-04-28 14:57:16 +00:00
Badlop
e45e486fd2
* src/xml.erl: More verbose error reporting for
...
element_to_string (thanks to Magnus Henoch)(EJAB-301)
SVN Revision: 2045
2009-04-27 21:36:41 +00:00
Badlop
7c4e7dea4b
* src/translate.erl: Support additional files (EJAB-925)
...
* contrib/extract_translations/extract_translations.erl: Likewise
* contrib/extract_translations/prepare-translation.sh: Likewise
SVN Revision: 2044
2009-04-27 20:55:35 +00:00
Badlop
709a536fb7
* src/win32_dns.erl: Fix problem parsing some win32 dns (EJAB-927)
...
SVN Revision: 2043
2009-04-27 20:36:19 +00:00
Badlop
cabf128bbb
* src/cyrsasl_digest.erl: Fix auth verification (EJAB-863)
...
SVN Revision: 2042
2009-04-27 20:24:21 +00:00
Badlop
e1fd7c444e
* src/jlib.erl: Fix recursive call to speedup base64
...
decoding (thanks to Jeffrey Rogiers)(EJAB-333)
SVN Revision: 2041
2009-04-27 19:17:17 +00:00
Christophe Romain
fc9ba11afe
minor cosmetic fix
...
SVN Revision: 2040
2009-04-24 21:34:59 +00:00
Christophe Romain
bda111b145
fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction
...
SVN Revision: 2038
2009-04-24 10:27:31 +00:00
Christophe Romain
eab7a509f9
improve send last published items spawning
...
SVN Revision: 2036
2009-04-22 22:19:41 +00:00
Badlop
6acf7fb5ec
* src/ejabberd.cfg.example: Fix English typos. Fix line length:
...
max 80 characters per line. Remove trailing blankspaces. Added
markers for Vim fold, you may want to add to $HOME/.vimrc this
line: set modeline
* src/ejabberdctl.cfg.example: Likewise
SVN Revision: 2035
2009-04-22 13:45:57 +00:00
Badlop
b59ecb83e8
* src/mod_muc/mod_muc.erl: Limit number of characters in Room ID,
...
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 2034
2009-04-22 12:05:10 +00:00
Badlop
aedb847a81
* src/cyrsasl.erl: Change API of check_password: pass a function
...
to generate the digest (thanks to Graham Whitted)(EJAB-863)
* src/cyrsasl_anonymous.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 2033
2009-04-22 11:44:03 +00:00
Badlop
ca8eeaac57
* src/ejabberd_c2s.erl: Fix for SASL Anonymous connections not
...
stored or purged (thanks to Andy Skelton)(EJAB-912)
SVN Revision: 2032
2009-04-22 11:02:03 +00:00
Badlop
d7223ea6ef
* src/mod_shared_roster.erl: Support in API to add 'all' as member
...
of a group (thanks to Martin Langhoff)(EJAB-916)
SVN Revision: 2031
2009-04-22 10:40:11 +00:00
Badlop
8654991333
* src/ejabberd_captcha.erl: If a problem appears while obtaining
...
the image, show error message (EJAB-895)
SVN Revision: 2030
2009-04-22 10:26:19 +00:00
Badlop
a26a7463a0
* src/Makefile.in: Install example script captcha.sh (EJAB-895)
...
SVN Revision: 2029
2009-04-22 10:23:22 +00:00
Badlop
34df1f502c
* src/ejabberd.cfg.example: Add CAPTCHA options (EJAB-895)
...
SVN Revision: 2028
2009-04-22 10:21:55 +00:00
Badlop
d22c483781
* src/ejabberd_ctl.erl: New option to require auth in ejabberdctl
...
and restrict what commands and arguments can execute (EJAB-910)
* src/ejabberd_config.erl: Likewise
SVN Revision: 2024
2009-04-17 13:48:59 +00:00
Badlop
5db572171b
* src/ejabberd_commands.erl: API to restrict who can execute what
...
commands and arguments (EJAB-910)
SVN Revision: 2023
2009-04-17 13:43:15 +00:00
Badlop
1dad64a1cc
* src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was
...
done previously (thanks to Konstantin Khomoutov)(EJAB-850)
SVN Revision: 2020
2009-04-14 18:25:58 +00:00
Christophe Romain
0770e0eee4
after check, last commit was useless
...
SVN Revision: 2019
2009-04-14 12:46:55 +00:00
Christophe Romain
e740cfcc47
minor change, back to original patch
...
SVN Revision: 2017
2009-04-14 09:48:34 +00:00
Christophe Romain
412f65a0cb
minor typo fix
...
SVN Revision: 2016
2009-04-10 21:11:35 +00:00
Christophe Romain
cd6587d9df
minor improvement for best readability
...
SVN Revision: 2014
2009-04-10 08:40:10 +00:00
Christophe Romain
549fa6e836
make sure caps table are clean on startup
...
SVN Revision: 2013
2009-04-10 08:01:08 +00:00
Christophe Romain
409ab48068
better hadling of presence in mod_caps
...
SVN Revision: 2012
2009-04-10 07:36:17 +00:00
Badlop
7d0de522dd
* src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk)
...
SVN Revision: 2011
2009-04-09 11:18:06 +00:00
Badlop
b326b7eb74
* src/mod_pubsub/mod_pubsub.erl: Announce PubSub features in the
...
server JID only if PEP is enabled (EJAB-905)
SVN Revision: 2010
2009-04-08 19:30:24 +00:00
Badlop
f4c88768da
* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)
...
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 2009
2009-04-08 19:04:13 +00:00
Badlop
4dd21545a0
* src/ejabberd_frontend_socket.erl: Fix compilation warnings and
...
add TODO comments.
SVN Revision: 2007
2009-04-08 18:56:11 +00:00
Badlop
7c415f3fdf
* src/mod_irc/mod_irc_connection.erl: Fix compilation warnings.
...
SVN Revision: 2006
2009-04-08 18:52:52 +00:00
Christophe Romain
5a6f837800
pubsub: prevent blocking when sending lots of items, send last items to connected resource only, and cosmetic changes
...
SVN Revision: 2005
2009-04-08 15:53:46 +00:00
Evgeniy Khramtsov
f80c848692
* src/ejabberd_captcha.erl: fixed compilation warnings.
...
SVN Revision: 2004
2009-04-08 12:05:03 +00:00
Badlop
46efb20947
* src/ejabberd_captcha.erl: Small code reorganization; export new
...
functions build_captcha_html/2 and check_captcha/2
SVN Revision: 2001
2009-03-30 11:55:31 +00:00
Badlop
a93a3370ef
* src/ejabberd_sm.erl: Partially retract SVN r1976
...
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1998
2009-03-24 16:22:33 +00:00
Christophe Romain
bc39341633
implement roster acces model (EJAB-780)
...
SVN Revision: 1997
2009-03-20 00:08:38 +00:00
Christophe Romain
1ac385f499
Allow more environment variable overrides in ejabberdctl (EJAB-891)
...
SVN Revision: 1995
2009-03-19 21:28:34 +00:00
Evgeniy Khramtsov
b789ee630d
* src/ejabberd_captcha.erl: moved all functions from ejabberd_captcha process. Use mnesia:transaction/1 where it is needed.
...
SVN Revision: 1994
2009-03-14 06:27:05 +00:00
Evgeniy Khramtsov
3834bcc07e
* src/ejabberd_captcha.erl: fixes previous commit
...
SVN Revision: 1992
2009-03-13 16:02:59 +00:00
Evgeniy Khramtsov
7e924341e4
* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
...
* src/ejabberd_config.erl: likewise.
* src/ejabberd_sup.erl: likewise.
* src/jlib.hrl: likewise.
* src/web/ejabberd_http.erl: likewise.
* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
* src/mod_muc/mod_muc_room.hrl: likewise.
SVN Revision: 1991
2009-03-13 16:01:46 +00:00
Badlop
f214b8c528
Fix mistake when calling win32_dns.
...
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
Badlop
d4b5e94635
* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
...
after timeout (thanks to Alexey Shchepin)(EJAB-880)
SVN Revision: 1986
2009-03-10 15:21:36 +00:00
Christophe Romain
064d1af5de
typo fix on roster access_model
...
SVN Revision: 1984
2009-03-10 12:08:41 +00:00
Christophe Romain
51faa601fa
Fix PEP with other domains and s2s (EJAB-825)
...
SVN Revision: 1980
2009-03-10 10:35:57 +00:00
Badlop
d28efabb79
* src/tls/tls_drv.c: Fix to support OpenSSL older than
...
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise
SVN Revision: 1979
2009-03-09 19:17:53 +00:00
Badlop
ad7bca0e78
* src/Makefile.in: In SunOS, use different C flags (thanks to
...
Thomas)(EJAB-438)
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 1977
2009-03-07 09:52:26 +00:00
Badlop
787d225f1e
* src/ejabberd_c2s.erl: Enforce privacy rules also for
...
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise
SVN Revision: 1976
2009-03-07 08:59:26 +00:00
Evgeniy Khramtsov
06eb54fef8
* src/ejabberd_hooks.erl: fixed typo
...
SVN Revision: 1970
2009-03-06 10:03:29 +00:00
Evgeniy Khramtsov
0e8f56f0b3
* src/ejabberd_hooks.erl: anonymous functions support.
...
SVN Revision: 1969
2009-03-06 09:34:13 +00:00
Badlop
f826dc2f9f
* src/ejabberd_app.erl: In a Windows machine, explicitly add the
...
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)
SVN Revision: 1968
2009-03-05 20:03:18 +00:00
Badlop
ea715129e9
* src/ejabberd_auth.erl: If anonymous auth is enabled, when
...
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
SVN Revision: 1966
2009-03-04 18:34:02 +00:00
Christophe Romain
b3c39d120f
Allow node creation without configure item
...
SVN Revision: 1963
2009-03-04 01:12:10 +00:00
Christophe Romain
965585eb56
update pubsub version
...
SVN Revision: 1960
2009-03-04 01:04:28 +00:00
Christophe Romain
020d6a46c5
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1956
2009-03-03 22:42:37 +00:00
Badlop
117b67a31c
Fix small compilation error introduced in revision 1923
...
SVN Revision: 1931
2009-02-28 00:01:27 +00:00
Badlop
64f2945892
* src/mod_pubsub/node_default.erl: Fix that non-subscriber could
...
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)
SVN Revision: 1930
2009-02-27 23:56:46 +00:00
Badlop
3a5fb440cc
* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
...
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
SVN Revision: 1926
2009-02-27 15:42:27 +00:00
Evgeniy Khramtsov
b766109f66
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not defined, the module takes an IP address of a local hostname.
...
SVN Revision: 1925
2009-02-27 03:22:40 +00:00
Christophe Romain
67e24366ee
cosmetic changes
...
SVN Revision: 1923
2009-02-27 03:09:00 +00:00
Badlop
fd26056d01
* src/mod_pubsub/mod_pubsub.erl: Fix incorrect implementation of
...
Pubsub payload requirements (thanks to Andy Skelton)(EJAB-823)
SVN Revision: 1921
2009-02-25 21:17:14 +00:00
Badlop
1650a946f2
* src/ejabberd_listener.erl: Fix report message of 'undef' error
...
SVN Revision: 1916
2009-02-24 17:25:40 +00:00
Christophe Romain
04fde3620d
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
...
SVN Revision: 1912
2009-02-23 15:56:19 +00:00
Alexey Shchepin
b6208955f3
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
...
returning 'ebadf'
SVN Revision: 1910
2009-02-23 05:25:10 +00:00
Badlop
e6324f8a02
Fix a minor compilation warning and add EDoc comment
...
SVN Revision: 1907
2009-02-21 11:24:08 +00:00
Badlop
ce03742e1b
* src/ejabberd_listener.erl: When stopping a listener, don't stop
...
the listener supervisor (EJAB-874)
SVN Revision: 1891
2009-02-20 14:51:13 +00:00
Christophe Romain
6e055f60de
fix nodetree plugin resolver
...
SVN Revision: 1889
2009-02-19 11:25:56 +00:00
Badlop
74763be4dd
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1884
2009-02-17 15:42:22 +00:00
Badlop
e4a3cdb486
* src/ejabberd_listener.erl: More error detections
...
SVN Revision: 1883
2009-02-17 09:53:29 +00:00
Badlop
4659ae7683
* src/ejabberd_config.erl: Check certfiles are readable on server
...
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise
SVN Revision: 1882
2009-02-16 17:57:30 +00:00
Badlop
b0cc0cdcf9
* src/mod_privacy.erl: Privacy List: deny presence-out all + send
...
presence to: presence is sent (EJAB-255)
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1881
2009-02-16 16:24:08 +00:00
Badlop
22d87353be
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
...
must provide the password, like other participants (EJAB-867)
SVN Revision: 1880
2009-02-16 15:57:02 +00:00
Badlop
f6ddd8bc5b
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
...
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1879
2009-02-16 15:32:54 +00:00
Badlop
2bd54854ec
* src/mod_muc/mod_muc.erl: Export function to create MUC
...
room (thanks to Eric Cestari) (EJAB-729)
SVN Revision: 1878
2009-02-16 15:24:40 +00:00
Badlop
b0e749eca5
* src/mod_roster.erl: When account is deleted, cancel presence
...
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1877
2009-02-16 14:49:20 +00:00
Badlop
d0f1300a84
* src/web/ejabberd_http_poll.erl: Allow configuration of session
...
timeout, using new global option http_poll_timeout (EJAB-135)
* doc/guide.tex: Document new option
* doc/guide.html: Likewise
SVN Revision: 1876
2009-02-14 09:03:26 +00:00
Badlop
70e431787e
* src/ejabberd_listener.erl: Report error at startup if a listener
...
module isn't available or is not an ejabberd listener (EJAB-868)
SVN Revision: 1875
2009-02-13 23:52:24 +00:00
Badlop
d0fc8fe056
* src/mod_shared_roster.erl: Fix bug: a pending subscription
...
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)
SVN Revision: 1874
2009-02-13 23:01:41 +00:00
Badlop
a06bffa413
* src/web/ejabberd_web_admin.erl: Show big integers with comma
...
separators for easy reading
SVN Revision: 1873
2009-02-13 22:13:34 +00:00
