Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-30 23:02:00 +02:00
Code Releases Activity
2,564 Commits 7 Branches 107 Tags 82 MiB
929022bc0f
Commit Graph

1601 Commits

Author SHA1 Message Date
Badlop
e5fb89731c If s2s fails due to namespace mismatch, show differences to help debugging the problem. 
SVN Revision: 2663
 2009-10-12 22:51:53 +00:00
Christophe Romain
2565a670b1 fix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060) 
SVN Revision: 2661
 2009-10-12 15:25:00 +00:00
Badlop
74cd5ffb02 Autodetect compilation parameters for Mac OS X Snow Leopard (EJAB-1056) 
SVN Revision: 2659
 2009-10-12 12:59:07 +00:00
Christophe Romain
c3303ce364 return invalid-options on badly formed subscription options 
SVN Revision: 2657
 2009-10-12 10:23:51 +00:00
Christophe Romain
2042ab090d Default pubsub messages to headline if nothing is configured (thanks to Brian Cully) (EJAB-1061) 
SVN Revision: 2655
 2009-10-12 09:06:37 +00:00
Badlop
13a231f6fa Add debug message on command execution 
Merged from trunk@2650.

SVN Revision: 2653
 2009-10-09 12:01:43 +00:00
Badlop
503defac73 Fix regression for authorize node subscription (thanks to Brian Cully)(EJAB-1060) 
SVN Revision: 2652
 2009-10-09 12:01:30 +00:00
Badlop
036095f37d New option added: max_fsm_queue. Removed hardcoded FSMLIMITS. (thanks to Evgeniy Khramtsov) 
Merged from trunk@2645

SVN Revision: 2647
 2009-10-08 11:33:32 +00:00
Badlop
a2bb22a0e7 Use queue to reduced quadratic time effort on selective receive (thanks to Alexey Shchepin) 
Merged from trunk@2644

SVN Revision: 2646
 2009-10-08 11:33:18 +00:00
Christophe Romain
65926460b2 allow max_items_node use on pep 
SVN Revision: 2643
 2009-10-06 15:22:02 +00:00
Badlop
f4e35033e7 Improve stream error stanza when receives invalid handshake from component. 
SVN Revision: 2641
 2009-10-06 10:05:10 +00:00
Christophe Romain
53edf861e0 do not create hometree base when hometree not configured as plugin 
SVN Revision: 2635
 2009-09-25 13:14:59 +00:00
Christophe Romain
24afead423 fix EJAB-1054 (thanks to Evgeniy Khramtsov) 
SVN Revision: 2633
 2009-09-25 12:48:10 +00:00
Christophe Romain
2f5211ab74 improve waiting caps clean (EJAB-1054) 
SVN Revision: 2629
 2009-09-24 19:52:46 +00:00
Christophe Romain
b168cd7cf2 fix EJAB-1044 and EJAB-1055 
SVN Revision: 2628
 2009-09-24 19:47:01 +00:00
Christophe Romain
e5a26b388f rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047) 
SVN Revision: 2623
 2009-09-23 22:00:53 +00:00
Christophe Romain
479b04a6a3 fix Makefile.win32 for including stun (thanks to neustradamus) 
SVN Revision: 2620
 2009-09-23 21:12:44 +00:00
Badlop
b12b18d59f Fix wrong XEP number to XEP-0227 
SVN Revision: 2618
 2009-09-23 17:27:09 +00:00
Christophe Romain
b3955fca3a fix EJAB-1048 and EJAB-819, thanks to badlop 
SVN Revision: 2616
 2009-09-23 16:32:06 +00:00
Mickaël Rémond
4ce2890af0 Replaced Jabber references in config file with XMPP, official name of the protocol 
SVN Revision: 2612
 2009-09-23 12:37:58 +00:00
Christophe Romain
6bdf4aa960 improve configure parsing in iq_pubsub (sync with ejabberd 2.1.0) 
SVN Revision: 2605
 2009-09-20 08:14:24 +00:00
Christophe Romain
36676f0719 fix missing member affiliation on odbc plugin 
SVN Revision: 2604
 2009-09-18 13:44:12 +00:00
Christophe Romain
bb1fca058d Return terminal binding condition on max stanza size limit (thanks to Aleksey) 
SVN Revision: 2602
 2009-09-18 13:33:12 +00:00
Jérôme Sautret
b4c161e04a Merge r2592 and r2593 from trunk: 
Fix pubsub tables constraints in MySQL schema creation script.
Add a "created_at" column to some tables in the MySQL schema to store
a timestamp (thanks to Pedro Melo, EJAB-376).

SVN Revision: 2594
 2009-09-10 16:59:58 +00:00
