Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity
2,730 Commits 7 Branches 109 Tags 66 MiB
6cdfec1284
Commit Graph

1739 Commits

Author SHA1 Message Date
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
Badlop
b49a15efeb If directory /sbin is created, set permissions 755, not 750. 
SVN Revision: 2359
 2009-07-07 08:27:58 +00:00
Badlop
be5b35e999 Temporary Debug and Ctl nodes must get nodename similar to destination. 
SVN Revision: 2357
 2009-07-06 14:11:35 +00:00
Badlop
30697ca0a1 Add -hidden flag when calling Debug or Ctl 
SVN Revision: 2356
 2009-07-06 14:11:31 +00:00
Badlop
0e19ca68b4 Support XEP-0085 Chat State Notifications (EJAB-961) 
SVN Revision: 2351
 2009-06-30 19:33:09 +00:00
Badlop
f82131af15 Include original timestamp on delayed presences (thanks to Mickael Remond)(EJAB-234) 
SVN Revision: 2349
 2009-06-30 17:51:37 +00:00
Badlop
16ca8d178d Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234) 
SVN Revision: 2347
 2009-06-30 16:55:26 +00:00
Badlop
cdac156f2e Add announcement of offline feature to service discovery (EJAB-234) 
SVN Revision: 2346
 2009-06-30 16:54:46 +00:00
Badlop
ba335346f2 Don't use lists:keyfind/3 bcause it was introduced only in recent R13A. 
SVN Revision: 2342
 2009-06-25 18:05:34 +00:00
Badlop
e37b26e068 Improvements in the WebAdmin browsing menus. 
SVN Revision: 2336
 2009-06-25 17:04:03 +00:00
Badlop
6ac4157fc1 Add Vim folding 
SVN Revision: 2335
 2009-06-23 21:13:04 +00:00
Badlop
b9cbb7a72b Detect auth errors and report in log file. Support auth when domain not provided. 
SVN Revision: 2331
 2009-06-22 23:14:18 +00:00
Badlop
bfbc69e8f9 Update version number to 3.0.0-alpha 
SVN Revision: 2326
 2009-06-17 09:06:52 +00:00
Badlop
13c76c12f8 Workaround to compile with exmpp 
SVN Revision: 2324
 2009-06-16 18:28:06 +00:00
Badlop
08ebf50480 Add permanent section about mod_http_fileserver to the Guide. Example config. 
SVN Revision: 2323
 2009-06-16 18:28:01 +00:00
Badlop
b49f8a81a8 Add forgotten copyright and license notices. 
SVN Revision: 2321
 2009-06-16 18:27:51 +00:00
