Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-09-15 13:51:17 +02:00
Code Releases Activity
3,028 Commits 7 Branches 108 Tags 62 MiB
df921fef40
Commit Graph

2612 Commits

Author SHA1 Message Date
Badlop
ba9094a089 Add link in the Backup page to the Guide 2011-05-29 20:51:33 +02:00
Badlop
bfebcebeb7 Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695) 2011-05-27 11:47:22 +02:00
Badlop
1c0b99e162 A user can query his own Last activity, even if not subscribed to oneself 2011-05-26 12:50:40 +02:00
Badlop
f850bcbbc9 Several fixes and improvements in ejabberd.init.template 
Changes:
* Set script as executable
* Add LSB tags and overrides, copied from Debian's ejabberd package
* Add chkconfig support (thanks to Ivan Martinez)(EJAB-1450)
* Don't use nounset, as that breaks when no argument is provided
* Add status command
 2011-05-24 23:46:44 +02:00
Badlop
133b8d42a3 Disable all entity expansions (thanks to Alexey Shchepin)(EJAB-1451) 2011-05-24 13:12:28 +02:00
Evgeniy Khramtsov
7bc879c6f4 When checking captcha setup, try to generate image only when captcha is enabled in order to avoid logging of confusing error 2011-05-18 12:48:02 +10:00
Badlop
f7d532f2f7 When module start fails during server start, stop erlang (EJAB-1446) 2011-05-16 22:33:59 +02:00
Christophe Romain
3785b3e951 add index migration code 2011-05-16 17:19:42 +02:00
Evgeniy Khramtsov
70e1545d3a Monitor only noconnection events 2011-05-16 18:01:51 +10:00
Alexey Shchepin
8aaf9bffa0 Resend queue to self before calling terminate 2011-05-13 14:53:04 +03:00
Eric Cestari
d65b785f5d Closing properly the XMPP websocket process 2011-05-09 11:02:22 +02:00
Evgeniy Khramtsov
8806fdc1c2 Implement C2S redirection 
- The feature is based on <see-other-host/> stream error, see RFC6120, 4.9.3.19
- To enable the feature you must set {redirect, true} in C2S listener section and set global "hostname" option on all nodes in cluster. The hostname must be string in the form as described in the RFC, for example: "foo.org", "foo.org:5222", "1.2.3.4", "[2001:41D0:1:A49b::1]:9222" and so on
 2011-05-09 14:02:08 +10:00
Christophe Romain
17abbf3d82 Owner can delete any items from its own node (EJAB-1445) 2011-05-06 13:58:49 +02:00
Evgeniy Khramtsov
1922bf21f0 Do not try to start TLS twice when front-end socket is used 2011-05-05 19:02:34 +10:00
Evgeniy Khramtsov
dfbfd90f8c Take into consideration internal queue length when sorting processes queues 2011-05-05 16:08:28 +10: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
613214da18 Do not add p1:pushed more than once 2011-05-03 23:01:05 +10:00
Evgeniy Khramtsov
84c1cf8033 Do not accept XML with undefined prefixes (EJAB-680) 2011-05-03 20:26:07 +10:00
Evgeniy Khramtsov
38693a670b Process ejabberd_sm messages using several dispatchers (EJABS-1653) 2011-05-02 22:37:33 +10:00
Badlop
5a0cfe7e2b Reorganize the push_item function, and handle version not_found (EJAB-1420) 2011-04-29 20:34:08 +02:00
Badlop
714dce84db No need to inform that XEP-0237 is optional; clarified in XEP version 1.2 2011-04-29 20:34:06 +02:00
Evgeniy Khramtsov
a97a60a888 Fix previous merge 2011-04-29 20:53:15 +10:00
Evgeniy Khramtsov
49365da481 Stringprep JID before get_node calculation 2011-04-27 15:22:25 +10:00
jabber
70e84021f2 Remove global lock if there are no nodes available 2011-04-27 15:17:54 +10:00
Evgeniy Khramtsov
24e033ac79 Initialize cluster before modules start 2011-04-27 15:15:49 +10:00
Evgeniy Khramtsov
658ab235ba Get rid of pg2 in cluster nodes 2011-04-27 15:15:19 +10:00
Evgeniy Khramtsov
2f16a160c0 Shadow unused variable 2011-04-27 15:07:18 +10:00
Evgeniy Khramtsov
4a2f62062e New migration procedure 2011-04-27 15:07:10 +10:00
Badlop
4f4c8eb61e mod_register Access now also controls account unregistrations 2011-04-26 22:55:04 +02:00
Badlop
3952888f94 Escape user input in mod_privacy_odbc (EJAB-1442) 2011-04-26 20:57:48 +02:00
Badlop
9b145385af Throw error when captcha fails at server start, not later at runtime 2011-04-26 13:59:08 +02:00
jabber
897b46c31d Do not decrease MUC admin's role/affiliation 2011-04-18 21:06:05 +10:00
Evgeniy Khramtsov
72299ab078 Add captcha_limit option to the example config 2011-04-18 16:16:10 +10:00
Evgeniy Khramtsov
e7ab83b612 Remove forgotten -compile(export_all). 2011-04-18 16:09:05 +10:00
Evgeniy Khramtsov
07cf6f09b8 Implement CAPTCHA limit 2011-04-18 16:06:36 +10:00
Evgeniy Khramtsov
252ee6228b Fix syntax error 2011-04-18 15:50:24 +10:00
Evgeniy Khramtsov
cf6264f507 CAPTCHA whitelist support 2011-04-18 15:47:06 +10:00
Badlop
4f1ececbd1 Try to improve support for roster_version in MSSQL (EJAB-1437) 2011-04-14 23:11:37 +02: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
Badlop
05e3893f60 If extauth script crashes, ejabberd should restart it (EJAB-1428) 2011-04-11 21:27:19 +02:00
Badlop
7d7621c67c Support more captcha_host value formats (EJAB-1418) 2011-04-11 19:59:26 +02:00
Christophe Romain
33d4126290 merge with latest 2.1.x (pre 2.1.7) 2011-04-11 15:47:04 +02:00
Badlop
449e56ed52 Send jid attribute when occupant is banned (EJAB-1432) 2011-04-07 12:54:39 +02:00
Badlop
aded966370 mod_ping uses iqdisc no_queue by default (thanks to Chris Moos)(EJAB-1435) 2011-04-07 12:08:31 +02:00
Badlop
90ea752046 Updated Japanese translation (thanks to Mako N) 2011-03-30 19:18:26 +02:00
Alexey Shchepin
494add4fd0 Updated rebind from the latest 2.2.x-applepush branch 2011-03-21 19:11:05 +02:00
Christophe Romain
3b7458bbc2 fir state initialization 2011-03-18 18:59:44 +01:00
Christophe Romain
f05a4d1638 typo fix 2011-03-18 17:41:56 +01:00
Christophe Romain
75d2cbcb14 add nodeidx as index on pubsub_state and pubsub_item 2011-03-18 17:36:08 +01:00
Christophe Romain
f9fa168d84 prevent from creating empty pubsub_subscription record 2011-03-18 15:17:13 +01:00
Badlop
e4b3bd5005 Fix typo (thanks to Krzee) 2011-03-17 12:15:31 +01:00
Christophe Romain
5ad1d08b89 SSL sockets don't compute length of data (EJABS-1460) 2011-03-15 13:53:38 +01:00
Christophe Romain
dcb068c7ad Correctly handle ssl requests split into multiple ip (EJABS-1460) 2011-03-15 13:52:35 +01:00
Christophe Romain
2d32d2f25e Enable workarounds for broken clients in tls layer (EJABS-1460) 2011-03-15 13:51:49 +01:00
Badlop
abcbcd1f2c Update the changed string in the PO translation files 2011-03-13 18:34:55 +01:00
Badlop
18fd67b311 Change string in WebAdmin to reuse an existing one 2011-03-13 18:34:50 +01:00
Badlop
b116957982 Fix bashism and make some lines similar to master branch (EJAB-1404) 2011-03-09 16:25:05 +01:00
Badlop
a1f20a5bc0 If the port number isn't listener, then specify the protocol (EJAB-1418) 2011-03-03 11:38:00 +01:00
Badlop
e0d14c3b8d captcha_host must have the port number to get protocol (EJAB-1418) 2011-03-03 00:02:43 +01:00
Badlop
1548a18b5e mod_irc must send presence unavailable to the departing occupant (EJAB-1417) 2011-03-01 22:33:11 +01:00
Badlop
339fa6e41b ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416) 2011-02-28 18:40:45 +01:00
Badlop
db0962804d Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349) 2011-02-22 23:44:45 +01:00
Badlop
677d8b1a29 Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391) 
New version of the @online@ patch originally by Collabora.
Notes:
- the presence push is mediated via the group rather than
  per user - this may reduce memory footprint... _if_ ejabberd
  has some smart optimisation in that codepath
