25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Commit Graph

3021 Commits

Author SHA1 Message Date
Alexey Shchepin
4637e2c66b Avoid quadratic behavior in reading SSL data 2012-04-06 11:47:53 +02:00
Paweł Chmielowski
1f1a98d7ae Properly handle HEAD request in mod_http_bind (this fixes EJAB-1538) 2012-04-06 11:47:38 +02:00
Evgeniy Khramtsov
cea23b055b Get rid of duplicated code 2012-04-06 12:31:29 +10:00
Evgeniy Khramtsov
41a0eae0bd ODBC support for mod_shared_roster 2012-04-04 20:37:43 +10:00
Evgeniy Khramtsov
5fab00011e ODBC support for mod_irc 2012-04-03 20:23:41 +10:00
Evgeniy Khramtsov
ca5f028016 ODBC support for mod_vcard_xupdate 2012-04-02 15:21:54 +10:00
Evgeniy Khramtsov
b43444f674 ODBC support for mod_announce 2012-04-02 14:49:13 +10:00
Evgeniy Khramtsov
866085c918 Add ODBC exporting function for privacy table 2012-04-02 12:39:23 +10:00
Evgeniy Khramtsov
585c5afd1a Add notes about mod_muc_odbc 2012-04-02 10:57:10 +10:00
Evgeniy Khramtsov
6ec5c7c4d8 Use proper module name 2012-03-31 22:56:51 +10:00
Evgeniy Khramtsov
6b3875814c ODBC support for mod_muc 2012-03-31 21:41:54 +10:00
Alexey Shchepin
a63bbe8a23 Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x 2012-03-23 11:04:46 +02:00
Alexey Shchepin
bc118986b7 Added missed tls:recv_data/2 2012-03-23 11:04:26 +02:00
Evgeniy Khramtsov
3a51c801e1 Change log level from informational to error 2012-03-19 18:52:20 +10: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
Karim Gemayel
8d8dee5acf jlib.hrl : new macro ERR_POLICY_VIOLATION 2012-03-09 12:07:44 +01:00
Alexey Shchepin
92feebd0fa Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x 2012-03-07 16:20:25 +02:00
Alexey Shchepin
0b423eb287 Don't ignore Length parameter in tls:recv 2012-03-07 16:19:59 +02:00
Evgeniy Khramtsov
f7b6446c74 Assume we have only one CPU when an auto-detection fails (EJAB-1516) 2012-02-29 00:45:45 +10:00
Evgeniy Khramtsov
deb87f2dfa Cache caps timestamp before the IQ-request is done 2012-02-28 16:38:24 +10: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
Badlop
7b9e59d15d Recommend Erlang/OTP R13B04 and R14B04 2012-02-22 15:42:13 +01:00
Badlop
794d0bbe69 Fix Enlish in the Guide (thanks to Ludovic Bocquet) 2012-02-22 15:40:31 +01:00
Alexey Shchepin
60d422eb8e Avoid quadratic behavior in reading SSL data 2012-02-20 17:41:56 +02:00
Alexey Shchepin
52df4fa024 Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.2.x
Conflicts:
	src/configure
	src/ejabberd.app
	src/ejabberd_receiver.erl
	src/tls/tls_drv.c
	src/web/ejabberd_http.erl
2012-02-20 17:29:18 +02:00
Christophe Romain
f7ffdfa15d Fix typo in xep number, bosh is xep0206 (thanks to Ludovic Bocquet) 2012-02-20 14:15:08 +01:00
Badlop
4900ac31a7 Add thanks to Ludovic Bocquet for past Guide contributions 2012-02-15 18:30:16 +01:00
Jerome Sautret
6ebebdd02d Improve session migration lock log message. 2012-02-15 17:23:30 +01:00
Badlop
112a18f966 Work also with some unicode strings in PgSQL (EJAB-1490) 2012-02-14 13:18:18 +01:00
Badlop
7d623d5eb4 Option default_host for handling HTTP requests with ambiguous Host (EJAB-1261) 2012-02-14 11:35:52 +01:00
Evgeniy Khramtsov
4819738e8f Receiver should not generate an exception 2012-02-14 17:03:08 +10:00
Evgeniy Khramtsov
e30e7686e3 Add new options: migrate_timeout and rehash_timeout 2012-02-13 23:49:44 +10:00
Evgeniy Khramtsov
290432c0ee Change a loglevel of the set_lock message 2012-02-13 23:44:00 +10:00
Christophe Romain
6563267055 make remove_user match hometree_odbc plugin on odbc version 2012-02-08 21:12:20 +01:00
Alexey Shchepin
ecf7b0282e Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x 2012-02-03 17:53:17 +02:00
Alexey Shchepin
ea6e85d926 Use separate timer for C2S_OPEN_TIMEOUT 2012-02-03 17:53:05 +02:00
Jerome Sautret
b4d107301d Added generic sha:to_hexlist/1 API function to convert sha results from
binary to hexadecimal string (TECH-1383).
2012-02-03 10:44:49 +01:00
Badlop
948318ca19 Fix the documentation about default value of captcha_cmd option 2012-02-01 00:09:51 +01:00
Evgeniy Khramtsov
89aa7baa5b Replace a single quote with double quotes in
an ODBC escape (thanks to Vladislav Chugunov)
2012-01-31 11:18:37 +10:00
Pablo Polvorin
fead37d1c5 Avoid multiple disco#info request for caps.
Only send it when we receive the presence from the user,
if the user sends caps and we don't have it cached.
2012-01-27 16:08:28 -03:00
Badlop
95928a7cd4 http_bind webserver TLS fail on Chrome (thanks to Adam Langley)(EJAB-1530) 2012-01-19 13:21:25 +01:00
Alexey Shchepin
1ecc9ac48c Fixed ejabberd_http:get_line 2012-01-19 12:20:48 +02:00
Alexey Shchepin
eaecb9b65c Fixed ejabberd_http:get_line 2012-01-19 12:20:02 +02:00
Badlop
288196c7e8 Foreign shared rosters items not pushed (thanks to Nathan Bruning)(EJAB-1509) 2012-01-04 19:21:31 +01:00
Evgeniy Khramtsov
2948cddebf Check a node of a receiver, not a monitor.
This should fix the previous commit (EJABS-1798)
2012-01-04 16:43:10 +10:00
Evgeniy Khramtsov
438dc57def Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2012-01-03 11:26:32 +10:00
Evgeniy Khramtsov
4d64fbb0ac Also migrate C2S sessions with remote receivers (EJABS-1798) 2012-01-03 11:25:55 +10:00
Badlop
0283c6cdfe Revert "Update ejabberd version number to 2.1.10"
This reverts commit bcdae19141.
2011-12-31 20:40:04 +01:00
Alexey Shchepin
d4e7b0cda0 mod_private.erl: misc errors cases fixes (thanks to Karim Gemayel) 2011-12-30 16:08:24 +02:00