Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity
1,724 Commits 7 Branches 109 Tags 66 MiB
663e29af89
Commit Graph

1476 Commits

Author SHA1 Message Date
Badlop
77a62670d3 Add permanent section about mod_http_fileserver to the Guide. Example config. 
SVN Revision: 2197
 2009-06-16 13:53:25 +00:00
Badlop
8e8b78a4c3 Add forgotten copyright and license notices. 
SVN Revision: 2196
 2009-06-16 13:53:18 +00:00
Badlop
249ee4b318 New option directory_indices, and improve logging (thanks to Brian Cully)(EJAB-932) 
SVN Revision: 2195
 2009-06-16 13:53:13 +00:00
Badlop
226bcd1360 Fix capitalization of HTTP headers (thanks to Brian Cully)(EJAB-892) 
SVN Revision: 2194
 2009-06-16 13:53:07 +00:00
Badlop
4956ed11f4 Converted to gen_server behaviour (EJAB-561). Use the general reopen_log_hook instead of ejabberdctl command. 
SVN Revision: 2193
 2009-06-16 13:53:02 +00:00
Badlop
b44a3c7650 Fix ip source to comply with new ip storage into ejabberd_http (thanks to Christophe Romain) 
SVN Revision: 2192
 2009-06-16 13:52:57 +00:00
Badlop
fa83147926 Use httpd_util:to_lower when not compiling with Erlang R12 (EJAB-628) 
SVN Revision: 2191
 2009-06-16 13:52:52 +00:00
Badlop
14afea1a20 Added JavaScript content type 
SVN Revision: 2190
 2009-06-16 13:52:47 +00:00
Badlop
4fdc4a2e06 Include Last-Modified HTTP header in responses to allow caching (EJAB-546) in mod_http_fileserver and mod_muc_log_http. 
SVN Revision: 2189
 2009-06-16 13:52:42 +00:00
Badlop
0864e8a24f Fix error creating ETS table if enabled in several vhosts (EJAB-551). Unregister the command when stopping the module. 
SVN Revision: 2188
 2009-06-16 13:52:37 +00:00
Badlop
6af85aea18 Remove Erlang module attribute 'vsn' because it doesn't provide any worth feature, and it difficults hot code update (EJAB-440) 
SVN Revision: 2187
 2009-06-16 13:52:32 +00:00
Badlop
0d4155b902 The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it's recommended to use string:to_lower/1 instead. 
SVN Revision: 2186
 2009-06-16 13:52:28 +00:00
Badlop
91193bf928 Small change in accesslog file format; fix bug when accesslog conf parameter wasn't present in the conf file (thanks to Jerome Sautret) 
SVN Revision: 2185
 2009-06-16 13:52:17 +00:00
Badlop
b57248e822 Added accesslog parameter to record requests log in a file similar to Apache (thanks to Jerome Sautret) 
SVN Revision: 2184
 2009-06-16 13:52:12 +00:00
Badlop
487b80b9b0 Initial commit of mod_http_fileserver (thanks to Massimiliano Mirra) 
SVN Revision: 2183
 2009-06-16 13:52:07 +00:00
Badlop
818a70bdd7 Do not include mod_irc, it can be found in ejabberd-modules SVN. Iconv not required. (EJAB-954) 
SVN Revision: 2167
 2009-06-16 11:27:33 +00:00
Mickaël Rémond
940f5be35e Fix syntax error in config file 
SVN Revision: 2166
 2009-06-16 00:49:09 +00:00
Badlop
88fd7b226a Add option to restrict max offline messages by Access and ACL (EJAB-951) 
New option for mod_offline: access_max_user_messages.
The old option user_max_messages is no longer supported.

SVN Revision: 2163
 2009-06-15 17:44:04 +00:00
Badlop
2f6cea2be3 Fix warning about a case already covered. 
SVN Revision: 2161
 2009-06-15 17:27:11 +00:00
Badlop
b4a1b4c8fb Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2160
 2009-06-15 17:27:06 +00:00
Badlop
2f3963417f Prevent process crash if the IP and port of a connection is unknown. 
SVN Revision: 2156
 2009-06-11 18:57:03 +00:00