- it assumes that any group with membership @online@ _displays_
  online as well -- this is a simplification and breaks the
  decoupling that ejabberd has in this regard.
 2011-02-21 22:34:15 +01:00
Badlop
850218c2df Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385) 2011-02-21 16:13:41 +01:00
Badlop
1c89914382 New route_iq/5 accepting Timeout (thanks to Edwin Fine)(EJAB-1398) 
Also new register_iq_response_handler/5
 2011-02-21 13:44:39 +01:00
Badlop
fe40a9c5f6 New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404) 2011-02-16 23:53:29 +01:00
Badlop
bc0ae5a017 New Indonesian translation (thanks to Irfan Mahfudz Guntur)(EJAB-1407) 2011-02-16 13:46:20 +01:00
Christophe Romain
8e68e89816 Merge remote branch 'mainline/2.1.x' into 2.2.x 2011-02-15 10:48:27 +01:00
Christophe Romain
91ab7e029b fix empty pubsub payload check on odbc version 2011-02-14 16:45:49 +01:00
Christophe Romain
c3a88c713b fix empty pubsub payload check 2011-02-14 16:41:32 +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
Badlop
f91eb52890 Provide HTTPS URL in CAPTCHA form when listener has 'tls' option (EJAB-1406) 2011-02-14 13:11:21 +01:00
Badlop
ca59a7f027 Fix typo in French translation 2011-02-11 20:19:59 +01:00
Evgeniy Khramtsov
01689bc6b9 Ack support (TECH-1261) 2011-02-11 13:42:55 +09:00
Badlop
6dea2d2307 Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399) 2011-02-09 16:38:54 +01:00
Christophe Romain
024a80d41f port previous pubsub changes to _odbc 2011-02-08 18:29:52 +01:00
Christophe Romain
f485109c39 refactor pubsub broadcast to allow big optimization 2011-02-08 17:14:19 +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
650b2802b5 Remove erroneous comment (EJAB-645) 2011-02-03 17:23:09 +01:00
Badlop
6ddc66db9f Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379) 2011-01-31 19:43:28 +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
Badlop
792512459d mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388) 2011-01-31 18:52:07 +01:00
Badlop
0359e345b0 Add to example config file access_from comment 2011-01-28 17:13:44 +01:00
Badlop
36166aa40e Comment unused code 2011-01-28 12:11:34 +01:00
Badlop
a25c9c5df3 Don't let presence-in privacy rule block a presence subscription using ODBC (EJAB-255) 2011-01-19 20:58:57 +01:00
Badlop
6e3a9ac4fd Fix delayed response of a timeout call was reused for next login (EJAB-1385) 2011-01-19 19:06:46 +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
Christophe Romain
92f5509b35 improve check_start only matching node process 2011-01-18 13:36:46 +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
5632901820 Fixed 2.1.6 compile error 2011-01-07 16:00:10 +01:00
Eric Cestari
92b6c12420 Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2011-01-07 15:54:00 +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
Mickaël Rémond
4a9e7f0a3a Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226). 
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
 2011-01-05 14:36:21 +01:00
Mickaël Rémond
bd43505db9 Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226). 
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
 2011-01-04 15:21:10 +01:00
Christophe Romain
cffe224d4a log and drop messages only from autofilter 2011-01-03 15:26:44 +01:00
Christophe Romain
15c27c9ddd fix bad jid issue 2011-01-03 09:52:12 +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
149f8e2b45 Merge remote branch 'mainline-2.1.x/2.1.x' into 2.2.x 
Conflicts:
	src/ejabberd.app
 2010-12-28 21:17:01 +09:00
Evgeniy Khramtsov
4c8b034874 Change c2s state before offline messages resending 2010-12-28 21:09:15 +09:00
Eric Cestari
2ab31cb613 Merge branch '2.2.x-applepush' into 2.2.x 
Without applepush
Conflicts:
	src/ejabberd_c2s.erl
	src/ejabberd_c2s.hrl
 2010-12-23 15:30:14 +01:00
