Evgeniy Khramtsov
96800e9b75
Get rid of useless mnesia transaction (EJAB-1502)
2011-10-14 16:57:51 +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
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
Eric Cestari
363711a370
New features :
...
- edit an item
- edit node configuration
2010-09-07 16:22:57 +02:00
Eric Cestari
bf98fa0c01
Added node creation with configure form
...
Added deletion
Better behavior in case of a crash (returns 500)
2010-09-07 14:35:40 +02:00
Eric Cestari
cd923838c3
Making progress on the Atom interface.
...
- GET items
- POST items
- GET nodes
HTTP error codes now are the ones XMPP returns.
2010-09-07 11:32:14 +02:00
Eric Cestari
a22ebd3c49
Added support for GET a single item
...
and GET an atom feed of a node
2010-09-03 15:54:51 +02:00
Eric Cestari
353d16b8ef
Post to pubsub using http POST :
...
{5280, ejabberd_http, [
http_poll,
web_admin,
{request_handlers, [{["pshb"], pshb_http}]} % this should be added
]}
To post to a node the content of the file "sam.atom" on the "foo", on the localhost virtual host, using cstar@localhost
curl -u cstar@localhost:encore -i -X POST http://localhost:5280/pshb/localhost/foo -d @sam.atom
2010-09-02 16:57:21 +02:00
Badlop
d87fff1a4c
Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov)
2010-08-19 17:38:38 +02:00
Christophe Romain
7be707f7bc
Merge branch '2.1.x' into 2.2.x
2010-08-05 10:20:47 +02:00
Badlop
367353100b
Don't say v1.2, because that number is never increased and is confusing
2010-07-28 19:59:39 +02:00
Christophe Romain
628571f8cf
merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash
2010-07-13 12:04:30 +02:00
Badlop
12e00c57f9
When using OTP R14, use public_key library instead of old ssl (EJAB-953)
2010-07-12 13:57:07 +02:00
Evgeniy Khramtsov
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00