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
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
808029b868
Fix http-bind supervisor to support multiple vhosts (EJAB-1321)
2010-11-17 20:31:28 +01: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
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
d4ec7a2f01
New optional BOSH connection attribute process-delay (EJAB-1257)
2010-06-07 13:44:55 +02:00
Badlop
6867ca43e4
Cross-domain HTTP-Bind support (thanks to Jack Moffitt)(EJAB-1168)
2010-02-15 22:42:59 +01:00
Badlop
7b76fdcde7
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2891
2010-01-12 16:11:32 +00:00
Badlop
58425ba45d
Show informative webpage when browsing the HTTP-Poll page (EJAB-1106)
...
SVN Revision: 2751
2009-11-23 15:21:05 +00:00
Badlop
19fbe884d7
Add forgotten copyright and license notices.
...
SVN Revision: 2258
2009-06-16 17:48:27 +00:00
Badlop
20060d9cf6
Changed the place where database is created(thanks to Michael Remond)
...
SVN Revision: 2249
2009-06-16 17:47:47 +00:00
Badlop
feded4b0b7
Fix warning of unused Host variable
...
SVN Revision: 2246
2009-06-16 17:47:17 +00:00
Badlop
2d9f715d65
Retrieve correct IP from http connection (thanks to Christohpe Romain)
...
SVN Revision: 2240
2009-06-16 17:46:51 +00:00
Badlop
44c2259a43
Fix syntax error. (thanks to Jerome Sautret)
...
SVN Revision: 2239
2009-06-16 17:46:46 +00:00
Badlop
17de26d800
Removed HTTP bind session count. Removed the 'sponsored bind session' text. (thanks to Michael Remond)
...
Details:
Removed the HTTP bind session count because it leaks information on the size of the platform.
Removed the text 'sponsored by Mabber' because it is confusing, as people could think a third-party service using HTTP bind is sponsored by Mabber.
SVN Revision: 2238
2009-06-16 17:46:42 +00:00
Badlop
154a0d1c96
Do not display error message when starting several hosts (EJAB-571) (thanks to Christohpe Romain)
...
SVN Revision: 2237
2009-06-16 17:46:37 +00:00
Badlop
1626ede210
Provide explanation in error message when module is already started for another vhost
...
SVN Revision: 2236
2009-06-16 17:46:33 +00:00
Badlop
d036802891
Remove Erlang module attribute 'vsn' because it does not provide any worth feature, and it difficults hot code update (EJAB-440)
...
SVN Revision: 2232
2009-06-16 17:46:16 +00:00
Badlop
261b7dc0d9
Migration code for people using previous version of the HTTP binding module (EJAB-390)
...
SVN Revision: 2230
2009-06-16 17:46:08 +00:00
Badlop
4ed01b98de
Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain)
...
SVN Revision: 2211
2009-06-16 17:44:38 +00:00
Badlop
70fd795a1b
Reverted to r76 as 97 is completely broken and should not have been checked in at all (thanks to Stefan Strigler)
...
SVN Revision: 2207
2009-06-16 17:44:13 +00:00
Badlop
2e402c27f4
Minor changes (thanks to Stefan Strigler)
...
SVN Revision: 2206
2009-06-16 17:44:08 +00:00
Badlop
673a7aad55
Disabled debug (thanks to Stefan Strigler)
...
SVN Revision: 2205
2009-06-16 17:44:04 +00:00
Badlop
88d32b1064
Deal with return values from starting/terminating supervisor (thanks to Stefan Strigler)
...
SVN Revision: 2204
2009-06-16 17:44:00 +00:00
Badlop
da6c4f9941
Start supervisor here (thanks to Stefan Strigler)
...
SVN Revision: 2200
2009-06-16 17:43:43 +00:00
Badlop
7ed7ca6e1e
Make use of new api for plugable http based services (thanks to Stefan Strigler)
...
SVN Revision: 2199
2009-06-16 17:43:39 +00:00
Badlop
bbe82647e8
Initial commit of HTTP-Bind source code (thanks to Stefan Striegler)
...
SVN Revision: 2198
2009-06-16 17:43:35 +00:00