Alexey Shchepin
b47c50145d Make jlib:ip_to_list safe to use 2010-12-20 19:29:05 +02:00
Badlop
b9f4daca46 Revert branch name back to 2.1.x 2010-12-20 13:10:33 +01:00
Evgeniy Khramtsov
606c207e21 Make sure 'closed' event is correctly processed on every state 2010-12-17 17:26:20 +09:00
Evgeniy Khramtsov
03870f962c Fix user_receive_packet hook 2010-12-16 23:54:02 +09:00
Evgeniy Khramtsov
405e9b24b0 Fix get_sessions/2 function 2010-12-16 23:47:53 +09: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
3e9c9fc750 Remove Type and Spec, backport list comprehensions, so R12B-5 can compile 2010-12-13 12:17:28 +01:00
Badlop
6242fd2bb8 Update ejabberd version number to 2.1.6 2010-12-13 11:15:18 +01:00
Badlop
1c566057f8 Recompile translations 2010-12-13 11:15:16 +01:00
Badlop
6dd35923b0 Fix warning about unused variables 2010-12-13 11:14:39 +01:00
Badlop
b9bbe19d4c Option to reject S2S connection if untrusted certificate (EJAB-464) 2010-12-11 02:29:53 +01:00
Badlop
44b2002504 Include From attribute in the stream header of outgoing S2S connections 2010-12-11 02:29:52 +01:00
Badlop
faf422202f When TLS is required in s2s, add subelement to stream:features starttls 2010-12-11 02:29:50 +01:00
Badlop
eb884c80d0 Add option to require encryption in S2S connections (EJAB-495) 2010-12-11 02:29:48 +01:00
Badlop
b83dd9f954 Support for X-Forwarded-For HTTP header (EJAB-1356) 2010-12-07 16:47:55 +01:00
Christophe Romain
fd828c3e9b update pubsub_odbc patch 2010-12-07 14:00:40 +01:00
Christophe Romain
79648ce853 add node attribute to pubsub subscribe event (EJAB-1361) 2010-12-07 13:51:10 +01:00
Badlop
ddc94a8c96 Update Czech Translation (thanks to Lukáš Polívka) 2010-12-06 12:04:12 +01:00
Badlop
aa413d63da Fix detection of mod_last at server start (EJAB-641) 2010-12-03 17:26:12 +01:00
Alexey Shchepin
21f2817f40 Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x 2010-12-03 16:40:22 +02:00
Alexey Shchepin
31e4ccf78b Fixed "To" variable in ejabberd_c2s:roster_change 2010-12-03 16:39:04 +02:00
Evgeniy Khramtsov
bfedd21c98 Disable error/1 auto-import (introduced in R14) 2010-12-03 23:38:18 +09:00
Pablo Polvorin
0e5b0b43fa Revert "Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)" 
This reverts commit c890b17834.
This change made ejabberd more strict in protocol compliance, which breaks Psi 0.14 and other clients.
We must grant a grace period to client developers to fix their clients. So this isn't going to be included
in 2.1.x.
 2010-12-03 11:12:43 -03:00
Badlop
8258f5940b Support PostgreSQL 9.0 (EJAB-1359)(thanks to Stephen Gibberd and Konstantin Nikiforov) 2010-12-03 12:43:05 +01:00
Pablo Polvorin
c890b17834 Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476) 
Fix sasl digest bug when username|password|resource strings had
all characters <= U+00FF and at least one character >= U+0080.

Warnning:
Note that by fixing the bug, we may be broking compatibility with clients
that "implements" it.
See comments on https://support.process-one.net/browse/EJAB-476
 2010-12-02 12:55:06 -03:00
Christophe Romain
f0a848ef45 fix pubsub cross domain eventing (EJAB-1340) 2010-12-02 13:56:45 +01:00
Evgeniy Khramtsov
9f3cdad3f7 Do not add "jabber❌delay" more than once 2010-12-01 15:19:07 +02:00
Alexey Shchepin
931866ee33 Added ssl:connect timeout 2010-12-01 15:18:46 +02:00
Badlop
20d66e6736 Update Greek translation (thanks to James Iakovos Mandelis) 2010-12-01 13:28:20 +01:00
Evgeniy Khramtsov
731c9b86e0 Increase maximum restart strategy of the ODBC supervisor. Do not brutally kill ODBC processes on supervisor shutdown to avoid polution of the mnesia table 2010-12-01 14:24:51 +09:00
Badlop
955343f6aa When the Password attribute is missing in PIEFXIS file, don't check account auth. 2010-12-01 00:55:09 +01:00
Otavio Fernandes
1b73ac5118 Corrections on pt_BR translations. 2010-11-30 22:43:04 +01:00
Badlop
9ee8191939 Update Ukrainian translation (thanks to Ruslan Rakhmanin) 2010-11-30 22:43:02 +01:00
Christopher tofu Zorn
f2231a2282 expose find_connection for routing in other modules (if needed) 2010-11-29 20:05:39 +01: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
3e67200d64 Update mod_register_web string in PO files 2010-11-29 19:35:18 +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
Badlop
26ac75bdc9 Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301) 2010-11-29 14:36:09 +01:00
Alexey Shchepin
1d1496a667 Don't loop when there is nothing after a stream start 2010-11-26 17:08:00 +01:00
Andreas Köhler
e34eebb5ad Correct domain_certfile tlsopts modifications for s2s connections (EJAB-1086) 
* In ejabberd_s2s_out:wait_for_feature_request/2, the domain to use for
  looking up domain_certfile options is #state.myname and not
  #state.server

* If s2s_certfile is not specified, connect should still be part of the
  tls options used by ejabberd_s2s_out

* Add #state.server to ejabberd_s2s_in processes and store the to
  attribute in :wait_for_stream/2. Then use that server in
  :wait_for_feature_request/2 to change the tls options like in
  ejabberd_s2s_out.

Fixes EJAB-1086.
 2010-11-26 00:14:46 +01:00
Badlop
776930fa06 Update French translation (thanks to Nicolas Vérité) 2010-11-25 21:31:21 +01:00
Badlop
38af7c85a6 Update German translation (thanks to Nikolaus Polak) 2010-11-25 21:31:19 +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
99b7a285d7 Update Japanese translation (thanks to Tsukasa Hamano) 2010-11-24 17:10:54 +01:00
Badlop
19e20f75d7 Update Chinese translation (thanks to Shelley Shyan) 2010-11-24 13:42:19 +01:00
Evgeniy Khramtsov
b8d6aee1ce Merge branch 'caps' into 2.1.x 
Conflicts:
	src/ejabberd_c2s.erl
 2010-11-24 16:45:05 +09:00
Otavio Fernandes
48b768b5b0 Updating Brazilian Portuguese (pt_BR) translations for v2.1.6 2010-11-23 17:54:37 +01:00
Badlop
bd604945c9 Update Polish translation (thanks to Zbyszek Żółkiewski) 2010-11-23 13:07:14 +01:00
Badlop
0a59ebe405 Use pg2 from R14B in systems with older versions (EJAB-1349) 
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
 2010-11-22 16:04:07 +01:00
Christophe Romain
32eaa01929 Revert "populate pubsub#roster_groups_allowed in node configuration options (EJAB-1344)" 
This reverts commit dfaeb3bc88.
 2010-11-22 11:15:04 +01:00