Christophe Romain
376741c9a1 fix delete item to allow owner being able to remove all publisher items, and also fix EJAB-1036 
SVN Revision: 2591
 2009-09-09 21:49:23 +00:00
Badlop
04e86829e3 Change some error messages. 
SVN Revision: 2588
 2009-09-07 14:31:34 +00:00
Christophe Romain
75dbcd5c68 fix minor timestamp shift between item creation and modification 
SVN Revision: 2586
 2009-09-04 23:34:05 +00:00
Pablo Polvorin
283aa52b31 Port #2583 from trunk 
Use the local (target) domain for firing the s2s_receive_packet hook.  

It was using the external server domain (LFrom) instead of the local domain (LTo).  
This might have impact on mod_caps in s2s scenarios, needs further attention.

SVN Revision: 2584
 2009-09-04 21:33:30 +00:00
Badlop
29b2da42f5 Replace calls from 'regexp' to the OTP R12 new module 're' (EJAB-921) 
SVN Revision: 2582
 2009-09-02 14:26:01 +00:00
Badlop
330a4c9452 Small fix exmpp related code 
SVN Revision: 2581
 2009-09-02 14:25:42 +00:00
Christophe Romain
fa23b83dbb improve previous patch 
SVN Revision: 2579
 2009-09-01 13:23:19 +00:00
Badlop
81f4644622 Fix missing tag when configuring subscription option (thanks to Clochix) 
SVN Revision: 2577
 2009-09-01 08:19:14 +00:00
Badlop
095cd6ce9b BOSH module optimization and clean-up (thanks to Aleksey Shchepin and Mickaël Rémond)(EJAB-936) 
Unfortunately, http-bind doesn't work in this branch,
neither in this commit or before it.

SVN Revision: 2575
 2009-08-31 18:40:25 +00:00
Badlop
f5eb9e3c9f Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499) 
Unfortunately, zlib compression doesn't work in this branch,
neither in this commit or before it.

SVN Revision: 2572
 2009-08-31 16:30:19 +00:00
Badlop
98f93104a7 Rename erlang log file sasl.log to erlang.log (EJAB-783) 
SVN Revision: 2568
 2009-08-31 11:03:35 +00:00
Christophe Romain
3940a6bab3 secure calls to ets:lookup 
SVN Revision: 2564
 2009-08-28 16:28:22 +00:00
Christophe Romain
de78508f45 fix send last item issue 
SVN Revision: 2561
 2009-08-28 00:09:21 +00:00
Christophe Romain
fab29f4cf0 port all recent fixes from trunk related to odbc subscriptions 
SVN Revision: 2559
 2009-08-27 23:09:20 +00:00
Christophe Romain
adfca08e43 remove INFO_MSG call inside sql_query_internal 
SVN Revision: 2557
 2009-08-27 22:30:57 +00:00
Christophe Romain
35e8b95928 added pubsub odbc tables creation 
SVN Revision: 2550
 2009-08-27 09:49:37 +00:00
Christophe Romain
f5091aa1ae pubsub now is sync with last trunk 
SVN Revision: 2546
 2009-08-27 08:48:21 +00:00
Christophe Romain
bb08207569 fix node_public portage 
SVN Revision: 2545
 2009-08-27 08:34:16 +00:00
Christophe Romain
71e0d7d8e2 port commit from r2527 to odbc plugin 
SVN Revision: 2544
 2009-08-27 08:26:22 +00:00
Christophe Romain
3b27670d4d update win32 makefile 
SVN Revision: 2542
 2009-08-27 07:55:45 +00:00
Pablo Polvorin
944dd1cc7f Port pubsub odbc backend to exmpp. 
Warning: A work in progress, isn't working yet!

SVN Revision: 2541
 2009-08-26 20:27:57 +00:00
Evgeniy Khramtsov
ba3a45452e check if a room is not persistent before starting a new one with the same name (EJAB-1026) 
SVN Revision: 2540
 2009-08-26 04:18:42 +00:00
Pablo Polvorin
f7c5a4a15b backport trunk commit r2530 
SVN Revision: 2538
 2009-08-25 20:33:01 +00:00
Pablo Polvorin
4d5bfe2ee8 Fix pubsub_publish_item_ hook call parameter and jid conversion on node_hometree. 
published messages are delivered to subscribers (flat nodes).

SVN Revision: 2537
 2009-08-25 20:03:28 +00:00
Pablo Polvorin
a1a6469ed0 Updated to trunk r2532, fix subscription managment (by owner) 
SVN Revision: 2536
 2009-08-25 19:54:44 +00:00
