Juan Pablo Carlino
11b00b92e9
merge from Team Leader 2.2 (r973)
2010-10-14 19:00:19 -03:00
Badlop
a5230c46c2
Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319)
...
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
2010-10-14 21:15:40 +02:00
Badlop
95ce77f80d
Include a gitignore file in the ejabberd git repository (EJAB-1312)
2010-10-14 19:53:31 +02:00
Evgeniy Khramtsov
eeffc77a1a
ignore RPC timeout during migration
2010-10-14 20:29:45 +10:00
Evgeniy Khramtsov
254686ab46
fixes timeout calculation
2010-10-14 20:15:53 +10:00
Evgeniy Khramtsov
4a6fc46713
increase rehash timeout to 30 seconds; increase hashing points
2010-10-14 20:02:34 +10:00
Christophe Romain
bde3bce1e7
remove non generic comment
2010-10-13 15:26:38 +02:00
Christophe Romain
f76dcd0d48
Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x
2010-10-13 12:36:04 +02:00
Christophe Romain
7da8d9e4e3
merge resolved against latest 2.1.x
2010-10-13 11:02:22 +02:00
Christophe Romain
a93f4f7750
make http-bind restartable (thanks to Andreas Köhler)(EJAB-1318)
2010-10-13 10:54:12 +02:00
Evgeniy Khramtsov
ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
3a7d02dbd3
fixes anonymous sessions lookup
2010-10-09 00:44:23 +10:00
Evgeniy Khramtsov
350af319bf
fixes annoying crash with controller change
2010-10-08 19:26:49 +10:00
Evgeniy Khramtsov
50b747041f
use one_queue IQ discipline by default
2010-10-05 21:28:45 +10:00
Evgeniy Khramtsov
36df8c9035
implement lifetime for broken hashes
2010-10-05 21:27:28 +10:00
Evgeniy Khramtsov
58a5ed9cdc
change caps hook name
2010-10-03 16:04:29 +10:00
Evgeniy Khramtsov
5ea909885e
call caps hook when caps is changed
2010-10-03 16:02:50 +10:00
Christophe Romain
f81473fc65
fix licence issue and (c) to 2010
2010-09-28 13:36:16 +02:00
Evgeniy Khramtsov
1f2c9b7971
fixes typo in stop_connection/1
2010-09-28 14:20:02 +10:00
Evgeniy Khramtsov
c13940e1de
new CAPS processing
2010-09-28 14:18:57 +10:00
Christophe Romain
b6dcd41225
added antiflood and filter modules from TeamLeader
2010-09-24 16:11:59 +02:00
Christophe Romain
db2baa8f84
pubsub clean now cluster aware
2010-09-24 16:11:39 +02:00
Christophe Romain
a894d25b1f
s2s and session are no longer part of replication init of joincluster
2010-09-24 16:11:12 +02:00
Alexey Shchepin
a93991bef2
Mark out-of-reception sessions in #session.info
2010-09-23 18:14:04 +03:00
Alexey Shchepin
7127d067c8
Revert the previous change, as priority is 0 by default
2010-09-23 18:05:56 +03:00
Alexey Shchepin
ba326eb976
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x
2010-09-23 16:22:03 +03:00
Alexey Shchepin
fd50b2169b
Insert "priority" element in out-of-reception presences
2010-09-23 16:18:53 +03:00
Alexey Shchepin
00d8b2ac30
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test
...
Conflicts:
src/ejabberd_c2s.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
2010-09-22 22:38:32 +03:00
Alexey Shchepin
cac23c39c9
Disable notifications for a user on "Invalid token" error
2010-09-22 22:19:36 +03:00
Alexey Shchepin
a5813b798f
Fixed "sender" log field
2010-09-22 22:19:17 +03:00
Evgeniy Khramtsov
8e5297f4c3
fixes default value for cache_life_time
2010-09-21 04:31:18 +10:00
Evgeniy Khramtsov
191cd2af3c
different hooks should be called for session migration and session close
2010-09-21 03:17:52 +10:00
Alexey Shchepin
f2cfee11de
Disable notifications for a user on "Invalid token" error
2010-09-20 13:35:42 +03:00
Andreas Köhler
3278f019cb
Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.
2010-09-17 18:48:45 +02:00
Andreas Köhler
e2c3925b7d
Discard unmatched INFO messages in ejabberd services.
...
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
2010-09-17 18:48:43 +02:00
Eric Cestari
b0c79c57b0
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-17 16:26:09 +02:00
Eric Cestari
8ea523889b
[TECH-1151] Websockets are now handled in pure binary
2010-09-17 16:10:59 +02:00
Eric Cestari
b44c462b0e
[TECH-1151] IP now correctly stored
2010-09-17 14:49:04 +02:00
Eric Cestari
0987700a27
Rename protocol version 76 to 00 (new official name)
2010-09-17 14:24:24 +02:00
Eric Cestari
ff4f052bb1
[TECH-1151] Origin and Protocol parameters are configurable and set.
2010-09-17 14:23:34 +02:00
Christophe Romain
100b821c1a
added customer related tools
2010-09-17 09:11:03 +02:00
Christophe Romain
893c47a2e0
add ability to retreive only node names
2010-09-17 07:28:28 +02:00
Christophe Romain
694af69982
ejabberd.app now set to version 2.2.x
2010-09-17 06:46:40 +02:00
Christophe Romain
c576f340f9
upgrade to lattest pubsub schema
2010-09-17 06:40:48 +02:00
Badlop
179a0cf255
Remove some compiled files
2010-09-17 00:14:13 +02:00
Eric Cestari
a45ecb70ff
[TECH-1511] debug traces reorganized
2010-09-16 15:08:53 +02:00
Christophe Romain
df1ab9149f
remove garbage configuration
2010-09-16 14:53:20 +02:00
Eric Cestari
cb54444f00
Merge branch '2.2.x' into websockets
2010-09-16 14:44:44 +02:00
Eric Cestari
c77e7fbb7d
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-16 14:38:52 +02:00
Eric Cestari
40625b29f2
ApplePush : previous merge missed timeout handler in c2s.
2010-09-16 14:37:27 +02:00