Badlop
ab5b66facc Easier debugging (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2320
 2009-06-16 18:27:45 +00:00
Badlop
35c6ea68cc Code clean-up (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2319
 2009-06-16 18:27:40 +00:00
Badlop
b74cb8828b Started code clean-up (EJAB-936)(thanks to Michael Remond) 
SVN Revision: 2318
 2009-06-16 18:27:35 +00:00
Badlop
a1b84c6fa3 Replaced sha1 to hexadecimal transformation with sha:sha/1 call (thanks to Alexey Shchepin) 
SVN Revision: 2317
 2009-06-16 18:27:31 +00:00
Badlop
3e3d01063d Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2316
 2009-06-16 18:27:27 +00:00
Badlop
c19cc61c48 Simplified code.(thanks to Michael Remond) 
SVN Revision: 2315
 2009-06-16 18:27:24 +00:00
Badlop
5854edafdd Properly warn user and admin when mod_http_bind is not started.(thanks to Michael Remond) 
SVN Revision: 2314
 2009-06-16 18:27:18 +00:00
Badlop
2c33e72eea Do not clear input when dispatching a get when we have nothing to output. (thanks to Geoff Cant) 
SVN Revision: 2313
 2009-06-16 18:27:14 +00:00
Badlop
24ab5026c9 Changed the place where database is created(thanks to Michael Remond) 
SVN Revision: 2312
 2009-06-16 18:27:10 +00:00
Badlop
c74ef80f79 Fix remote-stream-error stanzas 
SVN Revision: 2311
 2009-06-16 18:27:05 +00:00
Badlop
eeb11046d5 New option max_inactivity to configure maximum inactivity period (EJAB-512) 
SVN Revision: 2310
 2009-06-16 18:27:01 +00:00
Badlop
66f3f0f3de Fix warning of unused Host variable 
SVN Revision: 2309
 2009-06-16 18:26:57 +00:00
Badlop
a1bce24461 Include condition in http-bind terminate body when service stops (EJAB-792) 
SVN Revision: 2308
 2009-06-16 18:26:53 +00:00
Badlop
1c2d0afd95 Fix unknown rid error (thanks to Jerome Sautret) 
SVN Revision: 2307
 2009-06-16 18:26:48 +00:00
Badlop
6e52ca3f4e Implement packets reordering to avoid race conditions (EJAB-724).(thanks to Michael Remond) 
SVN Revision: 2306
 2009-06-16 18:26:44 +00:00
Badlop
1d1f72fdc2 Updated IP retrieving (thanks to Alexey Shchepin) 
SVN Revision: 2305
 2009-06-16 18:26:40 +00:00
Badlop
d25bd8c1c6 Improve ip fetching patch (thanks to Christohpe Romain) 
SVN Revision: 2304
 2009-06-16 18:26:36 +00:00
Badlop
3e0827deea Retrieve correct IP from http connection (thanks to Christohpe Romain) 
SVN Revision: 2303
 2009-06-16 18:26:31 +00:00
Badlop
481c7ea4e6 Fix syntax error. (thanks to Jerome Sautret) 
SVN Revision: 2302
 2009-06-16 18:26:27 +00:00
Badlop
646477be08 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: 2301
 2009-06-16 18:26:23 +00:00
Badlop
3e2c626696 Do not display error message when starting several hosts (EJAB-571) (thanks to Christohpe Romain) 
SVN Revision: 2300
 2009-06-16 18:26:19 +00:00
Badlop
38ce8b494e Provide explanation in error message when module is already started for another vhost 
SVN Revision: 2299
 2009-06-16 18:26:15 +00:00
Badlop
292e2f6b69 Removed small warning 
SVN Revision: 2298
 2009-06-16 18:26:11 +00:00
Badlop
94c3a384b1 Bugfixes (thanks to Alexey Shchepin) 
SVN Revision: 2297
 2009-06-16 18:26:07 +00:00
Badlop
5f07b4bf9b Removed receive_loop (thanks to Alexey Shchepin) 
SVN Revision: 2296
 2009-06-16 18:26:02 +00:00
Badlop
68754c4b5d Remove Erlang module attribute 'vsn' because it does not provide any worth feature, and it difficults hot code update (EJAB-440) 
SVN Revision: 2295
 2009-06-16 18:25:59 +00:00
Badlop
ff4ccc1d85 Bugfix when table does not exist (thanks to Justin Kirby) 
SVN Revision: 2294
 2009-06-16 18:25:54 +00:00
Badlop
d84a2f8215 Migration code for people using previous version of the HTTP binding module (EJAB-390) 
SVN Revision: 2293
 2009-06-16 18:25:51 +00:00
Badlop
86738e965f Do not overwrite the stanza namespace (thanks to Anastasia Gornostaeva) 
SVN Revision: 2292
 2009-06-16 18:25:46 +00:00
Badlop
818f28d85f Support for c2s ACL access, max_stanza and shaper on http_poll connections (EJAB-243, EJAB-415, EJAB-416)(thanks to Michael Remond) 
SVN Revision: 2291
 2009-06-16 18:25:42 +00:00
Badlop
5f7356c16c The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it is recommended to use string:to_lower/1 instead. 
SVN Revision: 2290
 2009-06-16 18:25:38 +00:00
Badlop
b0b708ddea Use DEBUG instead of INFO_MSG to keep log files small. Fix parse errors for grepping 'stream:error' (thanks to Stefan Strigler) 
SVN Revision: 2289
 2009-06-16 18:25:34 +00:00
Badlop
4adf23b4e9 Forgot keyword 'catch' when doing list_to_float on bosh version attribute for initial request (thanks to Stefan Strigler) 
SVN Revision: 2288
 2009-06-16 18:25:30 +00:00
Badlop
2f29e761c2 Fixes for pausing sessions; did not parse 'pause' attribute to int (thanks to Stefan Strigler) 
SVN Revision: 2287
 2009-06-16 18:25:26 +00:00
Badlop
8aede81188 Support pausing sessions (thanks to Stefan Strigler) (thanks to Stefan Strigler) 
SVN Revision: 2286
 2009-06-16 18:25:22 +00:00
Badlop
c151da684d Comment-header: talk about xmpp over bosh rather than http binding (thanks to Stefan Strigler) 
SVN Revision: 2285
 2009-06-16 18:25:18 +00:00
Badlop
bf4e927142 Removed debugging stuff. Removed error condition (thanks to Stefan Strigler) 
SVN Revision: 2284
 2009-06-16 18:25:14 +00:00
Badlop
7cb0b1a911 Code cleanup. Code reorganization. Store version of bosh session. Use bosh version for error conditions (thanks to Stefan Strigler) 
SVN Revision: 2283
 2009-06-16 18:25:10 +00:00
Badlop
6cbae7025c Store version as float (thanks to Stefan Strigler) 
SVN Revision: 2282
 2009-06-16 18:25:06 +00:00
Badlop
202bece16d Save bosh version with session (thanks to Stefan Strigler) 
SVN Revision: 2281
 2009-06-16 18:25:02 +00:00
Badlop
f07df01185 Code rearranged (thanks to Stefan Strigler) 
SVN Revision: 2280
 2009-06-16 18:24:58 +00:00
Badlop
702978fa4b Make use of macros for namespaces. Some code cleanup. (thanks to Stefan Strigler) 
SVN Revision: 2279
 2009-06-16 18:24:54 +00:00
Badlop
b79473b2f5 Fix for 'terminate' in request, send empty body instead of error (thanks to Stefan Strigler) 
SVN Revision: 2278
 2009-06-16 18:24:50 +00:00
Badlop
80b59441d5 Disabled debugging (thanks to Stefan Strigler) 
SVN Revision: 2277
 2009-06-16 18:24:46 +00:00
Badlop
f422ec457a Some code cleanup (thanks to Stefan Strigler) 
SVN Revision: 2276
 2009-06-16 18:24:42 +00:00
Badlop
5048b6bdaf Bosh compliance: honor xmpp:version (thanks to Stefan Strigler) 
SVN Revision: 2275
 2009-06-16 18:24:38 +00:00
Badlop
01dc4611b9 Restore ejabberd directory structure (src/web) for integration as patch (thanks to Christohpe Romain) 
SVN Revision: 2274
 2009-06-16 18:24:34 +00:00
Badlop
5495516c30 We do not send a 'version' attribute at the stream header for now (thanks to Stefan Strigler) 
SVN Revision: 2273
 2009-06-16 18:24:30 +00:00
Badlop
2f8112b108 Prepare_response: fixed a dbg message. Changed http header (thanks to Stefan Strigler) 
SVN Revision: 2272
 2009-06-16 18:24:26 +00:00
Badlop
229c24e1f2 Implements sockname and peername for compatibility (thanks to Christohpe Romain) 
SVN Revision: 2271
 2009-06-16 18:24:22 +00:00
Badlop
832d59803a Reverted to r76 as 97 is completely broken and should not have been checked in at all (thanks to Stefan Strigler) 
SVN Revision: 2270
 2009-06-16 18:24:18 +00:00
Badlop
197639a34b Minor changes (thanks to Stefan Strigler) 
SVN Revision: 2269
 2009-06-16 18:24:14 +00:00
Badlop
bb229a3a0c Disabled debug (thanks to Stefan Strigler) 
SVN Revision: 2268
 2009-06-16 18:24:09 +00:00
Badlop
eca818be5a Deal with return values from starting/terminating supervisor (thanks to Stefan Strigler) 
SVN Revision: 2267
 2009-06-16 18:24:05 +00:00
Badlop
33896adf9d Disabled debug (thanks to Stefan Strigler) 
SVN Revision: 2266
 2009-06-16 18:24:01 +00:00
Badlop
f5223b1643 Removed my own supervisor (thanks to Stefan Strigler) 
SVN Revision: 2265
 2009-06-16 18:23:57 +00:00
Badlop
ecc2bbd752 Renamed some vars for (thanks to Stefan Strigler) 
SVN Revision: 2264
 2009-06-16 18:23:53 +00:00
Badlop
d019405d51 Start supervisor here (thanks to Stefan Strigler) 
SVN Revision: 2263
 2009-06-16 18:23:49 +00:00
Badlop
7d62dff7e5 Make use of new api for plugable http based services (thanks to Stefan Strigler) 
SVN Revision: 2262
 2009-06-16 18:23:45 +00:00
Badlop
dd8e4c620b Initial commit of HTTP-Bind source code (thanks to Stefan Striegler) 
SVN Revision: 2261
 2009-06-16 18:23:40 +00:00
Badlop
77a62670d3 Add permanent section about mod_http_fileserver to the Guide. Example config. 
SVN Revision: 2197
 2009-06-16 13:53:25 +00:00
Badlop
8e8b78a4c3 Add forgotten copyright and license notices. 
SVN Revision: 2196
 2009-06-16 13:53:18 +00:00
Badlop
249ee4b318 New option directory_indices, and improve logging (thanks to Brian Cully)(EJAB-932) 
SVN Revision: 2195
 2009-06-16 13:53:13 +00:00
Badlop
226bcd1360 Fix capitalization of HTTP headers (thanks to Brian Cully)(EJAB-892) 
SVN Revision: 2194
 2009-06-16 13:53:07 +00:00
Badlop
4956ed11f4 Converted to gen_server behaviour (EJAB-561). Use the general reopen_log_hook instead of ejabberdctl command. 
SVN Revision: 2193
 2009-06-16 13:53:02 +00:00
Badlop
b44a3c7650 Fix ip source to comply with new ip storage into ejabberd_http (thanks to Christophe Romain) 
SVN Revision: 2192
 2009-06-16 13:52:57 +00:00
Badlop
fa83147926 Use httpd_util:to_lower when not compiling with Erlang R12 (EJAB-628) 
SVN Revision: 2191
 2009-06-16 13:52:52 +00:00
Badlop
14afea1a20 Added JavaScript content type 
SVN Revision: 2190
 2009-06-16 13:52:47 +00:00
Badlop
4fdc4a2e06 Include Last-Modified HTTP header in responses to allow caching (EJAB-546) in mod_http_fileserver and mod_muc_log_http. 
SVN Revision: 2189
 2009-06-16 13:52:42 +00:00
Badlop
0864e8a24f Fix error creating ETS table if enabled in several vhosts (EJAB-551). Unregister the command when stopping the module. 
SVN Revision: 2188
 2009-06-16 13:52:37 +00:00
Badlop
6af85aea18 Remove Erlang module attribute 'vsn' because it doesn't provide any worth feature, and it difficults hot code update (EJAB-440) 
SVN Revision: 2187
 2009-06-16 13:52:32 +00:00
Badlop
0d4155b902 The Erlang/OTP function httpd_util:to_lower/1 is deprecated, and it's recommended to use string:to_lower/1 instead. 
SVN Revision: 2186
 2009-06-16 13:52:28 +00:00
Badlop
91193bf928 Small change in accesslog file format; fix bug when accesslog conf parameter wasn't present in the conf file (thanks to Jerome Sautret) 
SVN Revision: 2185
 2009-06-16 13:52:17 +00:00
Badlop
b57248e822 Added accesslog parameter to record requests log in a file similar to Apache (thanks to Jerome Sautret) 
SVN Revision: 2184
 2009-06-16 13:52:12 +00:00
Badlop
487b80b9b0 Initial commit of mod_http_fileserver (thanks to Massimiliano Mirra) 
SVN Revision: 2183
 2009-06-16 13:52:07 +00:00
Badlop
818a70bdd7 Do not include mod_irc, it can be found in ejabberd-modules SVN. Iconv not required. (EJAB-954) 
SVN Revision: 2167
 2009-06-16 11:27:33 +00:00
Mickaël Rémond
940f5be35e Fix syntax error in config file 
SVN Revision: 2166
 2009-06-16 00:49:09 +00:00
Badlop
88fd7b226a Add option to restrict max offline messages by Access and ACL (EJAB-951) 
New option for mod_offline: access_max_user_messages.
The old option user_max_messages is no longer supported.

SVN Revision: 2163
 2009-06-15 17:44:04 +00:00
Badlop
2f6cea2be3 Fix warning about a case already covered. 
SVN Revision: 2161
 2009-06-15 17:27:11 +00:00
Badlop
b4a1b4c8fb Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2160
 2009-06-15 17:27:06 +00:00
Badlop
2f3963417f Prevent process crash if the IP and port of a connection is unknown. 
SVN Revision: 2156
 2009-06-11 18:57:03 +00:00
Badlop
8de03275c3 When client is closed, include the Reason in the stream trailer stanza. 
SVN Revision: 2154
 2009-06-09 12:10:24 +00:00
Badlop
60f52b2cd8 Add forgotten copyright and license notices. Fix blackspaces. 
SVN Revision: 2152
 2009-06-09 10:56:49 +00:00
Badlop
dd101c99e5 Malformed CAPTCHA response may crash a room. This is now fixed. (thanks to Evgeniy Khramtsov) 
SVN Revision: 2150
 2009-06-09 09:39:07 +00:00
Badlop
a45e6da3d0 Remove support of deprecated Disco Publish XEP-0030 (EJAB-904) 
SVN Revision: 2141
 2009-06-02 18:09:01 +00:00
Badlop
2b6f45e4c1 Update some calls from jlib:make_jid to exmpp_jid:make 
SVN Revision: 2139
 2009-06-01 23:44:55 +00:00
Badlop
332de67fe2 Fix some calls to exmpp 
SVN Revision: 2138
 2009-06-01 21:04:16 +00:00
Badlop
ff3fd02115 Fix Access check: the rule can be defined in a vhost or global. 
SVN Revision: 2137
 2009-06-01 21:04:11 +00:00
Karim Gemayel
437c9d07f5 API renaming : bare_jid_to_binary -> bare_to_binary 
SVN Revision: 2135
 2009-06-01 17:00:44 +00:00
Karim Gemayel
9abe47f350 API renaming : jid_to_binary -> to_binary 
SVN Revision: 2134
 2009-06-01 16:59:08 +00:00
Karim Gemayel
7a884ced32 API renaming : bare_jid_to_list -> bare_to_list 
SVN Revision: 2133
 2009-06-01 16:54:33 +00:00
Karim Gemayel
0ace8bda8c API renaming : prepd_jid_to_list -> prep_to_list 
SVN Revision: 2132
 2009-06-01 16:53:48 +00:00
Karim Gemayel
15bc238297 API renaming : jid_to_list -> to_list 
SVN Revision: 2131
 2009-06-01 16:52:14 +00:00
Karim Gemayel
1b94c7a8b3 API renaming : compare_bare_jids -> bare_compare 
SVN Revision: 2130
 2009-06-01 16:50:36 +00:00
Karim Gemayel
c31f99937f API renaming : compare_jids -> compare 
SVN Revision: 2129
 2009-06-01 16:49:00 +00:00
Karim Gemayel
4258b99b2b API renaming : lresource_as_list -> prep_resource_as_list 
SVN Revision: 2128
 2009-06-01 16:43:15 +00:00
Karim Gemayel
29c0e17ca2 API renaming : lresource -> prep_resource 
SVN Revision: 2127
 2009-06-01 16:42:07 +00:00
Karim Gemayel
d51d9e9fff API renaming : lnode_as_list -> prep_node_as_list 
SVN Revision: 2126
 2009-06-01 16:40:51 +00:00
Karim Gemayel
d5f2c41f26 API renaming : lnode -> prep_node 
SVN Revision: 2125
 2009-06-01 16:39:36 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
19d7d79229 API renaming : ldomain -> prep_domain 
SVN Revision: 2123
 2009-06-01 16:37:15 +00:00
Karim Gemayel
526dc54173 API renaming : parse_jid -> parse 
SVN Revision: 2122
 2009-06-01 16:35:55 +00:00
Karim Gemayel
a136192db2 API renaming : bare_jid_to_jid -> full 
SVN Revision: 2121
 2009-06-01 16:34:38 +00:00
Karim Gemayel
5dbc4f9954 API renaming : jid_to_bare_jid > bare 
SVN Revision: 2120
 2009-06-01 16:30:15 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Christophe Romain
7c45f8f053 fix nodetree virtual to allow node subscription 
SVN Revision: 2117
 2009-05-29 00:44:07 +00:00
Christophe Romain
497d4d26bb make flat the default node plugin 
SVN Revision: 2116
 2009-05-29 00:27:26 +00:00
Christophe Romain
db6a8c2e05 fix ets table name change 
SVN Revision: 2115
 2009-05-29 00:13:21 +00:00
Christophe Romain
a16230c9ca pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling 
SVN Revision: 2114
 2009-05-28 23:21:50 +00:00
Badlop
0bbbf468f0 Fix crashes when browsing some WebAdmin pages (EJAB-821) 
SVN Revision: 2111
 2009-05-27 17:29:58 +00:00
Badlop
9bcba6c8b8 Update CSS of WebAdmin menu 
SVN Revision: 2110
 2009-05-27 17:29:50 +00:00
Badlop
a1fe76fb5b Support to select what modules to update. Split large function in smaller ones. 
SVN Revision: 2109
 2009-05-27 17:29:43 +00:00
Pablo Polvorin
dc613df3b1 Do not indent the resulting html. Indentation in exmpp is buggy, and there isn't a real adventage on indenting the generated html 
SVN Revision: 2106
 2009-05-27 15:02:44 +00:00
Christophe Romain
45a8a0fb53 make get_items able to sort items in publish order (EJAB-824) 
SVN Revision: 2105
 2009-05-26 22:50:11 +00:00
Christophe Romain
aa210166c4 improve get_entity_* to work regardless of nodetree (EJAB-937) 
SVN Revision: 2104
 2009-05-26 21:50:13 +00:00
Badlop
43a3fef7bb Document how to setup CAPTCHA. Install example captcha.sh (EJAB-895) 
SVN Revision: 2103
 2009-05-26 17:20:50 +00:00
Badlop
55bebb0f62 Implement XEP-158 CAPTCHA Forms, support in mod_muc, sample script (thanks to Evgeniy Khramtsov)(EJAB-895) 
SVN Revision: 2102
 2009-05-26 17:20:09 +00:00
Badlop
18ae44f930 Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov) 
SVN Revision: 2099
 2009-05-25 17:16:54 +00:00
Badlop
dc3899dfd9 Decrease proxy65 buffer sizes to 8192 bytes. 
The original size of 65535 confused clients with tight
shapers (thanks to Evgeniy Khramtsov)

SVN Revision: 2097
 2009-05-25 11:19:28 +00:00
Mickaël Rémond
b6b4b0cdf9 * trunk/src/odbc/ejabberd_odbc.erl: Fix typo (EJABS-859) (EJAB-940) (CR-EJAB-10) 
* branches/road-to-exmpp/src/odbc/ejabberd_odbc.erl: Likewise.

SVN Revision: 2095
 2009-05-21 16:43:33 +00:00
Mickaël Rémond
8be73967fd * src/odbc/ejabberd_odbc.erl: Support for nested transactions (EJABS-859) (EJAB-940) (CR-EJAB-10) 
SVN Revision: 2094
 2009-05-21 16:28:49 +00:00
Christophe Romain
2e26b6bf8b PubSub: improve get_entity_* API 
SVN Revision: 2091
 2009-05-19 22:29:28 +00:00
Badlop
b473862da6 Added API function to get current S2S connections with information 
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)

