Pablo Polvorin
acae6e20de
* Use exmpp_jid:to_binary/1 when possible.
...
* ejabberd_odbc:escape/1 now can escape binaries too. This
avoid the need to convert a binary value to list() just to
sql-escape it. The escaped value returned is allways a list()
(ejabberd's odbc drivers only works on lists())
SVN Revision: 1914
2009-02-23 19:45:55 +00:00
Jean-Sébastien Pédron
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
Jean-Sébastien Pédron
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
Jean-Sébastien Pédron
3bfb2b5cc1
Merge from trunk (r1692 to r1709).
...
PR: EJABP-1
SVN Revision: 1710
2008-12-08 12:02:27 +00:00
Jean-Sébastien Pédron
9e96043255
Merge from trunk (r1649 to r1692).
...
PR: EJABP-1
SVN Revision: 1695
2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
67a87af459
Merge from trunk (r1563 to r1613).
...
PR: EJABP-1
SVN Revision: 1614
2008-10-08 12:02:30 +00:00
Jean-Sébastien Pédron
4eaa8e19c9
Merge from trunk (r1457 to r1563).
...
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
Badlop
04aec272db
* src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because
...
Erlang R12 doesn't start automatically like in R11 and
older (thanks to Sergei Golovan)(EJAB-541)
SVN Revision: 1231
2008-03-13 14:34:47 +00:00
Christophe Romain
9466b1a21f
add pgsql driver monitoring
...
SVN Revision: 1200
2008-02-19 17:06:49 +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
22f928122f
* Applied copyright patch 3.
...
SVN Revision: 1113
2007-12-24 13:57:53 +00:00
Badlop
d625fc80fc
* src/acl.erl and other 64 files: Remove Erlang module attribute
...
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)
SVN Revision: 1044
2007-12-06 22:12:27 +00:00
Jérôme Sautret
6fcef6f5c4
* src/odbc/ejabberd_odbc_sup.erl: Add an odbc_pool_size config file option to choose the number of SQL
...
connection in each pool (EJAB-58).
* src/odbc/ejabberd_odbc.erl: Add an odbc_keepalive_interval config file option to perform a keep
alive query at given interval (EJAB-206).
SVN Revision: 879
2007-08-16 16:37:00 +00:00
Mickaël Rémond
915d94b0dc
* src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).
...
SVN Revision: 868
2007-08-12 15:39:01 +00:00
Mickaël Rémond
745be8373f
* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224).
...
SVN Revision: 813
2007-07-17 07:09:04 +00:00
Mickaël Rémond
48c073abd2
* src/odbc/ejabberd_odbc.erl: ejabberd admin can now choose the
...
relational database port to user from ejabberd configuration
file (EJAB-195).
* src/doc/guide.tex: Likewise.
SVN Revision: 740
2007-03-10 15:53:53 +00:00
Mickaël Rémond
d0e2ac9ed2
* src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as
...
a database backend (via ODBC).
* src/odbc/ejabberd_odbc.erl: Likewise.
* src/odbc/mssql.sql: Likewise.
* src/odbc/Makefile.in: Likewise.
* src/ejabberd_auth_odbc.erl: Likewise.
* src/mod_offline_odbc.erl: Likewise.
* src/mod_roster_odbc.erl: Likewise.
* src/mod_last_odbc.erl: Likewise.
* src/configure.ac: Likewise
* doc/guide.tex: Likewise.
* doc/introduction.tex: Likewise.
* src/odbc/pg.sql: Minor fix.
SVN Revision: 598
2006-09-03 15:15:46 +00:00
Alexey Shchepin
b8e99a3c05
* src/odbc/ejabberd_odbc.erl: Reconnect on ODBC connection closing
...
SVN Revision: 502
2006-02-08 03:55:30 +00:00
Mickaël Rémond
c7bafe0056
* src/odbc/ejabberd_odbc.erl: Added a way to retry database
...
connection connect for 5 minutes when the connection is lost. No further
connection is retry after 5 minutes (EJAB-22 & EJAB-25)
* src/odbc/ejabberd_odbc_sup.erl: likewise
SVN Revision: 485
2006-01-13 18:05:10 +00:00
Mickaël Rémond
54a1ced6f6
* src/odbc/ejabberd_odbc.erl: underscore and percent are now only
...
escaped in like queries. MySQL where not escaping those escaped
characters in other context (EJAB-24)
* src/mod_vcard_odbc.erl: likewise.
* src/odbc/mysql.sql: Fixed MySQL database creation script: Was
not properly working with all MySQL version.
SVN Revision: 484
2006-01-13 10:59:52 +00:00
Mickaël Rémond
8401a5ac55
Native MySQL support. The Erlang MySQL module is needed:
...
http://support.process-one.net/doc/display/CONTRIBS/Yxa
SVN Revision: 482
2006-01-02 17:39:04 +00:00
Mickaël Rémond
15e747782a
* src/odbc/ejabberd_odbc.erl: Added error message on ODBC
...
connection to help ODBC configuration troubleshooting.
SVN Revision: 476
2005-12-22 09:40:21 +00:00
Alexey Shchepin
0035c63399
* src/odbc/ejabberd_odbc.erl: Bugfix
...
SVN Revision: 475
2005-12-22 05:38:04 +00:00
Mickaël Rémond
559b5cae14
* src/odbc/mysql.sql: Database description for MySQL Database
...
4.1 (Max version, with Innodb)
* src/ejabberd_auth_odbc.erl: MySQL ODBC support.
* src/mod_offline_odbc.erl: likewise
* src/mod_vcard_odbc.erl: likewsie
* src/mod_roster_odbc.erl: likewise
* src/odbc/ejabberd_odbc.erl: likewise
* src/mod_last_odbc.erl: likewise
SVN Revision: 474
2005-12-21 16:10:56 +00:00
Alexey Shchepin
57a6d0e1d3
* src/odbc/ejabberd_odbc.erl: Support for mnesia-like transaction
...
interface
* src/mod_roster_odbc.erl: Updated to use
ejabberd_odbc:sql_transaction/2
SVN Revision: 434
2005-11-16 02:59:05 +00:00
Alexey Shchepin
590b2c9348
* src/ejabberd_auth_odbc.erl: Minor fix
...
* src/odbc/ejabberd_odbc.erl: Updated pgsql support
SVN Revision: 421
2005-10-15 19:50:02 +00:00
Alexey Shchepin
a773fb0a25
* src/odbc/ejabberd_odbc.erl: Experimental support for pgsql
...
library
SVN Revision: 418
2005-10-13 01:36:07 +00:00
Alexey Shchepin
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
Alexey Shchepin
77c8251300
* src/odbc/ejabberd_odbc.erl: ODBC connection string can be
...
specified via odbc_server option now
* src/ejabberd.cfg.example: Added ODBC usage example
SVN Revision: 314
2005-04-18 18:41:57 +00:00
Alexey Shchepin
3416cbe63a
* src/odbc/ejabberd_odbc.erl: Load-balance ODBC requests between
...
several connections
* src/odbc/ejabberd_odbc_sup.erl: Supervisor for ODBC connections
* src/mod_muc/mod_muc_room.erl: Added missed type='form' attribute
in room configuration response (thanks to Badlop)
SVN Revision: 295
2004-12-29 23:10:14 +00:00
Alexey Shchepin
8c8e3469bc
* src/odbc/pg.sql: DB creation script for postgres
...
* src/odbc/ejabberd_odbc.erl: Experimental support for ODBC
* src/mod_last_odbc.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth.erl: Likewise
SVN Revision: 292
2004-12-13 23:00:12 +00:00