Badlop
12aaa0125b Update Russian translation (thanks to Evgeniy Khramtsov) 2010-11-19 15:15:47 +01:00
Badlop
cb7cd9abb8 Update translate files 2010-11-19 13:47:24 +01:00
Badlop
ca701e1675 Update the Spanish translation 2010-11-19 13:45:32 +01:00
Badlop
9b88fd6646 Fix some English strings 2010-11-19 13:44:30 +01:00
Badlop
76ca7ae7f0 Translate mod_register_web to Ukrainian (thanks to Rain) 2010-11-19 00:23:40 +01:00
Badlop
043effc3ce Translate mod_register_web to Spanish 2010-11-17 23:16:46 +01:00
Badlop
4fd1a8ba63 Translate mod_register_web to Russian (thanks to Rain) 2010-11-17 22:42:43 +01:00
Badlop
36303fb4be Update strings to translate 2010-11-17 22:36:56 +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
Andreas Köhler
6eeb355a22 Use LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-1342) 2010-11-17 12:57:05 +01:00
Evgeniy Khramtsov
a0e2e943b4 Do not start mod_proxy65 if it is unable to bind an address (EJAB-1336) 2010-11-17 18:13:19 +09:00
Evgeniy Khramtsov
78931d8efa Use MEDIUMTEXT type for vcard avatars in MySQL schema (EJAB-1252) 2010-11-17 17:36:51 +09:00
Evgeniy Khramtsov
0d2a8cd04f Do not print full error message when LDAP timeout occurs (EJAB-1324) 2010-11-17 17:14:47 +09:00
Evgeniy Khramtsov
97087eb3b9 Set SSL_MODE_RELEASE_BUFFERS mode when available (EJAB-1351) 2010-11-17 13:54:27 +09:00
Badlop
6eeef62ce4 Provide new, not old, affiliation in kick/ban presence with codes 321 and 301 2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599 Strip status when needed in presence-unavailable as well 2010-11-15 13:47:31 +09:00
Badlop
325fb8caef Fix typos in the example configuration file 2010-11-12 21:24:01 +01:00
Andreas Köhler
18ef908759 Before binding tcp ports, checks the socket type and listener options 
If the callback module has a socket type of independent and needs to
create the listener itself, do not pre-bind the port. The same holds if
there are errors in the listener configuration.
 2010-11-10 23:46:18 +01:00
Andreas Köhler
1f1d2bd5f5 Bind listener ports early and start accepting connections later 
It may happen that auth or rdbms client tcp connections bind a local
socket to a port number required by a configered listener. The ejabberd
applications fails to start up and needs to be restarted.

In plain C you would bind(2) the listener port and listen(2) later on.
gen_tcp:listen/2 does not allow to separate these two steps though, so
another way is not to accept connections while start up. OTOH, the
kernel will syn/ack incoming connections and receive data, leaving them
in a buffer for the ejabberd to read from. If this is unwanted, a load
balancer would need to receive data from the ejabberd server before
adding the node to its pool.

This patch binds tcp ports while initializing the ejabberd_listener
process, storing ListenSockets in an ets table. start_listeners/0 will
reuse these ports later on.
 2010-11-10 23:46:16 +01:00
Andreas Köhler
0c484369c9 In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one 
Fixes problem 2 of EJAB-1158.
 2010-11-10 15:40:04 +01:00
Andreas Köhler
100f2e9a13 Refactor mod_last to use the same core get_last/2 functionality, but keep api stable 
The local function get_last/4 has been renamed to get_last_iq/4, since
it converts the result of get_last/2 (typically {ok, TimeStamp, Status})
to an iq packet.
 2010-11-10 15:40:03 +01:00
Andreas Köhler
510fd8cf73 Before forwarding last activity requests to a user, check that the user's presence is visible for From 
According to XEP-0012, 4. Online User Query, "if the requesting entity
is not authorized to view the user's presence information (normally via
a presence subscription as defined in XMPP IM), the user's server MUST
NOT deliver the IQ-get to an available resource but instead MUST return
a <forbidden/> error in response to the last activity request."

So check for a subscription of from of the jid and bare jid and whether
outgoing presences to From are allowed.

Fixes problem 3 of EJAB-1158.
 2010-11-10 15:40:01 +01:00
Andreas Köhler
080922a3de Remove dead code for NS_VCARD iq packets from ejabberd_c2s 
For EJAB-1045, the special NS_VCARD block for handling incoming vcard
iqs on behalf of clients has already been restricted to cases where the
user or resource part of the recipient is empty. But then the packets
should not have been routed to the c2s process anyway. This patch
completely removes it.
 2010-11-10 15:40:00 +01:00
Andreas Köhler
cb7d8c8ead Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module 2010-11-10 15:39:59 +01:00
Andreas Köhler
c47252aea1 Use c2s state data as user and server in ejabberd_c2s:is_privacy_allow 
is_privacy_allow is only used in ejabberd_c2s:handle_info/3 to determine
for a few presence types whether the packet is allowed to be forwarded
to the user's client. This only makes sense if To#jid.user and
To#jid.server match StateData#state.user and StateData#state.server.

Also, add the atom in as parameter to a new argument Dir of
is_privacy_allow and extract from that function
privacy_check_packet(StateData, From, To, Packet, Dir) which runs the
privavcy check without converting allow/deny to true/false.
 2010-11-10 15:39:57 +01:00
Andreas Köhler
f96074057c Correct error responses of forbidden offline last activity queries 
According to XEP-0012 Last Activity, the server must return iq errors
with forbidden instead of not-allowed.

Fixes problem 1 of EJAB-1158.
 2010-11-10 15:39:55 +01:00
Christophe Romain
dfaeb3bc88 populate pubsub#roster_groups_allowed in node configuration options (thanks to Karim Gemayel)(EJAB-1344) 2010-11-10 15:15:03 +01:00
Christophe Romain
c31f59e326 fix bad plugin order issue injected in previous patch (EJAB-1286) 2010-11-09 14:32:40 +01:00
Andreas Köhler
7c2b9eaf97 Correct privacy check direction in mod_last (EJAB-1339) 
The change for EJAB-1271 to change the direction of the privacy check
from out to in violates the idea that the check should imitate a
subscription state check of from. Rather correct the order of the From
and To parameters.
 2010-11-09 13:57:57 +01:00
Andreas Köhler
79f5251d69 Change max restart strategy of ejabberd_odbc_sup to handle some SQL timeouts. 2010-11-08 18:41:03 +01:00
Christophe Romain
917e8640c2 avoid node_call to break transaction (thanks to Karim Gemayel)(EJAB-1286) 2010-11-08 11:16:51 +01:00
Andreas Köhler
c4bc0e7252 Re-raise exceptions caught in gen_mod:start_module/3 (EJAB-1335) 
Modules configured by the administrator normally should not be treated
as optional, so a exception (error, exit, throw) to start them should not
be caught and logged only.

This patch re-raises a caught exception instead of ignoring the
exception and inserting the module's opts on success. That way
gen_mod:get_module_opt/4 should work while calling Module:start/2.
 2010-11-07 00:49:52 +01:00
