Christophe Romain
75a85beb80
Merge branch 'master' of git+ssh://gitorious.process-one.net/ejabberd/mainline
2011-02-21 14:45:44 +01:00
Christophe Romain
0b7bb342cf
fix API issue for subscribe/unsubscribe (EJAB-1410)
2011-02-21 14:45:05 +01:00
Badlop
8f9bf47d78
New route_iq/5 accepting Timeout (thanks to Edwin Fine)(EJAB-1398)
...
Also new register_iq_response_handler/5
2011-02-21 13:46:59 +01:00
Christophe Romain
15749a2193
server must generate itemid if not given at publish time (EJAB-1409)
2011-02-21 12:08:58 +01:00
Badlop
60d83f937d
New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404)
2011-02-16 23:53:40 +01:00
Badlop
7060791e4e
New Indonesian translation (thanks to Irfan Mahfudz Guntur)(EJAB-1407)
2011-02-16 13:46:48 +01:00
Christophe Romain
72395ba497
fix empty pubsub payload check
2011-02-14 16:48:54 +01:00
Christophe Romain
4a2005f7cc
update copyright up to 2011
2011-02-14 13:47:22 +01:00
Badlop
90c711162b
Provide HTTPS URL in CAPTCHA form when listener has 'tls' option (EJAB-1406)
2011-02-14 13:01:46 +01:00
Badlop
7111ecc1b7
Fix typo in French translation
2011-02-11 20:21:24 +01:00
Badlop
e1cc8a90fa
Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)
2011-02-09 16:34:48 +01:00
Christophe Romain
96d1400792
typo fix
2011-02-09 16:32:11 +01:00
Christophe Romain
975e7f47ee
fix previous commit issues
2011-02-09 14:27:40 +01:00
Christophe Romain
2f681b05f3
refactor pubsub broadcast to allow large optimization
2011-02-08 19:08:38 +01:00
Badlop
a3dba06baf
Remove erroneous comment (EJAB-645)
2011-02-03 17:27:04 +01:00
Badlop
16a97ab903
Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379)
2011-01-31 19:50:56 +01:00
Badlop
d8f339bceb
Add to example config file access_from comment
2011-01-28 17:16:36 +01:00
Badlop
798d7bce1b
Fix unused variable when code was copied from mod_pubsub.erl
2011-01-27 16:42:27 +01:00
Badlop
a98193ea6e
Merge exmpp jlib.erl into ejabberd jlib.erl (EJAB-1377)
2011-01-27 16:30:55 +01:00
Pablo Polvorin
70a2200888
Fix initial presence after roster subscription approval (EJAB-1384)
...
Send initial presence after the roster subscription workflow
is complete.
2011-01-27 11:05:16 -03:00
Badlop
3391c9cad7
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-19 23:44:53 +01:00
Badlop
d5cfdc7f1f
Fix delayed response of a timeout call was reused for next login (EJAB-1385)
2011-01-19 19:27:52 +01:00
Badlop
caf64c035f
Subsecond timestamp granularity in offline messages (EJAB-1376)
2011-01-18 23:25:41 +01:00
Badlop
bec67378aa
Fix compilation bug in BOSH
2011-01-17 17:31:28 +01:00
Badlop
9bb4f124ad
Update NODE and HOST with the definitive values from ejabberdctl or command line
2011-01-17 17:28:12 +01:00
Christophe Romain
722fdd6bc7
check_start must grep processes for nodename last
2011-01-17 16:55:00 +01:00
Christophe Romain
d34dab4822
improve check_start, avoid false process match with grep
2011-01-17 16:52:20 +01:00
Badlop
ad357c2f59
Clarify error message when BOSH query is sent to non-running module
2011-01-14 15:48:22 +01:00
Badlop
2d0d46e296
Option to reject S2S connection if untrusted certificate (EJAB-464)
2011-01-11 16:38:33 +01:00
Badlop
d523901ddc
Include From attribute in the stream header of outgoing S2S connections
2011-01-11 16:38:32 +01:00
Badlop
41fc44e55f
When TLS is required in s2s, add subelement to stream:features starttls
2011-01-11 16:38:30 +01:00
Badlop
befb4fc7ea
Add option to require encryption in S2S connections (EJAB-495)
2011-01-11 16:38:28 +01:00
Pablo Polvorin
54557cb867
Send correct from/to attributes in s2s dialback response (EJAB-1363).
...
We were sending swapped from/to attributes when replying to db:verify requests.
Some servers don't mind about this, but others like prosody checks this and
rejects the verification, the s2s connection in that case couldn't be established.
2011-01-10 17:46:07 -03:00
Badlop
2d3efdf983
Fix old unresolved merge conflicts in pg.sql
...
Please note that ejabberd takes care to create the tables in your
ODBC database if needed. The file pg.sql is provided for reference
purposes only, as it isn't needed when preparing the database.
2011-01-09 18:51:24 +01:00
Badlop
159529d539
Add start time information in ejabberd log
...
One way to print that information is to configure in ejabberd.cfg
{loglevel, {4, [{ejabberd_app, debug}]}}.
2011-01-05 18:38:01 +01:00
Badlop
e3d875d09f
Several bugfixes in Caps (thanks to Karim Gemayel)
...
- fix bug with caps 2.0: ERRORs were logged in some cases
- enhance record definitions
- turn string() data into binary() ones
- remove mod_caps:node_to_binary/2, mod_caps:features_to_binary/1 and mod_caps:binary_to_features/1.
Tested with Psi+ (caps 1.0) and OneTeam (caps 2.0), and they now don't produce ERROR REPORTs.
2010-12-30 20:32:01 +01:00
Badlop
ea84f802e5
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:49:26 +01:00
Badlop
20c4919eda
Revert buggy previous commit (thanks to W. Andrew Loe III), and add better fix
2010-12-30 13:49:07 +01:00
Badlop
9cbf08700d
Provide stacktrace in log report when a transaction fails
2010-12-30 13:47:15 +01:00
Badlop
ff455f1a42
Don't delete the whole table, as other module instances may already have started rooms.
2010-12-30 13:44:53 +01:00
Evgeniy Khramtsov
a4728d14d5
Change c2s state before offline messages resending
2010-12-28 21:12:33 +09:00
Christophe Romain
f2925d8efc
new caps processing and related fixes in ejabberd_c2s.erl and miscellaneous fixes in mod_pubsub.erl (Thanks to Karim Gemayel)(EJAB-620)
2010-12-24 16:21:28 +01:00
Badlop
4b0a7fe307
Only call mod_roster when the user is in a local vhost, fixing EJAB-869
2010-12-23 21:05:21 +01:00
Badlop
980d9c37ea
Fix bug introduced with an old commit (EJAB-72)
2010-12-23 19:19:00 +01:00
Alexey Shchepin
a40e9c2626
Remove version=1.0 from stream opening when TLS is not available (thanks to Karim Gemayel)
2010-12-23 16:28:35 +02:00
Badlop
897141c9e1
Delete obsolete modules, because now the standard ones use gen_storage
2010-12-23 14:19:59 +01:00
Badlop
d20b6dccb3
Remove log line that was intended only for debugging during development
2010-12-23 13:30:41 +01:00
Badlop
fe909a45e9
Allow auth modules to provide SASL errors; default is "not-authorized".
...
See
http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-7.4
2010-12-23 13:27:24 +01:00
Alexey Shchepin
bb4a87806f
Make jlib:ip_to_list safe to use
2010-12-23 13:17:14 +01:00
Badlop
7ca1c0387c
Clean muc_online_room when mod_muc starts (EJAB-1365)
2010-12-23 02:16:00 +01:00