Pablo Polvorin
fcf66c2e75 Fix affiliation managment 
Node owner can add/remove affiliations

SVN Revision: 2535
 2009-08-25 17:42:25 +00:00
Pablo Polvorin
b4f0bb65c6 Fix disco#items on pubsub nodes 
SVN Revision: 2534
 2009-08-25 17:23:43 +00:00
Pablo Polvorin
938a4007b3 Initial port of pubsub changes(up to r2444) to exmpp branch. 
pubsub odbc isn't ported yet.  
Not tested (only basic node creation and configuration), should still have losts of bugs to discover.

SVN Revision: 2533
 2009-08-25 17:14:30 +00:00
Badlop
6470e6cc25 Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023) 
SVN Revision: 2527
 2009-08-24 21:21:39 +00:00
Badlop
19355e947e Prepare ejabberd.init when installing ejabberd. 
SVN Revision: 2524
 2009-08-24 19:59:30 +00:00
Badlop
d9a8c89b5a Added preliminary template file for ejabberd.init (thanks to Christophe Romain) 
SVN Revision: 2523
 2009-08-24 19:59:17 +00:00
Evgeniy Khramtsov
6688b4ea78 do not include MAPPED-ADDRESS in new style responses since it is not required by the RFC 
SVN Revision: 2515
 2009-08-21 06:07:55 +00:00
Badlop
ec26a28cd2 Merge 2427 from trunk: return timeout in requests if DB connection can't be established 
SVN Revision: 2511
 2009-08-20 17:37:37 +00:00
Badlop
05755b9b09 Merge some old English fixes from trunk SVN. 
SVN Revision: 2505
 2009-08-19 17:59:49 +00:00
Badlop
007cafa7cd Fix EDoc errors. 
SVN Revision: 2495
 2009-08-17 17:17:34 +00:00
Badlop
a9ce2fc38a Display room service messages in distintive blue colour. 
SVN Revision: 2492
 2009-08-15 22:03:14 +00:00
Badlop
0175932d86 Update Ingoing s2s connections inner state to hold domain name (thanks to Juan Pablo Carlino)(EJAB-972) 
SVN Revision: 2490
 2009-08-15 21:39:41 +00:00
Badlop
26cdea53c7 Don't allow room config to enable password protection with empty password (EJAB-1011) 
SVN Revision: 2488
 2009-08-15 20:11:24 +00:00
Badlop
e585b07d76 If room config violates service policy, return not-acceptable instead of bad-request. 
SVN Revision: 2487
 2009-08-15 20:11:10 +00:00
Badlop
6eb5b544b4 Remove workarounds that supported R11 or older (EJAB-446)(EJAB-628)(EJAB-997) 
SVN Revision: 2486
 2009-08-15 20:10:49 +00:00
Evgeniy Khramtsov
9c0495b563 removed unnecessary gen_server call 
SVN Revision: 2477
 2009-08-13 10:02:04 +00:00
Badlop
14464ab6cc Add support in WebAdmin for the new listener network protocol 
SVN Revision: 2464
 2009-08-11 18:24:12 +00:00
Badlop
a4b2d032f9 Add stun directory to compilation process 
SVN Revision: 2463
 2009-08-11 18:23:54 +00:00
Badlop
3078c28d1a Document STUN server (thanks to Evgeniy Khramtsov), and minor doc enhancements. 
* Add stun listener to example config file, disabled.
* Improve enumeration of listeners options

SVN Revision: 2460
 2009-08-11 13:22:39 +00:00
Evgeniy Khramtsov
cf90c8176e updated top supervisor for STUN support 
SVN Revision: 2459
 2009-08-11 13:17:46 +00:00
Evgeniy Khramtsov
0a8bcf6530 restore missing stun directory 
SVN Revision: 2458
 2009-08-11 12:54:40 +00:00
Evgeniy Khramtsov
bf0dbeb8b3 STUN support backport 
SVN Revision: 2457
 2009-08-11 12:53:46 +00:00
Badlop
2e8fe6a1ab Add ejabberd command to get the current loglevel (EJAB-1004) 
SVN Revision: 2449
 2009-08-07 14:56:12 +00:00
Badlop
936b2d4188 Merge 2426 from trunk: add get/0 API function that returns current log level (EJAB-1004). 
SVN Revision: 2436
 2009-08-06 22:01:01 +00:00
Badlop
9a204593e1 Merge 2425 from trunk: fix keepalive query, broken by r2092. 
SVN Revision: 2435
 2009-08-06 21:57:53 +00:00
Badlop
562e63a3b0 Fix argument passing 
SVN Revision: 2433
 2009-08-06 21:15:15 +00:00