SVN Revision: 2089
 2009-05-19 09:39:13 +00:00
Badlop
0a9581a375 LDAP bind attempts: log warnings and increase timeout after reject. 
Merged from trunk SVN r2086:
Log warnings on unsuccessful LDAP bind attempts.
Increase timeout before the next LDAP bind attempt up to
five seconds if the last bind attempt was rejected by the
LDAP server ("soft" error) (thanks to Konstantin Khomoutov)

SVN Revision: 2087
 2009-05-18 11:41:53 +00:00
Badlop
23509c1688 New command to convert mnesia nodename, copied from OTP and Debian 
SVN Revision: 2084
 2009-05-15 22:56:55 +00:00
Badlop
a63f548528 Allow to define additional Erlang options in ejabberdctl.cfg (thanks to Sergei Golovan) 
SVN Revision: 2083
 2009-05-15 22:56:13 +00:00
Badlop
ee8ed2828a The --node argument overwrites the value of ejabberdctl.cfg 
SVN Revision: 2082
 2009-05-15 22:55:29 +00:00
Badlop
35daf5df78 No longer edit ChangeLog, will be auto generated for ejabberd releases. 
Added new call 'make changelog' which generates a ChangeLog file by
prepending to the old file obtained from SVN the new lines obtained
from SVN Log and formatted with svn2cl.
ChangeLog will be generated and included in ejabberd releases.

