75d8d8a43e
Fix minor typo in log message
2010-08-06 11:08:19 +02:00
fa9b8d63f9
Ensure the default virtual host "localhost" is defined and is the first
2010-08-05 22:19:41 +02:00
58bed2cbff
Fix core files
2010-07-23 00:30:31 +02:00
cdb379a22c
Patch core for MH (thanks to Alexey Shchepin and Geoff Cant)
2010-07-23 00:29:28 +02:00
57ffba34c2
New page Miscelanea Options
2010-05-03 13:59:18 +02:00
f70ebd6983
Allow definition of local address for outgoing s2s (EJAB-418)
2010-04-15 01:04:40 +02:00
ebc82f2968
Use alternative of file:read_line/1 to not require R13B02
2010-02-20 19:31:57 +01:00
1bcd481fdc
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2892
2010-01-12 16:15:16 +00:00
8deb2b57af
Improve log message when showing lines of config file.
...
SVN Revision: 2851
2009-12-30 01:39:02 +00:00
1eb2b1f047
If problem in config file starting ejabberd: display config lines and stop node (EJAB-1148)
...
SVN Revision: 2845
2009-12-29 22:49:16 +00:00
036095f37d
New option added: max_fsm_queue. Removed hardcoded FSMLIMITS. (thanks to Evgeniy Khramtsov)
...
Merged from trunk@2645
SVN Revision: 2647
2009-10-08 11:33:32 +00:00
bf0dbeb8b3
STUN support backport
...
SVN Revision: 2457
2009-08-11 12:53:46 +00:00
628b03f3c0
EJAB-994: Implements DNS timeouts and retries.
...
SVN Revision: 2405
2009-07-30 12:35:18 +00:00
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
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
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
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
fc77b48344
Merge from trunk (r1804 to r1829).
...
The merge party is over, you may now double-check that everything is in
place.
PR: EJABP-1
SVN Revision: 1830
2009-01-19 15:27:07 +00:00
ff500d8297
Merge from trunk (r1787 to r1804).
...
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1829
2009-01-19 14:47:33 +00:00
bc51bd0dbd
Merge from trunk (r1752 to r1764).
...
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1826
2009-01-19 11:16:44 +00:00
2cc2039ad8
Merge from trunk (r1734 to r1752).
...
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1737, r1740, r1745, r1747, r1748.
Additionnaly, any deprecated content was removed from jlib.hrl. This
leaves only the new RSM records.
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1824
2009-01-19 10:14:04 +00:00
129b0e99cf
Replace jlib:nodeprep/1 by exmpp_stringprep:nodeprep/1 and change the
...
error handling.
PR: EJABP-1
SVN Revision: 1619
2008-10-10 14:35:17 +00:00
4eaa8e19c9
Merge from trunk (r1457 to r1563).
...
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
332fb55e3a
MFC:
...
Merge revisions from 1362 to revision 1434 from trunk.
SVN Revision: 1435
2008-07-11 12:48:27 +00:00
797544333c
* src/mod_register.erl: Restrict registration frequency per IP or
...
user
* src/ejabberd_c2s.erl: Pass IP to the c2s_unauthenticated_iq hook
* src/ejabberd_config.erl: Added registration_timeout option
* src/treap.erl: Treaps implementation
SVN Revision: 1299
2008-04-22 21:51:32 +00:00
9733e6874e
* src/ejabberd_config.erl: Removed a dependency on string:to_upper
...
SVN Revision: 1288
2008-04-11 05:52:10 +00:00
1649dec58e
* src/ejabberd_config.erl: Add support to include additional
...
configuration files. Add support for macro definition and
usage. (EJAB-593)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1273
2008-04-02 16:31:15 +00:00
735b34e7b7
* doc/guide.tex: Improve documentation of host_config
...
add (EJAB-544)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
* src/ejabberd_config.erl: Likewise
SVN Revision: 1219
2008-03-04 10:36:57 +00:00
868182d1c8
* src/ejabberd_check.erl: Separate config loading from configuration sanity checks (EJAB-533)
...
* src/src/ejabberd_app.erl: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 1210
2008-02-27 20:15:25 +00:00
6e3ac3a5a0
* src/ejabberd_config.erl: dirty_get_registered_users now correctly returns all users for all vhosts no matter which back-end is used (EJAB-527)
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
SVN Revision: 1198
2008-02-19 13:49:29 +00:00
2d2fcc8210
* doc/guide.tex: Updated copyright dates to 2008
...
* src/*: Likewise
SVN Revision: 1153
2008-01-15 17:02:57 +00:00
56fe3579bb
* Applied copyright update patch 1.
...
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
6b8113c56f
* src/ejabberd_config.erl: Report human-readable message when
...
Mnesia spool files are not readable.
SVN Revision: 1053
2007-12-08 18:39:23 +00:00
6342c258a7
* src/cyrsasl.erl: Fix compilation warnings: Part 1 (EJAB-290)
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_config.erl: Likewise
* src/ejabberd_hooks.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/idna.erl: Likewise
* src/jd2ejd.erl: Likewise
SVN Revision: 1045
2007-12-06 23:15:04 +00:00
2078c45656
* src/ejabberd_config.erl: Print error when the configuration
...
requires ODBC, MySQL or PostgreSQL libraries but are not
installed (EJAB-210).
SVN Revision: 986
2007-11-26 19:52:09 +00:00
1415fa4b1c
* src/ejabberd_config.erl: Improved error message when ejabberd
...
config file is not found.
SVN Revision: 974
2007-11-22 13:46:54 +00:00
76f7e643e3
* src/ejabberd_config.erl: Refactoring: Move internal data structure to an include file.
...
* src/ejabberd_config.hrl: Likewise.
SVN Revision: 969
2007-11-09 10:18:38 +00:00
27a826cfe8
* src/ejabberd_config.erl: Added possibility for appending values
...
to config options (thanks to Badlop)
* doc/guide.tex: Updated
SVN Revision: 845
2007-07-31 04:13:29 +00:00
221532428f
* src/ejabberd_config.erl: Normalize hostnames in config file. If mixed case is used, the hostname will be now useable (EJAB-277).
...
* src/stringprep/stringprep_sup.erl: Likewise
* src/stringprep/Makefile.in: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 806
2007-06-29 17:27:42 +00:00
3b7e23df5a
* src/ejabberd_config.erl: Fixed "language" option processing
...
(thanks to Badlop)
SVN Revision: 780
2007-06-07 18:27:35 +00:00
c65e1e7ae0
* src/ejabberd_sm.erl: Minor optimisation
...
* src/ejabberd_system_monitor.erl: Experimental watchdog
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_config.erl: Likewise
SVN Revision: 750
2007-04-12 05:31:53 +00:00
efab31848e
* src/mod_muc/mod_muc.erl: Now mod_muc can be distributed on
...
several nodes
* src/mod_muc/mod_muc_room.erl: Likewise
* src/ejabberd_router.erl: Added bare_source and bare_destination
service balancing options and domain_balancing_component_number
option for specifying the number of connected components for the
domain
* src/ejabberd_config.erl: Likewise
SVN Revision: 706
2007-01-19 04:46:44 +00:00
4f0ee52254
* src/ejabberd_config.erl: Added loglevel option. It is now possible to
...
configure ejabberd dynamic loglevel from the config file (EJAB-74).
SVN Revision: 693
2006-12-14 18:54:50 +00:00
091d2bcb00
* src/ejabberd_node_groups.erl: Support for node tagging
...
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_frontend_socket.erl: Use node tags to determine
backend nodes
* src/ejabberd_config.erl: Added node_type and cluster_nodes
options
* src/ejabberd_app.erl: Establish connections to the nodes from
the cluster_nodes option
* src/ejabberd_router.erl: Added balancing method option
* src/ejabberd_config.erl: Likewise
SVN Revision: 676
2006-11-07 02:08:51 +00:00
94ec73686e
* src/shaper.erl: Bugfix
...
* src/ejabberd_config.erl: Likewise
SVN Revision: 658
2006-10-02 18:54:10 +00:00
719cd49e59
* src/ejabberd_config.erl: Support for per host certificates
...
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd.cfg.example: Updated
* src/ejabberd_s2s_in.erl: Fixed id-on-xmppAddr processing
SVN Revision: 432
2005-11-05 21:15:53 +00:00
1433dafe6b
* src/tls/tls_drv.c: Support for "connect" method
...
* src/tls/tls.erl: Likewise
* src/ejabberd_s2s_in.erl: Support for STARTTLS+Dialback
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_receiver.erl: Added a few hacks ({active,once} mode
should be used instead of recv/3 call to avoid them)
* src/ejabberd_config.erl: Added s2s_use_starttls and s2s_certfile
options
* src/ejabberd.cfg.example: Likewise
SVN Revision: 426
2005-10-25 01:08:37 +00:00
081be192d3
* src/ejabberd_config.erl: Added host_config option
...
* doc/guide.tex: Updated
* src/ejabberd_auth_ldap.erl: Bugfix
SVN Revision: 386
2005-07-31 19:51:52 +00:00
3202705ad6
* src/mod_register.erl: Bugfix
...
* src/mod_vcard.erl: Bugfix
* src/ejabberd_app.erl: Updated to allow different authentication
methods for different virtual hosts
* src/ejabberd_auth.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/cyrsasl.erl: Likewise
* src/cyrsasl_digest.erl: Likewise
* src/cyrsasl_plain.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_config.erl: Likewise
* src/extauth.erl: Likewise
* src/mod_last_odbc.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/odbc/ejabberd_odbc.erl: Likewise
* src/odbc/ejabberd_odbc_sup.erl: Likewise
SVN Revision: 374
2005-07-13 03:24:13 +00:00
b58c0b7b23
* src/ejabberd_config.erl: Bugfix
...
SVN Revision: 372
2005-07-03 00:16:34 +00:00
Badlop