Evgeniy Khramtsov
1f16e4783c Take care of xml:lang attribute in unauthenticated stanzas as well 2010-11-06 13:58:52 +09:00
Badlop
7f3a5066c6 New ip_access option restricts which IPs can register (thanks to Alexey Shchepin)(EJAB-915) 2010-11-05 19:33:52 +01:00
Badlop
6f3713a67d Disable mod_register_web in default config because by default captcha is disabled 2010-11-05 19:33:50 +01:00
Badlop
f672fd0824 Added mod_register_web: web page for account registration (EJAB-471) 2010-11-05 18:19:52 +01:00
Evgeniy Khramtsov
60b36beda8 Disable LRU caching algorithm for LDAP shared rosters 2010-11-05 17:01:18 +09:00
Evgeniy Khramtsov
c4289095e0 Do not store long language tag to avoid possible DoS/flood attacks 2010-11-05 05:10:18 +09:00
Evgeniy Khramtsov
31757116fc LDAP shared roster support (thanks to Realloc and Marcin Owsiany) 2010-11-05 02:34:45 +09:00
Christophe Romain
70c1e1d0b1 enforce pubsub cleaner 2010-11-04 16:54:24 +01:00
Jonas Ådahl
2f68733708 Fixes a leak of ejabberd_receiver processes. 
When a (non-frontend) socket module without any custom receiver fails to
start, the newly created ejabberd_receiver process needs to be properly
closed.
 2010-11-03 17:10:52 +01:00
Badlop
184ec38510 Implement the mod_irc option default_encoding, it was already documented 
Related:
http://www.ejabberd.im/node/4270#comment-56609
http://www.ejabberd.im/node/4270#comment-56780
 2010-11-02 22:40:08 +01:00
Badlop
2d59efb515 Fix crash in ejabberd_c2s when blacklist hook returned true (thanks to Jonas Ådahl) 
Cause of the crash jlib:ip_to_list/1 only supports IP tuples using the
form {N1,N2,N3,N4} which is not the case when IPv6 is enabled.
 2010-11-02 13:51:36 +01:00
Evgeniy Khramtsov
195d22d906 Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x 2010-11-01 22:23:01 +09:00
Evgeniy Khramtsov
ab80513755 Do not run set_last request inside a transaction 2010-11-01 22:22:41 +09:00
Badlop
8a116411bb Fix errors in EDoc comments 2010-10-28 18:48:27 +02:00
Badlop
bd3889b6ec Include a Required xml element in the captcha field 2010-10-27 00:50:17 +02:00
Andreas Köhler
400fb69f15 Ignore Length argument to tls:recv/[23] (EJAB-1327) 
The Length argument cannot be used for gen_tcp:recv/3, because the
compressed size does not equal the desired uncompressed one.
 2010-10-26 19:32:15 +02:00
Andreas Köhler
9da45d40c7 Re-use the TLSSock argument in tls:send/2 (EJAB-1327) 2010-10-26 19:30:32 +02:00
Evgeniy Khramtsov
23db206ea1 * Add top-level instructions for x:data incompatible clients 
* Remove trailing dot
 2010-10-26 03:47:14 +10:00
Badlop
964b7b6b67 Changes in registration form to workaround client problems (EJAB-1262) 
Changes included:
* Remove var in fixed field because Gajim and Tkabber display it to user
* Add workaround for Psi's overlap fields
* Add var=url attribute, required by Psi to display the field
* Provide the image URL as a copy-able form field
 2010-10-25 19:00:52 +02:00
Badlop
9c5f34794a Workaround for Psi's wrong Type in form submission 2010-10-25 18:58:31 +02:00
Badlop
a15d583d4d Add CAPTCHA example configurations to cfg (EJAB-1262)(EJAB-1326) 2010-10-25 18:57:39 +02:00
Evgeniy Khramtsov
e03c453c78 Provide image url in registration form when captcha is enabled 2010-10-25 23:36:31 +10:00
Alexey Shchepin
aea394861d Added a protocol for a client to send the number of local unread messages 
Conflicts:

	src/ejabberd_c2s.erl
 2010-10-25 10:09:06 +03:00
Evgeniy Khramtsov
641dc7d695 Add password entropy check (EJAB-1326) 2010-10-24 17:17:30 +10:00
Evgeniy Khramtsov
0a1b0498a6 * Rename option captcha to captcha_protected for consistency. 
* Document captcha_protected option
 2010-10-24 15:45:42 +10:00
Evgeniy Khramtsov
a6858a6ce4 Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x 2010-10-24 15:30:37 +10:00
Evgeniy Khramtsov
f4beeb1706 CAPTCHA IBR support (EJAB-1262) 2010-10-24 15:30:16 +10:00
Badlop
2e33904bb8 Don't check whether the contact is a locally registered account or not (EJABS-1550) 2010-10-24 00:48:57 +02:00
Badlop
2d3bbd43d7 Allow add_rosteritem functions to work even when no know mod_roster is enabled 2010-10-21 21:07:07 +02:00
Christophe Romain
011464e6ac improve documentation (thanks to Karim Gemayel) 2010-10-21 11:14:24 +02:00
Badlop
6c0e9ef575 Fix return values of some functions. newgroups argument changed to groups. 2010-10-21 00:23:33 +02:00
Badlop
ca62271a89 Apply Apollo fixes. More fixes. Improve command descriptions. 2010-10-20 16:41:27 +02:00
Evgeniy Khramtsov
c96a1805e8 - get rid of rpc:call to avoid group leader inheritance 
- do not log migration errors
- remove stopping node from cluster hashing explicitly
 2010-10-20 17:26:01 +10:00
Badlop
babff870a8 Remove custom ON command: send_notification/6 2010-10-19 17:17:55 +02:00
Badlop
5cd3de9cd7 Copy changes from Apollo's mod_xmlrpc to 2.2.x's mod_xmlrpc 
Changes:
* link_contacts new arguments: group1::string, group2::string
* New method add_rosteritem_groups/5
* New method del_rosteritem_groups/5
* New method modify_rosteritem_groups/7
* get_roster change argument group::string -> groups::[string]
 2010-10-19 16:55:24 +02:00
Badlop
437d8c6b7c Copy ejabberd_xmlrpc from ejabberd-modules SVN 2010-10-19 16:51:28 +02:00
Badlop
440eef74e9 Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
Christophe Romain
c849552177 fix add_rosteritem issue (TECH-1181) 2010-10-19 15:19:41 +02:00
Alexey Shchepin
aa60140ba8 Revert "Merge ApplePush to 2.2.x" 
This reverts commit b8b6fc0da5.

Conflicts:

	src/mod_applepush.erl
	src/mod_applepush_service.erl
 2010-10-19 13:53:10 +03:00
Alexey Shchepin
59135cac6f Revert "ApplePush : previous merge missed timeout handler in c2s." 
This reverts commit 40625b29f2.
 2010-10-19 13:52:46 +03:00
Alexey Shchepin
8d69d4aaba Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test" 
This reverts commit 00d8b2ac30, reversing
changes made to cac23c39c9.
 2010-10-19 13:52:17 +03:00
Alexey Shchepin
426b7ca769 Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x" 
This reverts commit ba326eb976, reversing
changes made to 00d8b2ac30.
 2010-10-19 13:52:09 +03:00