Badlop
8de03275c3 When client is closed, include the Reason in the stream trailer stanza. 
SVN Revision: 2154
 2009-06-09 12:10:24 +00:00
Badlop
60f52b2cd8 Add forgotten copyright and license notices. Fix blackspaces. 
SVN Revision: 2152
 2009-06-09 10:56:49 +00:00
Badlop
dd101c99e5 Malformed CAPTCHA response may crash a room. This is now fixed. (thanks to Evgeniy Khramtsov) 
SVN Revision: 2150
 2009-06-09 09:39:07 +00:00
Badlop
a45e6da3d0 Remove support of deprecated Disco Publish XEP-0030 (EJAB-904) 
SVN Revision: 2141
 2009-06-02 18:09:01 +00:00
Badlop
2b6f45e4c1 Update some calls from jlib:make_jid to exmpp_jid:make 
SVN Revision: 2139
 2009-06-01 23:44:55 +00:00
Badlop
332de67fe2 Fix some calls to exmpp 
SVN Revision: 2138
 2009-06-01 21:04:16 +00:00
Badlop
ff3fd02115 Fix Access check: the rule can be defined in a vhost or global. 
SVN Revision: 2137
 2009-06-01 21:04:11 +00:00
Karim Gemayel
437c9d07f5 API renaming : bare_jid_to_binary -> bare_to_binary 
SVN Revision: 2135
 2009-06-01 17:00:44 +00:00
Karim Gemayel
9abe47f350 API renaming : jid_to_binary -> to_binary 
SVN Revision: 2134
 2009-06-01 16:59:08 +00:00
Karim Gemayel
7a884ced32 API renaming : bare_jid_to_list -> bare_to_list 
SVN Revision: 2133
 2009-06-01 16:54:33 +00:00
Karim Gemayel
0ace8bda8c API renaming : prepd_jid_to_list -> prep_to_list 
SVN Revision: 2132
 2009-06-01 16:53:48 +00:00
Karim Gemayel
15bc238297 API renaming : jid_to_list -> to_list 
SVN Revision: 2131
 2009-06-01 16:52:14 +00:00
Karim Gemayel
1b94c7a8b3 API renaming : compare_bare_jids -> bare_compare 
SVN Revision: 2130
 2009-06-01 16:50:36 +00:00
Karim Gemayel
c31f99937f API renaming : compare_jids -> compare 
SVN Revision: 2129
 2009-06-01 16:49:00 +00:00
Karim Gemayel
4258b99b2b API renaming : lresource_as_list -> prep_resource_as_list 
SVN Revision: 2128
 2009-06-01 16:43:15 +00:00
Karim Gemayel
29c0e17ca2 API renaming : lresource -> prep_resource 
SVN Revision: 2127
 2009-06-01 16:42:07 +00:00
Karim Gemayel
d51d9e9fff API renaming : lnode_as_list -> prep_node_as_list 
SVN Revision: 2126
 2009-06-01 16:40:51 +00:00
Karim Gemayel
d5f2c41f26 API renaming : lnode -> prep_node 
SVN Revision: 2125
 2009-06-01 16:39:36 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
19d7d79229 API renaming : ldomain -> prep_domain 
SVN Revision: 2123
 2009-06-01 16:37:15 +00:00
Karim Gemayel
526dc54173 API renaming : parse_jid -> parse 
SVN Revision: 2122
 2009-06-01 16:35:55 +00:00
Karim Gemayel
a136192db2 API renaming : bare_jid_to_jid -> full 
SVN Revision: 2121
 2009-06-01 16:34:38 +00:00
Karim Gemayel
5dbc4f9954 API renaming : jid_to_bare_jid > bare 
SVN Revision: 2120
 2009-06-01 16:30:15 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Christophe Romain
7c45f8f053 fix nodetree virtual to allow node subscription 
SVN Revision: 2117
 2009-05-29 00:44:07 +00:00
Christophe Romain
497d4d26bb make flat the default node plugin 
SVN Revision: 2116
 2009-05-29 00:27:26 +00:00
Christophe Romain
db6a8c2e05 fix ets table name change 
SVN Revision: 2115
 2009-05-29 00:13:21 +00:00
