Christophe Romain
33d4126290
merge with latest 2.1.x (pre 2.1.7)
2011-04-11 15:47:04 +02:00
Christophe Romain
5ad1d08b89
SSL sockets don't compute length of data (EJABS-1460)
2011-03-15 13:53:38 +01:00
Badlop
18fd67b311
Change string in WebAdmin to reuse an existing one
2011-03-13 18:34:50 +01:00
Christophe Romain
f39ccd73c5
Merge remote branch 'mainline/2.1.x' into 2.2.x
2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +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
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
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
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
Badlop
a2e1d2030a
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:42:53 +01: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
Badlop
6dd35923b0
Fix warning about unused variables
2010-12-13 11:14:39 +01:00
Badlop
b83dd9f954
Support for X-Forwarded-For HTTP header (EJAB-1356)
2010-12-07 16:47:55 +01:00
Evgeniy Khramtsov
bfedd21c98
Disable error/1 auto-import (introduced in R14)
2010-12-03 23:38:18 +09:00
Christopher tofu Zorn
3e24408710
add the ability to send raw xml packets over http bind
2010-11-29 20:05:37 +01:00
Badlop
6374b5b1e7
Fix characters not allowed in username. Don't include that in translatable string.
...
List mentioned in:
http://xmpp.org/rfcs/rfc3920.html#nodeprep-prohibited
2010-11-29 19:34:26 +01:00
Alexey Shchepin
1d1496a667
Don't loop when there is nothing after a stream start
2010-11-26 17:08:00 +01:00
Alexey Shchepin
b3facf092a
Don't loop when there is nothing after a stream start
2010-11-25 20:33:51 +02:00
Badlop
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Badlop
808029b868
Fix http-bind supervisor to support multiple vhosts (EJAB-1321)
2010-11-17 20:31:28 +01:00
Andreas Köhler
cfd377b98e
Fix R12B5 compatibility in ejabberd_http_bind.erl (EJAB-1343)
...
erlang:max/2 and :min/2 are new functions
2010-11-17 13:01:17 +01:00
Badlop
f672fd0824
Added mod_register_web: web page for account registration (EJAB-471)
2010-11-05 18:19:52 +01:00
Badlop
2d08dcf11a
Fix errors detected by Dialyzer
2010-10-15 13:17:32 +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
350af319bf
fixes annoying crash with controller change
2010-10-08 19:26:49 +10: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
Eric Cestari
a45ecb70ff
[TECH-1511] debug traces reorganized
2010-09-16 15:08:53 +02:00
Eric Cestari
44832e12b3
Merge branch '2.2.x' into websockets
2010-09-16 11:07:12 +02:00
Eric Cestari
b0a81778af
[TECH-1511] preliminary XMPP support via websockets
2010-09-15 17:20:54 +02:00
Eric Cestari
c8567f1de2
[TECH-1511] Calls start() on handler to get a PID
2010-09-13 14:23:42 +02:00
Eric Cestari
35a0e27d04
[TECH-1511] clean support for websockets.
...
Added handlers in configuration file
2010-09-13 12:04:52 +02:00
Eric Cestari
c41bdea1f1
[TECH-1511] rough support for websockets
2010-09-10 17:14:58 +02:00
Eric Cestari
cccbf7de12
[TECH-1151] websockets are properly detected.
2010-09-10 15:04:19 +02:00
Eric Cestari
77136bccdf
[TECH-1151] websocket initial code
2010-09-10 14:06:26 +02:00
Eric Cestari
a77d53d738
[TECH-1068] Added missing catch in process function
2010-09-08 17:25:37 +02:00
Eric Cestari
09da9eeb95
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-08 15:32:21 +02:00
Christophe Romain
76d4ba66b2
merge 2.1.x to 2.2.x
2010-09-08 15:30:52 +02:00
Eric Cestari
f284fc3284
[TECH-1068] Atom feed is good enough.
2010-09-08 15:30:28 +02:00
Eric Cestari
86a59fb469
Implemented rough access_model access control.
2010-09-07 17:23:13 +02:00
Eric Cestari
31da259a75
HTTP Delete item
2010-09-07 16:42:12 +02:00
