Evgeniy Khramtsov
01689bc6b9
Ack support (TECH-1261)
2011-02-11 13:42:55 +09:00
Christophe Romain
024a80d41f
port previous pubsub changes to _odbc
2011-02-08 18:29:52 +01:00
Christophe Romain
f485109c39
refactor pubsub broadcast to allow big optimization
2011-02-08 17:14:19 +01:00
Eric Cestari
bde46896d6
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-02-08 16:39:38 +01:00
Eric Cestari
0c30b012f7
Websocket: corrects bug of ejabberd dropping connection under message rate.
2011-02-08 16:39:13 +01:00
Badlop
14b39a0ee4
Merge remote branch 'origin/2.1.x' into 2.2.x
...
Conflicts:
src/web/ejabberd_http_bind.erl
2011-01-31 18:57:13 +01:00
Badlop
792512459d
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-31 18:52:07 +01:00
Badlop
0359e345b0
Add to example config file access_from comment
2011-01-28 17:13:44 +01:00
Badlop
a09c319357
Update exmpp version to 0.9.6
2011-01-28 12:46:09 +01:00
Badlop
36166aa40e
Comment unused code
2011-01-28 12:11:34 +01:00
Badlop
a25c9c5df3
Don't let presence-in privacy rule block a presence subscription using ODBC (EJAB-255)
2011-01-19 20:58:57 +01:00
Badlop
6e3a9ac4fd
Fix delayed response of a timeout call was reused for next login (EJAB-1385)
2011-01-19 19:06:46 +01:00
Eric Cestari
e380eee223
WebSocket support update
...
- added JSON encoding
- fix problem where session was not closed
- origin can now be decided by a custom module
2011-01-19 14:54:20 +01:00
Eric Cestari
1959546ff9
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-01-19 14:49:45 +01:00
Christophe Romain
92f5509b35
improve check_start only matching node process
2011-01-18 13:36:46 +01:00
Badlop
f4c74c147b
Clarify more the expected content of welcome_message mod_register option
2011-01-17 23:46:08 +01:00
Badlop
0edda6150b
Clarify error message when BOSH query is sent to non-running module
2011-01-12 21:22:43 +01:00
Christophe Romain
1a2e6b02ab
sync with latest 2.1.6 befor tagging
2011-01-12 12:11:04 +01:00
Eric Cestari
56bf156b6f
logging works on non-configured hosts.
...
In the log file, information should be logged under the default hostname.
2011-01-11 12:55:03 +01:00
Eric Cestari
5632901820
Fixed 2.1.6 compile error
2011-01-07 16:00:10 +01:00
Eric Cestari
92b6c12420
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-01-07 15:54:00 +01:00
Eric Cestari
062d58026a
mod_http_fileserver.erl will only conditionally gzip content by checking Accept-Encoding.
2011-01-07 15:28:26 +01:00
Eric Cestari
7ef85dddea
Refactoring of ejabberd_http_fileserver.erl
...
- not a gen_server anymore. Should be way faster now (no more message passing between processes)
- configuration stored in mochiglobal
- support for etag
- support for gzip compression:
- static (if a foo.gz is in the same dir as requested foo, it will be served)
- always (will always gzip, will use static is available)
- false, don't gzip
- logfile is now in another module.
2011-01-07 15:12:51 +01:00
Mickaël Rémond
4a9e7f0a3a
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-05 14:36:21 +01:00
Mickaël Rémond
bd43505db9
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-04 15:21:10 +01:00
Christophe Romain
cffe224d4a
log and drop messages only from autofilter
2011-01-03 15:26:44 +01:00
Christophe Romain
15c27c9ddd
fix bad jid issue
2011-01-03 09:52:12 +01:00
Badlop
a2e1d2030a
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:42:53 +01:00
Evgeniy Khramtsov
149f8e2b45
Merge remote branch 'mainline-2.1.x/2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd.app
2010-12-28 21:17:01 +09:00
Evgeniy Khramtsov
4c8b034874
Change c2s state before offline messages resending
2010-12-28 21:09:15 +09:00
Eric Cestari
2ab31cb613
Merge branch '2.2.x-applepush' into 2.2.x
...
Without applepush
Conflicts:
src/ejabberd_c2s.erl
src/ejabberd_c2s.hrl
2010-12-23 15:30:14 +01:00
Alexey Shchepin
b47c50145d
Make jlib:ip_to_list safe to use
2010-12-20 19:29:05 +02:00
Badlop
b9f4daca46
Revert branch name back to 2.1.x
2010-12-20 13:10:33 +01:00
Evgeniy Khramtsov
606c207e21
Make sure 'closed' event is correctly processed on every state
2010-12-17 17:26:20 +09:00
Evgeniy Khramtsov
03870f962c
Fix user_receive_packet hook
2010-12-16 23:54:02 +09:00
Evgeniy Khramtsov
405e9b24b0
Fix get_sessions/2 function
2010-12-16 23:47:53 +09:00
W. Andrew Loe III
d9c01e8ed9
Ignore OS X libraries.
2010-12-15 17:01:14 +01:00
Evgeniy Khramtsov
3c51ca06d5
Merge branch '2.2.x' into mergefix
2010-12-14 23:19:31 +09:00
Evgeniy Khramtsov
02cfb11a6d
Merge branch '2.1.x' into mergefix
...
Conflicts:
.gitignore
src/ejabberd.app
src/ejabberd_c2s.erl
src/ejabberd_captcha.erl
src/ejabberd_node_groups.erl
src/mod_caps.erl
src/web/ejabberd_http.erl
src/web/ejabberd_http_bind.erl
2010-12-14 23:10:08 +09:00
Christophe Romain
4e875c7fb7
manual merge from 2.1.6 DO NOT MERGE, NEED TESTS
2010-12-13 23:44:53 +01:00
Badlop
3e9c9fc750
Remove Type and Spec, backport list comprehensions, so R12B-5 can compile
2010-12-13 12:17:28 +01:00
Badlop
fbcb9bb154
Recompile the Guide
2010-12-13 11:15:19 +01:00
Badlop
6242fd2bb8
Update ejabberd version number to 2.1.6
2010-12-13 11:15:18 +01:00
Badlop
1c566057f8
Recompile translations
2010-12-13 11:15:16 +01:00
Badlop
aa59d8f1f0
Add release notes for ejabberd 2.1.6
2010-12-13 11:15:14 +01:00
Badlop
6dd35923b0
Fix warning about unused variables
2010-12-13 11:14:39 +01:00
Badlop
b9bbe19d4c
Option to reject S2S connection if untrusted certificate (EJAB-464)
2010-12-11 02:29:53 +01:00
Badlop
44b2002504
Include From attribute in the stream header of outgoing S2S connections
2010-12-11 02:29:52 +01:00
Badlop
faf422202f
When TLS is required in s2s, add subelement to stream:features starttls
2010-12-11 02:29:50 +01:00
Badlop
eb884c80d0
Add option to require encryption in S2S connections (EJAB-495)
2010-12-11 02:29:48 +01:00