Alexey Shchepin
b61d16dd33 Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x" 
This reverts commit f76dcd0d48, reversing
changes made to 7da8d9e4e3.
 2010-10-19 13:51:44 +03:00
Alexey Shchepin
807af3c08a Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x-applepush 2010-10-19 13:08:46 +03:00
Peter Lemenkov
c53e8012b2 Change directory before any operation to one readable by INSTALLUSER (EJAB-1322) 
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686:

https://bugzilla.redhat.com/564686

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 2010-10-19 01:05:31 +02:00
Badlop
fe04d57284 Fix bug in mod_pubsub in_subscription return value 2010-10-19 00:26:36 +02:00
Badlop
d07424365d Fix bug in mod_pubsub in_subscription return value 2010-10-19 00:25:14 +02:00
Badlop
70fe2948b9 Revert "Remove some compiled files" 
That removal was only intended for ejabberd master,
as it requires also changes in gitignore, Makefile.in and aclocal.m4

This reverts commit 179a0cf255.
 2010-10-18 23:17:12 +02:00
Christophe Romain
0f3bd782c4 documentation update (thanks to Karim Gemayel) 2010-10-18 16:53:21 +02:00
Badlop
91cf9194d8 When privacy list denies local user's outgoing stanza, try to return error (EJAB-1320) 
See:
http://xmpp.org/extensions/xep-0016.html#example-51
Example 51. Error: contact is blocked
 2010-10-16 22:53:12 +02:00
Badlop
e2dbad6242 Check privacy of outgoing IQ stanzas (EJAB-1320) 2010-10-16 22:53:10 +02:00
Badlop
84d4a1619b Check privacy of incoming IQ stanzas (EJAB-1320) 2010-10-16 22:53:08 +02:00
Badlop
16fae4d117 Add support to ejabberd_ctl to handle anonymous command arguments 2010-10-15 21:53:03 +02:00
Badlop
76f7548935 Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler) 
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.

Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
 2010-10-15 16:29:47 +02:00
Evgeniy Khramtsov
a5166f3946 copied feature_inspect_packet hook from iphone svn repo 2010-10-15 23:13:29 +10:00
Badlop
2d08dcf11a Fix errors detected by Dialyzer 2010-10-15 13:17:32 +02:00
Badlop
7af47b9dbe Document ejabberd_loglevel using EDoc (EJAB-225) 2010-10-15 13:17:19 +02:00
Andreas Köhler
437da38342 Fix unused variable warning in ejabberd_loglevel 2010-10-15 13:15:52 +02:00
Andreas Köhler
801ee586b7 Add set_custom/2, clear_custom/0 and clear_custom/1 to ejabberd_loglevel 2010-10-15 13:15:50 +02:00
Andreas Köhler
cfca2b502a Add support for changing the loglevels for given modules (EJAB-225) 
ejabberd_loglevel:set/1 now understands more input formats:

set(Param) -> {module, ejabberd_logger}
    Param = Level | {Level, CustomLevels}
    CustomLevels = [CustomLevel]
    CustomLevel = {Module, Level}
    Module = atom()
    Level = integer() | atom()

set(Level) is equivalent to set({Level, []}), so it clears all module
level customizations. log_src/2 adds additional function heads for those
_msg function and module combinations that need non-default behavior,
i.e. add or filter logging.

ejabberd_loglevel:get/0 only returns the default log level. To retrieve
the complete setting use ejabberd_logger:get/0 instead.
 2010-10-15 13:15:48 +02:00
Andreas Köhler
e1a4ae8264 Use warning_msg event type for warning log level. 2010-10-15 13:15:46 +02:00
Andreas Köhler
19826858a4 Add warning message and report handlers to ejabberd_logger_h.erl. 2010-10-15 13:15:45 +02:00
Andreas Köhler
0c2677bc50 Improve ejabberd_logger code generation 
Split the monolithic function ejabberd_loglevel:ejabberd_logger_src/1
into separate functions returning deep lists.

log_src/2 now returns the code for any of *_msg/4. Its parameters are
the current loglevel (integer()) and a loglevel specification
(#loglevel{}), with added information in #loglevel:

- function: The api function enabled by this level, may be no_log
- event_type: The type of the event sent to the error_logger
- msg_prefix: One character used in the message (one of "DIWEC")

If the current loglevel is too low for logging, the api function is
optimized at compile time.
 2010-10-15 13:15:44 +02:00
Andreas Köhler
d1c1902687 Use records for encoding static loglevel information. 2010-10-15 13:15:42 +02:00
Juan Pablo Carlino
11b00b92e9 merge from Team Leader 2.2 (r973) 2010-10-14 19:00:19 -03:00
Badlop
a5230c46c2 Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319) 
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
 2010-10-14 21:15:40 +02:00
Alexey Shchepin
c10e43f95f Improved behaviour on SSL handshake failure 2010-10-14 15:59:23 +03:00
Evgeniy Khramtsov
eeffc77a1a ignore RPC timeout during migration 2010-10-14 20:29:45 +10:00
Evgeniy Khramtsov
254686ab46 fixes timeout calculation 2010-10-14 20:15:53 +10:00
Evgeniy Khramtsov
4a6fc46713 increase rehash timeout to 30 seconds; increase hashing points 2010-10-14 20:02:34 +10:00
Christophe Romain
bde3bce1e7 remove non generic comment 2010-10-13 15:26:38 +02:00
Christophe Romain
f76dcd0d48 Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x 2010-10-13 12:36:04 +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
ac87749d55 add find_s2s_bridge hook 2010-10-11 18:40:57 +10:00
Evgeniy Khramtsov
3a7d02dbd3 fixes anonymous sessions lookup 2010-10-09 00:44:23 +10:00
Evgeniy Khramtsov
350af319bf fixes annoying crash with controller change 2010-10-08 19:26:49 +10:00
Evgeniy Khramtsov
50b747041f use one_queue IQ discipline by default 2010-10-05 21:28:45 +10:00
Evgeniy Khramtsov
36df8c9035 implement lifetime for broken hashes 2010-10-05 21:27:28 +10:00
Evgeniy Khramtsov
58a5ed9cdc change caps hook name 2010-10-03 16:04:29 +10:00
Evgeniy Khramtsov
5ea909885e call caps hook when caps is changed 2010-10-03 16:02:50 +10:00
Christophe Romain
f81473fc65 fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
Evgeniy Khramtsov
1f2c9b7971 fixes typo in stop_connection/1 2010-09-28 14:20:02 +10:00
Evgeniy Khramtsov
c13940e1de new CAPS processing 2010-09-28 14:18:57 +10:00
Christophe Romain
b6dcd41225 added antiflood and filter modules from TeamLeader 2010-09-24 16:11:59 +02:00
Christophe Romain
db2baa8f84 pubsub clean now cluster aware 2010-09-24 16:11:39 +02:00
Alexey Shchepin
a93991bef2 Mark out-of-reception sessions in #session.info 2010-09-23 18:14:04 +03:00
Alexey Shchepin
7127d067c8 Revert the previous change, as priority is 0 by default 2010-09-23 18:05:56 +03:00
Alexey Shchepin
ba326eb976 Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x 2010-09-23 16:22:03 +03:00
Alexey Shchepin
fd50b2169b Insert "priority" element in out-of-reception presences 2010-09-23 16:18:53 +03:00
Alexey Shchepin
00d8b2ac30 Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test 
Conflicts:
	src/ejabberd_c2s.erl
	src/mod_offline.erl
	src/mod_offline_odbc.erl
 2010-09-22 22:38:32 +03:00