SVN Revision: 2076
 2009-05-14 21:12:12 +00:00
Mickaël Rémond
3ca2d4dab3 * src/ejabberd_debug.erl: Handled fprof based profiling (EJABS-872). 
* src/ejabberd_app.erl: Likewise.

SVN Revision: 2075
 2009-05-13 12:36:37 +00:00
Christophe Romain
c12b1870b7 Fix bad transaction returncode in unsubscribe presence handler 
SVN Revision: 2074
 2009-05-12 21:00:05 +00:00
Christophe Romain
fd36726357 Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934) 
SVN Revision: 2072
 2009-05-11 17:27:55 +00:00
Christophe Romain
8dc1bb0659 handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr 
SVN Revision: 2069
 2009-05-08 01:28:17 +00:00
Christophe Romain
38413dc236 Allow to get subscriptions on a given node (EJAB-712), and presence based fixes 
SVN Revision: 2067
 2009-05-08 00:02:08 +00:00
Badlop
ef94ad36cd Merge 2063 from trunk. 
* src/ejabberd_app.erl: Better support for profiling.
* src/ejabberd.erl: Likewise
* src/ejabberd_ctl.erl: Likewise
* src/ejabberd_debug.erl: Likewise

SVN Revision: 2064
 2009-05-07 22:56:23 +00:00
