Alexey Shchepin
bd91e2da16
Handle invalid input in ejabberd_websocket
2011-12-01 15:43:56 +02:00
Evgeniy Khramtsov
7b0174a626
Replace dont_concat with max_concat option
2011-10-18 23:44:00 +10:00
Evgeniy Khramtsov
2270df86d9
Use queue instead of a list in order to avoid O(N) complexity
2011-10-18 15:34:11 +10:00
Evgeniy Khramtsov
e5830253b9
New BOSH option: dont_concat (EJABS-1688)
2011-10-14 15:57:15 +10:00
Christophe Romain
adf56dedf3
fix merge conflicts from 2.1.9
2011-09-30 14:28:40 +02:00
Badlop
9f4ae07100
added svg mimetype to default content types (thanks to Markus Kohlhase)
2011-09-20 16:50:22 +02:00
Evgeniy Khramtsov
86f0a9790d
Do not crash on sync_send_all_state_event errors (part of EJABS-1708)
2011-09-16 16:44:24 +10:00
Evgeniy Khramtsov
7ae7d6315f
Remove useless clauses
2011-09-05 18:07:50 +10:00
Evgeniy Khramtsov
f1a91108ef
Correct some function clauses and value types
2011-09-05 16:31:58 +10:00
Evgeniy Khramtsov
b0b371d23a
Get rid of useless function clause
2011-09-05 15:06:43 +10:00
Badlop
dd772404c5
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/configure
src/ejabberd.app
src/ejabberd_auth_anonymous.erl
src/ejabberd_c2s.erl
src/ejabberd_sm.erl
2011-08-24 18:29:25 +02:00
Badlop
abebabc487
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
2011-08-16 19:33:22 +02:00
Evgeniy Khramtsov
5bef1a8f77
Now it is possible to migrate C2S/BOSH/MUC sessions.
...
Example usage:
$ ejabberdctl stop_migrate 30
This will migrate c2s/bosh/muc processes smoothly within 30 seconds and stop ejabberd.
The commit also resolves EJABS-1661
2011-08-13 19:05:21 +10:00
Evgeniy Khramtsov
4f1637fa40
Implement BOSH session migration
2011-08-12 23:48:39 +10:00
Evgeniy Khramtsov
796cb6634b
Get rid of sync call in send/2, process send_xml/2 failure gracefully
2011-08-05 18:10:56 +10:00
Evgeniy Khramtsov
bb5480756a
Get rid of "ip" state value
2011-08-05 18:04:01 +10:00
Evgeniy Khramtsov
edb030f49a
Get rid of "socket" state value
2011-08-05 17:58:02 +10:00
Evgeniy Khramtsov
0ed4ceebea
Complete API functions
2011-08-05 17:52:49 +10:00
Evgeniy Khramtsov
31f7eadfca
Use ?GEN_FSM macro whenever possible
2011-08-05 17:02:47 +10:00
Evgeniy Khramtsov
1c72c45404
Add shaper support
2011-08-05 15:53:57 +10:00
Evgeniy Khramtsov
f8fd9969e1
Return valid "inactivity" in session creation response
2011-07-28 16:39:17 +10:00
Evgeniy Khramtsov
8d09655a89
Reply on stream:start immediately if XMPP version is lower than 1.0
2011-07-28 16:31:10 +10:00
Evgeniy Khramtsov
a06b627631
Fix try/catch branch
2011-07-28 16:04:02 +10:00
Badlop
e690afc33b
Verify username provided in registration web form
2011-07-27 12:25:51 +02:00
Badlop
493b664f19
Handle case when ejabberd_auth_* says the account exists
2011-07-27 11:44:35 +02:00
Evgeniy Khramtsov
cb41c8ef80
Make work with buffers more abstract
2011-07-27 13:14:10 +10:00
Evgeniy Khramtsov
d4cea0f78f
Fix possible function clause
2011-07-27 12:12:44 +10:00
Evgeniy Khramtsov
4d20abd7b6
Process max_inactivity and max_pause config options
2011-07-26 21:44:35 +10:00
Evgeniy Khramtsov
351ad528f9
Prebind support
2011-07-26 19:27:54 +10:00
Evgeniy Khramtsov
006da5589e
Fix copyright header
2011-07-26 16:24:21 +10:00
Evgeniy Khramtsov
5f32dd3959
Use HTTP reason phrase to describe terminal binding errors
2011-07-26 16:19:04 +10:00
Evgeniy Khramtsov
a9269df2aa
Fix inactivity timer processing
2011-07-26 15:15:17 +10:00
Evgeniy Khramtsov
a7d82d6ecb
New BOSH implementation
2011-07-25 23:53:33 +10:00
Evgeniy Khramtsov
302294faec
HTTP prebinding support (TECH-1327)
...
Example configuration:
{modules,
[
...
{mod_http_bind, [{prebind, true}]},
...
]}
2011-07-06 18:04:26 +10:00
Evgeniy Khramtsov
41fad8956b
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd_c2s.erl
2011-05-30 23:29:41 +10:00
Badlop
ba9094a089
Add link in the Backup page to the Guide
2011-05-29 20:51:33 +02:00
Eric Cestari
d65b785f5d
Closing properly the XMPP websocket process
2011-05-09 11:02:22 +02:00
Evgeniy Khramtsov
c98ddeb59f
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd_captcha.erl
src/expat_erl.c
src/mod_muc/mod_muc_room.erl
2011-05-04 00:04:10 +10:00
Evgeniy Khramtsov
07cf6f09b8
Implement CAPTCHA limit
2011-04-18 16:06:36 +10:00
Badlop
70bf5b4eda
The responses to HEAD must have empty Body
2011-04-12 23:31:08 +02:00
Badlop
f59a979f7c
Support as read-only HTTP method not only GET, also HEAD
2011-04-12 23:13:46 +02:00
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