Alexey Shchepin
cac23c39c9 Disable notifications for a user on "Invalid token" error 2010-09-22 22:19:36 +03:00
Alexey Shchepin
a5813b798f Fixed "sender" log field 2010-09-22 22:19:17 +03:00
Evgeniy Khramtsov
8e5297f4c3 fixes default value for cache_life_time 2010-09-21 04:31:18 +10:00
Evgeniy Khramtsov
191cd2af3c different hooks should be called for session migration and session close 2010-09-21 03:17:52 +10:00
Alexey Shchepin
f2cfee11de Disable notifications for a user on "Invalid token" error 2010-09-20 13:35:42 +03:00
Andreas Köhler
3278f019cb Add missing needdb check in mod_privacy, to enable blocking by group and subscription again. 2010-09-17 18:48:45 +02:00
Andreas Köhler
e2c3925b7d Discard unmatched INFO messages in ejabberd services. 
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
 2010-09-17 18:48:43 +02:00
Eric Cestari
b0c79c57b0 Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2010-09-17 16:26:09 +02: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
Christophe Romain
893c47a2e0 add ability to retreive only node names 2010-09-17 07:28:28 +02:00
Christophe Romain
694af69982 ejabberd.app now set to version 2.2.x 2010-09-17 06:46:40 +02:00
Christophe Romain
c576f340f9 upgrade to lattest pubsub schema 2010-09-17 06:40:48 +02:00
Badlop
179a0cf255 Remove some compiled files 2010-09-17 00:14:13 +02:00
Eric Cestari
a45ecb70ff [TECH-1511] debug traces reorganized 2010-09-16 15:08:53 +02:00
Christophe Romain
df1ab9149f remove garbage configuration 2010-09-16 14:53:20 +02:00
Eric Cestari
cb54444f00 Merge branch '2.2.x' into websockets 2010-09-16 14:44:44 +02:00
Eric Cestari
c77e7fbb7d Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2010-09-16 14:38:52 +02:00
Eric Cestari
40625b29f2 ApplePush : previous merge missed timeout handler in c2s. 2010-09-16 14:37:27 +02:00
Christophe Romain
2624f3ba51 added pubsub helper modules 2010-09-16 14:31:08 +02:00
Eric Cestari
44832e12b3 Merge branch '2.2.x' into websockets 2010-09-16 11:07:12 +02:00
Eric Cestari
caa8d0c411 Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/~ecestari/ejabberd/ecestaris-maincustomers into 2.2.x 2010-09-16 10:54:45 +02:00
Eric Cestari
b0a81778af [TECH-1511] preliminary XMPP support via websockets 2010-09-15 17:20:54 +02:00
Christophe Romain
652774a83c remove obsolete files 2010-09-15 13:51:46 +02:00
Alexey Shchepin
2aea503a2a Don't resend badge if there are no offline messages 2010-09-14 21:27:02 +02:00
Alexey Shchepin
0d8aacb3e7 Do not disable push on send error 2010-09-14 21:26:50 +02:00
Alexey Shchepin
e6be70943f Added badge resending functions 2010-09-14 21:26:36 +02:00
Alexey Shchepin
c86e4faba3 Fixed "sender" log field 2010-09-14 18:00:01 +03:00
Christophe Romain
c3c06ccd1c Merge remote branch 'mainline/2.1.x' into 2.2.x 2010-09-14 16:59:46 +02:00
Alexey Shchepin
261acfce54 Don't resend badge if there are no offline messages 2010-09-13 15:46:39 +03:00
Eric Cestari
c8567f1de2 [TECH-1511] Calls start() on handler to get a PID 2010-09-13 14:23:42 +02:00
Badlop
8a0ccfc401 Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301) 2010-09-13 12:06:13 +02:00
Eric Cestari
35a0e27d04 [TECH-1511] clean support for websockets. 
Added handlers in configuration file
 2010-09-13 12:04:52 +02:00
