71 Commits

Author	SHA1	Message	Date
Christophe Romain	011535f0de	binary refactoring	2012-09-11 15:45:59 +02:00
Evgeniy Khramtsov	75d3152a0f	Merge branch '2.1.x' into 2.2.x ... Conflicts: src/mod_muc/mod_muc.erl src/mod_muc/mod_muc_room.erl src/mod_offline.erl src/mod_offline_odbc.erl src/mod_shared_roster.erl src/web/ejabberd_http_bind.erl	2012-05-04 14:19:52 +10:00
Evgeniy Khramtsov	437f68a9f3	Merge SQL and Mnesia code into one module (EJAB-1560)	2012-04-27 19:52:05 +10:00
Christophe Romain	7f1e9d3972	merge from 2.1.11 and resolve conflicts	2012-04-27 11:37:11 +02:00
Badlop	983da9c887	Relax digest-uri handling (thanks to Daniel Willmann)(EJAB-1529) ... This patch introduces a new config option - fqdn - to set the fully qualified domain name of the host: {fqdn, "foo.example.com"}. This fixes a problem with Pidgin not being able to log in on a server that used SRV records.	2012-03-16 14:16:17 +01:00
Christophe Romain	7d7c739cb3	Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x	2012-02-23 16:59:22 +01:00
Alexey Shchepin	b1e2538488	Update copyright dates	2012-02-23 17:52:34 +02:00
Evgeniy Khramtsov	e30e7686e3	Add new options: migrate_timeout and rehash_timeout	2012-02-13 23:49:44 +10:00
Badlop	dd772404c5	Merge branch '2.1.x' into 2.2.x ... Conflicts: src/configure src/ejabberd.app src/ejabberd_auth_anonymous.erl src/ejabberd_c2s.erl src/ejabberd_sm.erl	2011-08-24 18:29:25 +02:00
Evgeniy Khramtsov	a7d82d6ecb	New BOSH implementation	2011-07-25 23:53:33 +10:00
Badlop	d4d28e038b	Cut the string when calling halt/1	2011-05-30 17:11:32 +02:00
Evgeniy Khramtsov	8806fdc1c2	Implement C2S redirection ... - The feature is based on <see-other-host/> stream error, see RFC6120, 4.9.3.19 - To enable the feature you must set {redirect, true} in C2S listener section and set global "hostname" option on all nodes in cluster. The hostname must be string in the form as described in the RFC, for example: "foo.org", "foo.org:5222", "1.2.3.4", "[2001:41D0:1:A49b::1]:9222" and so on	2011-05-09 14:02:08 +10:00
Evgeniy Khramtsov	07cf6f09b8	Implement CAPTCHA limit	2011-04-18 16:06:36 +10:00
Christophe Romain	fd52f2cb7d	update copyright up to 2011	2011-02-14 13:50:55 +01:00
Badlop	6df9a6ab33	Use alternative of file:read_line/1 to not require R13B02	2010-02-20 19:31:36 +01:00
Badlop	7b76fdcde7	Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) ... SVN Revision: 2891	2010-01-12 16:11:32 +00:00
Badlop	15a27c0566	Improve log message when showing lines of config file. ... SVN Revision: 2850	2009-12-30 01:36:07 +00:00
Badlop	dbad3df333	If problem in config file starting ejabberd: display config lines and stop node (EJAB-1148) ... SVN Revision: 2844	2009-12-29 22:48:25 +00:00
Evgeniy Khramtsov	14232df14c	new option added: max_fsm_queue. removed hardcoded FSMLIMITS ... SVN Revision: 2645	2009-10-07 14:24:09 +00:00
Evgeniy Khramtsov	01a9f981f4	it is now possible to start TCP/UDP on the same port ... SVN Revision: 2452	2009-08-11 07:15:36 +00:00
Geoff Cant	f4330e9ed3	EJAB-994: Implements DNS timeouts and retries. ... SVN Revision: 2404	2009-07-30 12:34:59 +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
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	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	3524172856	* 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: 1872	2009-02-13 19:27:56 +00:00
Badlop	ba2eb35590	* src/ejabberd_listener.erl: New way to configure IP address and ... IP version of listener. Support for definition of IP address in string format, and implicit definition of IP version (EJAB-388). Support for defining several listeners: all with same port number but different IP addresses (EJAB-389)(thanks to Fabrice Colliot and Sergei Golovan). Better report in WebAdmin of problem when starting a listener. The old configuration method of ip tuple and inet6 is fully supported for backwards compatibility, but is not documented in the Guide anymore. * src/ejabberd_config.erl: Likewise * src/mod_proxy65/mod_proxy65_stream.erl: Likewise * src/mod_proxy65/mod_proxy65_service.erl: Likewise * src/web/ejabberd_web_admin.erl: Likewise * doc/guide.tex: Document the new way to configure IP address and IP version of listener, undocument options ip and inet6 * doc/guide.html: Likewise SVN Revision: 1812	2009-01-12 20:03:02 +00:00
Badlop	f09509502e	* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) ... * doc/guide.html: Likewise * src/*/*.erl: Likewise * src/*/*.erl: Remove unneeded blankspaces in license text SVN Revision: 1804	2009-01-12 14:44:42 +00:00
Badlop	682909e0fc	* src/ejabberd_config.erl: Option outgoing_s2s_options to define ... s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan Maka)(EJAB-665) * src/ejabberd_s2s_out.erl: Likewise * src/ejabberd_socket.erl: Likewise * src/ejabberd.cfg.example: Likewise * doc/guide.tex: Likewise * doc/guide.html: Likewise SVN Revision: 1756	2008-12-26 11:45:08 +00:00
Badlop	42036d8f68	* src/mod_last.erl: Implement workaround for uptime statistic in ... 32 bit machines, so it can show uptime greater than 50 days (EJAB-610) * src/mod_last_odbc.erl: Likewise * src/ejabberd_config.erl: Store start time in local_config table SVN Revision: 1744	2008-12-23 01:34:52 +00:00
Badlop	c3bda4aaee	* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) ... * doc/guide.html: Likewise * doc/api/overview.edoc: Likewise * src/*/*.erl: Likewise * src/*/*.hrl: Likewise * src/*/*.c: Likewise * src/odbc/*.sql: Likewise SVN Revision: 1499	2008-07-31 11:18:49 +00:00
Badlop	543fb2d7e4	* src/ejabberd_config.erl: If syntax mistake in config file, show ... specific error message (EJAB-616) SVN Revision: 1470	2008-07-22 16:08:57 +00:00
Badlop	e3ba72f3dd	* src/ejabberd_config.erl (load_file): error message on sasl.log ... is not flattened (EJAB-616) SVN Revision: 1424	2008-07-09 16:08:32 +00:00
Alexey Shchepin	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
Alexey Shchepin	9733e6874e	* src/ejabberd_config.erl: Removed a dependency on string:to_upper ... SVN Revision: 1288	2008-04-11 05:52:10 +00:00
Badlop	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
Badlop	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
Mickaël Rémond	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
Mickaël Rémond	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
Badlop	2d2fcc8210	* doc/guide.tex: Updated copyright dates to 2008 ... * src/*: Likewise SVN Revision: 1153	2008-01-15 17:02:57 +00:00
Mickaël Rémond	56fe3579bb	* Applied copyright update patch 1. ... SVN Revision: 1110	2007-12-24 11:41:41 +00:00
Badlop	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
Badlop	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
Badlop	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
Mickaël Rémond	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
Mickaël Rémond	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
Alexey Shchepin	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
Mickaël Rémond	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
Alexey Shchepin	3b7e23df5a	* src/ejabberd_config.erl: Fixed "language" option processing ... (thanks to Badlop) SVN Revision: 780	2007-06-07 18:27:35 +00:00
Alexey Shchepin	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
Alexey Shchepin	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