Christophe Romain
a16230c9ca pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling 
SVN Revision: 2114
 2009-05-28 23:21:50 +00:00
Badlop
0bbbf468f0 Fix crashes when browsing some WebAdmin pages (EJAB-821) 
SVN Revision: 2111
 2009-05-27 17:29:58 +00:00
Badlop
9bcba6c8b8 Update CSS of WebAdmin menu 
SVN Revision: 2110
 2009-05-27 17:29:50 +00:00
Badlop
a1fe76fb5b Support to select what modules to update. Split large function in smaller ones. 
SVN Revision: 2109
 2009-05-27 17:29:43 +00:00
Pablo Polvorin
dc613df3b1 Do not indent the resulting html. Indentation in exmpp is buggy, and there isn't a real adventage on indenting the generated html 
SVN Revision: 2106
 2009-05-27 15:02:44 +00:00
Christophe Romain
45a8a0fb53 make get_items able to sort items in publish order (EJAB-824) 
SVN Revision: 2105
 2009-05-26 22:50:11 +00:00
Christophe Romain
aa210166c4 improve get_entity_* to work regardless of nodetree (EJAB-937) 
SVN Revision: 2104
 2009-05-26 21:50:13 +00:00
Badlop
43a3fef7bb Document how to setup CAPTCHA. Install example captcha.sh (EJAB-895) 
SVN Revision: 2103
 2009-05-26 17:20:50 +00:00
Badlop
55bebb0f62 Implement XEP-158 CAPTCHA Forms, support in mod_muc, sample script (thanks to Evgeniy Khramtsov)(EJAB-895) 
SVN Revision: 2102
 2009-05-26 17:20:09 +00:00
Badlop
18ae44f930 Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov) 
SVN Revision: 2099
 2009-05-25 17:16:54 +00:00
Badlop
dc3899dfd9 Decrease proxy65 buffer sizes to 8192 bytes. 
The original size of 65535 confused clients with tight
shapers (thanks to Evgeniy Khramtsov)

SVN Revision: 2097
 2009-05-25 11:19:28 +00:00
Mickaël Rémond
b6b4b0cdf9 * trunk/src/odbc/ejabberd_odbc.erl: Fix typo (EJABS-859) (EJAB-940) (CR-EJAB-10) 
* branches/road-to-exmpp/src/odbc/ejabberd_odbc.erl: Likewise.

SVN Revision: 2095
 2009-05-21 16:43:33 +00:00
Mickaël Rémond
8be73967fd * src/odbc/ejabberd_odbc.erl: Support for nested transactions (EJABS-859) (EJAB-940) (CR-EJAB-10) 
SVN Revision: 2094
 2009-05-21 16:28:49 +00:00
Christophe Romain
2e26b6bf8b PubSub: improve get_entity_* API 
SVN Revision: 2091
 2009-05-19 22:29:28 +00:00
Badlop
b473862da6 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: 2089
 2009-05-19 09:39:13 +00:00
Badlop
0a9581a375 LDAP bind attempts: log warnings and increase timeout after reject. 
Merged from trunk SVN r2086:
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: 2087
 2009-05-18 11:41:53 +00:00
Badlop
23509c1688 New command to convert mnesia nodename, copied from OTP and Debian 
SVN Revision: 2084
 2009-05-15 22:56:55 +00:00
Badlop
a63f548528 Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan) 
SVN Revision: 2083
 2009-05-15 22:56:13 +00:00
Badlop
ee8ed2828a The --node argument overwrites the value of ejabberdctl.cfg 
SVN Revision: 2082
 2009-05-15 22:55:29 +00:00
Badlop
35daf5df78 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
Mickaël Rémond
3ca2d4dab3 * src/ejabberd_debug.erl: Handled fprof based profiling (EJABS-872). 
* src/ejabberd_app.erl: Likewise.

SVN Revision: 2075
 2009-05-13 12:36:37 +00:00
Christophe Romain
c12b1870b7 Fix bad transaction returncode in unsubscribe presence handler 
SVN Revision: 2074
 2009-05-12 21:00:05 +00:00