Christophe Romain
e40e4298ca several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871 
SVN Revision: 2061
 2009-05-07 00:54:44 +00:00
Badlop
1d3947c0da Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2057
 2009-05-06 16:54:43 +00:00
Badlop
69349925a3 * src/Makefile.in: Prevent Erlang R13B compilation warning: 
behaviour X undefined (EJAB-920)

SVN Revision: 2056
 2009-05-06 15:15:09 +00:00
Badlop
921c7ede0d * src/ejabberd_loglevel.erl: Use dynamic_compile instead of 
ram_file_io_server. Support definition of loglevels with integer
or atom. (thanks to Geoff Cant)(EJAB-919)
* src/dynamic_compile.erl: Added erlang module that converts
string to binary loadable code by Mats Cronqvist, Chris Newcombe,
and Jacob Vorreuter.
* src/ram_file_io_server.erl: Remove file not longer useful.
* src/ejabberd.app: Likewise

SVN Revision: 2054
 2009-05-06 14:51:51 +00:00
Badlop
e202ec009e * src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899) 
SVN Revision: 2053
 2009-05-03 11:26:18 +00:00
Christophe Romain
ced30acb20 backport pubsub/pep/caps optimizations from trunk 
SVN Revision: 2052
 2009-04-30 23:17:38 +00:00