Badlop
4f6b67b190 Move functions from roster_versioning to mod_roster (EJAB-964) 
SVN Revision: 2431
 2009-08-06 21:07:18 +00:00
Pablo Polvorin
1b85310f1a Support for roster versioning (EJAB-964) 
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false}   Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false}   If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.

Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.

Details: 
If store_current_id is false,  the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't   
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).

In either case, there is no difference for the clients, the roster version ID is opaque.

IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'.  Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.

SVN Revision: 2428
 2009-08-06 15:45:13 +00:00
Badlop
6aa3706bec Support XEP-0227 Portable Import/Export (EJAB-993) 
SVN Revision: 2421
 2009-08-05 18:23:54 +00:00
Pablo Polvorin
92ad67a814 Fix problems when deleting a roster item. 
The deleted item was left on the user roster, and unsubscribe presence stanza wasn't sent to the unsubscribed user.

SVN Revision: 2420
 2009-08-05 17:39:47 +00:00
Badlop
14399e3d57 Support XEP-0199 Ping (thanks to Brian Cully and Evgeniy Khramtsov)(EJAB-974) 
SVN Revision: 2419
 2009-08-03 19:33:42 +00:00
Badlop
a321ab3653 Document the new option s2s_dns_options, expressed in seconds (EJAB-994) 
SVN Revision: 2418
 2009-08-03 15:04:52 +00:00
Evgeniy Khramtsov
ce3fa18fb6 fixes incorrect substitution of an LDAP pattern 
SVN Revision: 2415
 2009-07-31 06:43:17 +00:00
Badlop
f5868a0952 Delete expat_erl, stringprep, xml and xml_stream; replaced by exmpp (EJAB-991) 
SVN Revision: 2409
 2009-07-30 17:57:56 +00:00
Evgeniy Khramtsov
35c1c3774c do not crash on unmatched request 
SVN Revision: 2407
 2009-07-30 13:10:01 +00:00
Geoff Cant
628b03f3c0 EJAB-994: Implements DNS timeouts and retries. 
SVN Revision: 2405
 2009-07-30 12:35:18 +00:00
Evgeniy Khramtsov
c6f3fbb82c treap.erl backport 
SVN Revision: 2400
 2009-07-29 03:43:58 +00:00
Geoff Cant
504cc7b7dd EJAB-940: Implements reliable ODBC transaction nesting. 
SVN Revision: 2396
 2009-07-28 13:43:00 +00:00
Badlop
e6205e8f26 Fix error when nick registration stanza doesn't contain Value. 
SVN Revision: 2395
 2009-07-27 09:37:24 +00:00
Badlop
620a50223c New command to dump a table to text file. 
SVN Revision: 2391
 2009-07-23 15:23:26 +00:00
Badlop
646adbf186 Add support to delete content and delete table. 
SVN Revision: 2390
 2009-07-23 15:23:21 +00:00
Badlop
73f2fc76d9 Log an error if HTTP request does not include Host header (EJAB-966) 
SVN Revision: 2387
 2009-07-23 14:51:16 +00:00
Evgeniy Khramtsov
553969f0fd delete/2 now does not crash when there is nothing to delete. fold/1 added 
SVN Revision: 2385
 2009-07-22 06:52:47 +00:00
Mickaël Rémond
ee142c5fe1 Fix typo from EJAB-988 
SVN Revision: 2381
 2009-07-21 19:18:22 +00:00
Badlop
97dfcb9fb0 HTML room logs: fix formatting of spaces; log config when disabling logging; display occupants (EJAB-986) 
SVN Revision: 2379
 2009-07-21 18:35:20 +00:00
Badlop
97ee31e751 Allow content types to be configured in ejabberd.cfg (EJAB-975)(thanks to Brian Cully) 
SVN Revision: 2377
 2009-07-21 17:32:29 +00:00
Badlop
338af10aaf moved some log reports from error to debug level (thanks to Evgeniy Khramtsov) 
SVN Revision: 2374
 2009-07-20 09:21:42 +00:00
Badlop
020a3e6d6b Revert workaround of EJAB-611 because it seems no longer required (EJAB-709) 
SVN Revision: 2371
 2009-07-17 21:47:26 +00:00
Badlop
5e05ad03bb Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235) 
SVN Revision: 2369
 2009-07-17 20:47:40 +00:00
Badlop
8d988d1bd2 Store account number in internal auth of (EJAB-981)(thanks to Juan Pablo Carlino) 
SVN Revision: 2366
 2009-07-17 19:06:42 +00:00
Badlop
f3db058fef If a command is already defined: log as Debug, not as Warning. 
SVN Revision: 2363
 2009-07-16 20:18:36 +00:00