Christophe Romain
fd36726357 Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934) 
SVN Revision: 2072
 2009-05-11 17:27:55 +00:00
Christophe Romain
8dc1bb0659 handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr 
SVN Revision: 2069
 2009-05-08 01:28:17 +00:00
Christophe Romain
38413dc236 Allow to get subscriptions on a given node (EJAB-712), and presence based fixes 
SVN Revision: 2067
 2009-05-08 00:02:08 +00:00
Badlop
ef94ad36cd Merge 2063 from trunk. 
* src/ejabberd_app.erl: Better support for profiling.
* src/ejabberd.erl: Likewise
* src/ejabberd_ctl.erl: Likewise
* src/ejabberd_debug.erl: Likewise

SVN Revision: 2064
 2009-05-07 22:56:23 +00:00
Christophe Romain
e40e4298ca several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871 
SVN Revision: 2061
 2009-05-07 00:54:44 +00:00
Badlop
1d3947c0da Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2057
 2009-05-06 16:54:43 +00:00
Badlop
69349925a3 * 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
921c7ede0d * 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
e202ec009e * 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
ced30acb20 backport pubsub/pep/caps optimizations from trunk 
SVN Revision: 2052
 2009-04-30 23:17:38 +00:00
Badlop
3debaf99d8 * src/ejabberd_hooks.erl: Support distributed hooks (EJAB-829) 
SVN Revision: 2047
 2009-04-28 14:57:16 +00:00
Badlop
2908e5da19 Merge 1969 and 1970 from trunk. 
* src/ejabberd_hooks.erl: anonymous functions support.

SVN Revision: 2046
 2009-04-28 14:46:12 +00:00
Badlop
5afe7cfafb * 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
d7829a76ce * src/win32_dns.erl: Fix problem parsing some win32 dns (EJAB-927) 
SVN Revision: 2043
 2009-04-27 20:36:19 +00:00
Badlop
ec779c001c * src/cyrsasl_digest.erl: Fix auth verification (EJAB-863) 
SVN Revision: 2042
 2009-04-27 20:24:21 +00:00
Badlop
028509c3a9 * 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
fd5e312ed9 minor cosmetic fix 
SVN Revision: 2040
 2009-04-24 21:34:59 +00:00
Christophe Romain
6710d66a58 fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction 
SVN Revision: 2039
 2009-04-24 10:32:41 +00:00
Christophe Romain
1d44abfc8a improve send last published items spawning 
SVN Revision: 2037
 2009-04-22 23:01:51 +00:00
Badlop
0141779b9c * 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
92b1e9d9ac * 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
43b59911e2 * 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
240e37c387 * 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
39f71ab2ab * 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
fd967d6976 * 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
b451f07801 * 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
5ca560d0bd * src/mod_caps.erl: Fix unbound variable 
SVN Revision: 2022
 2009-04-17 13:40:57 +00:00
Badlop
8782597c1a * 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
ab4750ec1e after check, last commit was useless 
SVN Revision: 2019
 2009-04-14 12:46:55 +00:00
Christophe Romain
b519fdd3cb back to original caps patch which may be safer 
SVN Revision: 2018
 2009-04-14 10:13:05 +00:00
Christophe Romain
08cbaf8ccf Better handling of presence hook and caps clean 
SVN Revision: 2015
 2009-04-10 13:21:37 +00:00
Badlop
6b2a838e24 * src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk) 
SVN Revision: 2011
 2009-04-09 11:18:06 +00:00
Badlop
854b448536 * 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
2195e433dc * 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
d13be09524 * src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors. 
SVN Revision: 2008
 2009-04-08 18:58:11 +00:00
Badlop
e34d6e3678 * src/mod_irc/mod_irc_connection.erl: Fix compilation warnings. 
SVN Revision: 2006
 2009-04-08 18:52:52 +00:00
Badlop
61691ac47d Merge 1998 from trunk. 
* 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: 1999
 2009-03-24 18:02:13 +00:00
Christophe Romain
3e756f5d1c implement roster acces model (EJAB-780) 
SVN Revision: 1997
 2009-03-20 00:08:38 +00:00