Badlop
3debaf99d8 * src/ejabberd_hooks.erl: Support distributed hooks (EJAB-829) 
SVN Revision: 2047
 2009-04-28 14:57:16 +00:00
Badlop
2908e5da19 Merge 1969 and 1970 from trunk. 
* src/ejabberd_hooks.erl: anonymous functions support.

SVN Revision: 2046
 2009-04-28 14:46:12 +00:00
Badlop
5afe7cfafb * src/translate.erl: Support additional files (EJAB-925) 
* contrib/extract_translations/extract_translations.erl: Likewise
* contrib/extract_translations/prepare-translation.sh: Likewise

SVN Revision: 2044
 2009-04-27 20:55:35 +00:00
Badlop
d7829a76ce * src/win32_dns.erl: Fix problem parsing some win32 dns (EJAB-927) 
SVN Revision: 2043
 2009-04-27 20:36:19 +00:00
Badlop
ec779c001c * src/cyrsasl_digest.erl: Fix auth verification (EJAB-863) 
SVN Revision: 2042
 2009-04-27 20:24:21 +00:00
Badlop
028509c3a9 * src/jlib.erl: Fix recursive call to speedup base64 
decoding (thanks to Jeffrey Rogiers)(EJAB-333)

SVN Revision: 2041
 2009-04-27 19:17:17 +00:00
Christophe Romain
fd5e312ed9 minor cosmetic fix 
SVN Revision: 2040
 2009-04-24 21:34:59 +00:00