Alexey Shchepin
73f7b2ba38 Do not disable push on send error 2010-09-13 06:22:14 +03:00
Alexey Shchepin
8a693df6e6 Added badge resending functions 2010-09-13 06:19:38 +03: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
660a2735f0 mod_keepalive added to repos 2010-09-10 14:11:56 +02:00
Eric Cestari
77136bccdf [TECH-1151] websocket initial code 2010-09-10 14:06:26 +02:00
Eric Cestari
b8b6fc0da5 Merge ApplePush to 2.2.x 2010-09-09 17:00:18 +02:00
Eric Cestari
4134edf8de Merge ApplePush to branch 2.2.x 2010-09-09 16:16:28 +02:00
Eric Cestari
a77d53d738 [TECH-1068] Added missing catch in process function 2010-09-08 17:25:37 +02:00
Eric Cestari
92a60ff7fd flash hack merge fix from BBC 2010-09-08 17:03:49 +02:00
Eric Cestari
33c7d36a95 Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x 2010-09-08 16:54:26 +02:00
Christophe Romain
6c7316cbdd apply flash hack patch 2010-09-08 16:51:06 +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
Evgeniy Khramtsov
c29b2fda99 cache lifetime should be converted in microseconds 2010-09-08 02:33:49 +10: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
Alexey Shchepin
6bb0dc12f1 Cut payload when it's too big 2010-09-02 13:41:18 +03:00
Alexey Shchepin
ad00ec1518 Added xml:remove_subtags (thanks to Mickael Remond) 2010-09-02 13:40:45 +03:00
Evgeniy Khramtsov
c75b7b2b12 Implemented dirty (non-atomic) functions; added copyright notice 2010-08-31 18:06:02 +10:00
Badlop
c754c91ad1 Add IPv6 support to mod_irc (thanks to Matthias Schiffer)(EJAB-1298) 2010-08-30 23:25:02 +02:00
Christophe Romain
c03140d4be fix merge issue 2010-08-30 11:14:57 +02:00
Evgeniy Khramtsov
6952324509 implemented backend-independed key-value cacheing table; applied to mod_caps.erl first 2010-08-30 14:02:47 +10:00
Badlop
d87fff1a4c Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov) 2010-08-19 17:38:38 +02:00
Alexey Shchepin
ea8aa1f25b clean p1:pushed tag (thanks to Mickael Remond) 2010-08-19 15:53:44 +03:00
Alexey Shchepin
8fe6ed011d Merge branch '2.1.x' of git://github.com/processone/ejabberd.git into applepush 2010-08-19 15:39:08 +03:00
Alexey Shchepin
35cde6787d Initial applepush git commit 2010-08-19 15:30:39 +03:00
Evgeniy Khramtsov
3024bb0cbf fixes ampersand escaping (EJAB-1258) 2010-08-19 16:28:31 +10:00
Evgeniy Khramtsov
f8dd973373 fixes typo for table copy 2010-08-10 19:42:22 +10:00
Christophe Romain
23b28ec60f Merge remote branch 'mainline/2.1.x' into 2.2.x 2010-08-09 10:04:11 +02:00
Badlop
972440c2ca When user joins non-anonymous room, warn also in presence stanza (EJAB-310) 2010-08-07 20:48:36 +02:00
Badlop
b14899d41a Update the 'configure' script 2010-08-07 19:42:56 +02:00
Evgeniy Khramtsov
d2d8a09b4a Make MD2 autodetected (EJAB-1285) 2010-08-07 22:04:57 +10:00
Evgeniy Khramtsov
1ea09b09a2 Make xml.c correctly compiles on R14A (EJAB-1288) 2010-08-07 21:06:50 +10:00
Badlop
071c0a1afe Go back to the 2.1.x branch name 2010-08-05 20:39:55 +02:00
Badlop
4ed00c3d1f Fix detection of Erlang R11 and older (thanks to Mathias Ertl)(EJAB-1287) 2010-08-05 20:27:12 +02:00
Christophe Romain
59ae9bea76 added p1 modules 2010-08-05 14:23:26 +02:00
Christophe Romain
7be707f7bc Merge branch '2.1.x' into 2.2.x 2010-08-05 10:20:47 +02:00
Evgeniy Khramtsov
c9ff370278 Loading ASN.1 driver explicitly to avoid races in LDAP (EJAB-1284) 2010-08-04 19:23:52 +10:00
Badlop
8ab8da82c4 Update ejabberd version number to 2.1.5 2010-08-02 17:38:36 +02:00
Christophe Romain
8a251ccafe enforce disco features results (thanks to Karim)(EJAB-1033, EJAB-1228, EJAB-1238) 2010-08-02 17:07:23 +02:00
Badlop
550363cd52 Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280) 2010-07-30 20:33:03 +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
Badlop
5113d28bb4 Return Registered element when account exists (thanks to PioneerMike) 2010-07-28 19:32:42 +02:00
Badlop
c8df607173 Fix typo (thanks to Evgeniy Khramtsov) 2010-07-23 00:38:15 +02:00
Badlop
c8033833f9 When logging s2s out connection attempt or success, log if TLS is used 2010-07-23 00:25:43 +02:00
Badlop
cf4f0dbe6d The command Update now returns meaningful message and exit-status (EJAB-1237) 2010-07-22 16:32:55 +02:00
Christophe Romain
200815dcdb merge from latest 2.1.x 2010-07-22 12:01:44 +02:00
Christophe Romain
2d1c416daf Allow roster change from external component (TECH-1001) 2010-07-22 11:03:07 +02:00
Christophe Romain
3aaebe98f4 add ejabberdctl ability to check epmd names (TECH-1121) 2010-07-20 14:06:48 +02:00
Evgeniy Khramtsov
8c4884d665 Use driver allocators in iconv_erl.c for reflecting memory in erlang:memory(system) 2010-07-20 15:28:22 +10:00
Evgeniy Khramtsov
26f6eebaa9 Use driver allocators in ejabberd_zlib_drv.c for reflecting memory in erlang:memory(system) 2010-07-20 14:57:23 +10:00
Christophe Romain
2ee7642816 add missing hrl 2010-07-16 18:57:00 +02:00
Christophe Romain
bf63d09d80 Add etop command to ejabberdctl (TECH-1109) 2010-07-16 16:52:27 +02:00
Evgeniy Khramtsov
5030f35558 correct handling of SQL boolean types (EJAB-1275) 2010-07-14 21:23:21 +10:00
Evgeniy Khramtsov
d7930d7f82 Use driver allocators in expat for reflecting memory in erlang:memory(system) 2010-07-14 14:19:16 +10:00
Christophe Romain
28c4c87956 Added catches to reset_stream calls to avoid errors during a race condition (thanks to Aleksey Shchepin) 2010-07-13 21:54:46 +02:00
Christophe Romain
d0b7cd599b Make chat room destroy and create being sync_dirty to limit mnesia overload. (thanks to Mickael Remond) 2010-07-13 21:48:36 +02:00
Christophe Romain
cc1839a250 Try forcing usage of cache for all MySQL sessions, and add correct timeout on odbc driver query. (thanks to Mickael Remond) 2010-07-13 19:06:12 +02:00
Christophe Romain
7d37715f8b Add rate limit command to ejabberd_listener. You can now limit the max number of TCP connects per second on a given port. (thanks to Mickael Remond) 2010-07-13 19:00:49 +02:00
Christophe Romain
091b4568d5 Add module to log informations when Mnesia is overloaded, and also supports rate limitation 2010-07-13 18:46:04 +02:00
Christophe Romain
cc0503fd5e Add module to dump c2s connection 2010-07-13 18:45:49 +02:00
Christophe Romain
987d796439 fix duplicated function 2010-07-13 12:48:52 +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
42ddc297fe Fix my flock change from last friday 2010-07-12 18:53:16 +02:00
Badlop
e82db8cc7f Remove ejabberd_debug because p1_prof provides similar and better features 2010-07-12 16:02:52 +02:00
Badlop
10d43c7cc6 Only compile and install p1_prof when: make debugtools=true 2010-07-12 16:02:41 +02:00
Badlop
d539fd28c1 Recompile the 'configure' script 2010-07-12 15:18:15 +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
Badlop
d106f741d9 Some systems delete the lock dir; in such case don't use flock at all 2010-07-09 22:39:13 +02:00
Evgeniy Khramtsov
6c96157d1b Added functions to collect statistics about queues, memory, reductions etc. Several cleanups 2010-07-10 01:36:12 +10:00
Evgeniy Khramtsov
a42a012f94 Added new ejabberd profiler 2010-07-05 13:43:44 +10:00
Badlop
7e90d6cf92 Fix print of command result that contains ~ (thanks to Tsukasa Hamano) 2010-07-03 00:42:54 +02:00
Badlop
e19ac27803 Show some more room options in the log file 2010-07-02 15:19:54 +02:00
Evgeniy Khramtsov
4c2e7e38a1 Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 (Thanks to Alexey Shchepin) 2010-07-02 20:31:42 +10:00
Badlop
fa22b23435 Recompile the Guide and Configure 2010-07-01 17:03:36 +02:00
Badlop
ae6545989e Fix typo in --enable-transient_supervisors 2010-07-01 16:59:26 +02:00
Badlop
0ac5684bf0 Clarify that to use the optional --enable-nif, R13B04 is needed. 2010-07-01 16:51:26 +02:00