Christophe Romain
026c4a2711 Allow more environment variable overrides in ejabberdctl (EJAB-891) 
SVN Revision: 1996
 2009-03-19 21:30:10 +00:00
Badlop
cd3556f195 Fix mistake when calling win32_dns. 
SVN Revision: 1990
 2009-03-11 18:36:27 +00:00
Badlop
b245d68568 * 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
2c4effe6ce typo fix on roster access_model 
SVN Revision: 1985
 2009-03-10 12:09:31 +00:00
Christophe Romain
5ed381fc58 Fix PEP with other domains and s2s (EJAB-825) 
SVN Revision: 1982
 2009-03-10 11:13:46 +00:00
Badlop
4c08e65fab * 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
4dde341c9d Merge 1925 from trunk. 
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov)

SVN Revision: 1978
 2009-03-09 14:44:46 +00:00
Badlop
ed3cae6f11 * 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
56c33e994d * 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
Badlop
d6820f2c2d * src/mod_privacy.erl: Temporary workaround to inconsistency 
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1975
 2009-03-07 08:53:34 +00:00
Badlop
cf4b7b36ee Merge 1856 from trunk. 
* src/eldap/eldap.erl: moves waiting for response queries to
pending queue on an LDAP connection failure (thanks to Evgeniy
Khramtsov)

SVN Revision: 1974
 2009-03-06 11:50:23 +00:00
Badlop
d23ebd354b Merge 1855 from trunk. 
* src/eldap/eldap.erl: implemented queue for pending
queries (thanks to Evgeniy Khramtsov)

SVN Revision: 1973
 2009-03-06 11:42:56 +00:00
Badlop
66c60c4e6d Merge 1851 from trunk. 
* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
Evgeniy Khramtsov)

SVN Revision: 1972
 2009-03-06 11:39:12 +00:00
Badlop
19b803bb03 * 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
7982492f50 * 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
Badlop
7af7afc30e * src/mod_caps.erl: Fix two small compilation errors 
SVN Revision: 1965
 2009-03-04 09:55:20 +00:00
Christophe Romain
ab2dc5877f Allow node creation without configure item 
SVN Revision: 1964
 2009-03-04 01:14:13 +00:00
Christophe Romain
592c98fd7a update pubsub version 
SVN Revision: 1961
 2009-03-04 01:04:51 +00:00
Christophe Romain
facf17e689 Add roster subscriptions handling and make PEP events sent to all resources 
SVN Revision: 1958
 2009-03-03 23:26:07 +00:00
Badlop
1db9642e4c Merge 1916 from trunk. 
* src/ejabberd_listener.erl: Fix report message of 'undef' error

SVN Revision: 1955
 2009-03-03 19:48:20 +00:00
Badlop
4df4527e77 Merge 1907 from trunk. 
* src/ejabberd_listener.erl: Fix a minor compilation warning and
add EDoc comment

SVN Revision: 1954
 2009-03-03 19:46:08 +00:00
Badlop
dbf0bb209d Merge 1891 from trunk. 
* src/ejabberd_listener.erl: When stopping a listener, don't stop
the listener supervisor (EJAB-874)

SVN Revision: 1953
 2009-03-03 19:43:55 +00:00
Badlop
9a7c6b8be1 Merge 1884 from trunk. 
* src/ejabberd_listener.erl: More error detections

SVN Revision: 1952
 2009-03-03 19:40:55 +00:00
Badlop
36fc43c364 Merge 1883 from trunk. 
* src/ejabberd_listener.erl: More error detections

SVN Revision: 1951
 2009-03-03 19:39:36 +00:00
Badlop
f80758f0de Merge 1882 from trunk. 
* src/ejabberd_config.erl: Check certfiles are readable on server
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise

SVN Revision: 1950
 2009-03-03 19:38:13 +00:00
Badlop
25ef60a2c1 Merge 1875 from trunk. 
* 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: 1949
 2009-03-03 19:35:32 +00:00
Badlop
5bfdb71b4c Merge 1881 from trunk. 
* 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: 1948
 2009-03-03 19:32:48 +00:00
Badlop
890b1c4f60 Merge 1834 from trunk. 
* src/mod_privacy.erl: Only run roster_get_jid_info if privacy
list has subscription or group (thanks to George Hazan)(EJAB-851).
Sort items in privacy list by order before storing (EJAB-848)
* src/mod_privacy.hrl: Likewise
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1947
 2009-03-03 19:26:24 +00:00
Badlop
4046ecc99e Merge 1880 from trunk. 
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)

SVN Revision: 1946
 2009-03-03 19:07:24 +00:00
Badlop
fe297e1dea Merge 1879 from trunk. 
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850)

SVN Revision: 1945
 2009-03-03 19:03:56 +00:00
Badlop
f0c0b2230a Merge 1878 from trunk. 
* src/mod_muc/mod_muc.erl: Export function to create MUC
room (thanks to Eric Cestari) (EJAB-729)

SVN Revision: 1944
 2009-03-03 19:01:24 +00:00
Badlop
23ec55975e Merge 1877 from trunk. 
* 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: 1943
 2009-03-03 18:57:47 +00:00
Badlop
54da31e805 Merge 1874 from trunk. 
* 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: 1942
 2009-03-03 18:53:28 +00:00
Badlop
b0f29b20db Merge 1876 from trunk. 
* 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: 1941
 2009-03-03 18:49:02 +00:00
Badlop
c13ed8c625 Merge 1872 from trunk. 
* src/ejabberd_system_monitor.erl: Allow parametrizable watchdog
threshold: option watchdog_large_heap or chatting with the
watchdog bot (EJAB-545)
* src/ejabberd_config.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1940
 2009-03-03 18:45:26 +00:00
Badlop
79463d7f7d Merge 1873 from trunk. 
* src/web/ejabberd_web_admin.erl: Show big integers with comma
separators for easy reading

SVN Revision: 1939
 2009-03-03 18:29:53 +00:00
Badlop
77ff657351 Merge 1859 from trunk. 
* src/web/ejabberd_web_admin.erl: Calls to the hook
webadmin_menu_node provide the node as first argument, and calls
to webadmin_menu_hostnode provide both the host and the node. Fix
call to make_menu_items, because webadmin_menu_node was called in
cases where webadmin_menu_hostnode should be called. Align to
right some table elements.

SVN Revision: 1938
 2009-03-03 18:24:42 +00:00
Badlop
85412f0a41 Merge from trunk: 1835, 1836, 1842, 1843, 1854, 1858, 1860, 1861, and 1862. 
* doc/Makefile: In Clean do not remove html. In new Distclean,
remove also html.

* doc/Makefile: When cleaning, remove contributed_modules.tex

* src/Makefile.in: Fix arguments to Install program

* doc/guide.tex: Provide only an example of language option
* doc/guide.html: Likewise

* doc/guide.tex: mod_muc can run in several nodes of cluster
* doc/guide.html: Likewise

* doc/api/process-one.css: Add some style to HTML elements

* src/ejabberd_listener.erl: Fix EDoc errors
* src/web/ejabberd_web_admin.erl: Likewise

* src/ejabberd_hooks.erl: Explanation in EDoc of some functions

* doc/guide.tex: Explain that account creation is only supported
by internal and odbc authentication methods
* doc/guide.html: Likewise

* src/Makefile.in: The path to the installed copy of ejabberd
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1937
 2009-03-03 18:11:23 +00:00
Pablo Polvorin
54a6992ae0 Serialize s2s stanzas to iolist() rather than list() 
SVN Revision: 1936
 2009-03-02 15:48:01 +00:00
Pablo Polvorin
2c35514537 Correct include declaration (thanks to badlop). Bug was introduced in r1863 
SVN Revision: 1935
 2009-03-02 13:27:35 +00:00
Pablo Polvorin
7fea7b30b2 Elements and namespace for (XEP-0039) aren't know by exmpp ("http://jabber.org/protocol/stats" is represented as a list()) 
SVN Revision: 1934
 2009-03-01 20:48:43 +00:00
Pablo Polvorin
f0d55c9a3f Fix bug when clients connect using legacy ssl 
(ejabberd_receiver:process_data/2 was called before initializing  the xmlstream).

SVN Revision: 1933
 2009-03-01 20:18:42 +00:00