Commit graph

5777 commits

Author SHA1 Message Date
Florian Zeitz
1d833bb807 Remove all trailing whitespace 2013-08-09 17:48:21 +02:00
Kim Alvefur
96ec63e3c3 Merge 0.9->trunk 2013-08-09 16:03:48 +02:00
Kim Alvefur
a6f6a0568f util.hashes: Silence compiler warning about pointer signedness 2013-08-09 16:03:17 +02:00
Matthew Wild
5383602429 mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing. 2013-08-09 11:10:22 +01:00
Matthew Wild
96466999c1 mod_disco: Check for host type == 'local' ('normal' never existed) 2013-08-06 17:18:39 +01:00
Matthew Wild
c8e0c8a63b moduleapi: module:get_host_type() now returns 'global' for * and 'local' for non-components 2013-08-06 17:17:23 +01:00
Kim Alvefur
132f38d70a Merge 0.9->trunk 2013-08-06 14:35:03 +02:00
Kim Alvefur
a316833b30 mod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details 2013-08-06 14:32:31 +02:00
Kim Alvefur
22ad7256ba util.hashes: Correct argument order 2013-08-06 14:31:20 +02:00
Kim Alvefur
bb9aa809b1 mod_s2s: Improve policy check 2013-08-05 20:47:38 +02:00
Kim Alvefur
47ec51ca07 mod_s2s: Log certificate identity validation result 2013-08-04 17:33:00 +02:00
Kim Alvefur
6b7b6e0e7b mod_storage_sql2: Do an early return and drop an indentation level 2013-08-02 15:40:21 +02:00
Kim Alvefur
0c6c0e9c29 mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details 2013-08-02 15:12:24 +02:00
Kim Alvefur
7204bd3a23 mod_register: Use more specific get_option variants 2013-08-02 14:44:56 +02:00
Florian Zeitz
df20900907 mod_adhoc: Add local_user permission 2013-07-24 23:30:32 +02:00
Florian Zeitz
c24241a389 mod_adhoc: Use mod_disco for disco handling 2013-07-24 22:58:44 +02:00
Florian Zeitz
81410b7371 mod_adhoc: Sort commands by node. This guarantees the order remains the same across restarts etc. 2013-07-24 22:08:07 +02:00
Kim Alvefur
0f421f9b7c Merge 0.9->trunk 2013-07-24 21:50:38 +02:00
Kim Alvefur
14d72bec0f adhoc.lib: Don't build error reply from reply stanza 2013-07-24 21:49:36 +02:00
Kim Alvefur
aa15ed7020 mod_c2s: Change default of tcp_keepalives to true, and make it individually configurable through c2s_tcp_keepalives 2013-07-24 15:28:36 +02:00
Kim Alvefur
935cf8ba76 Merge 0.9->trunk 2013-07-22 20:29:41 +02:00
Kim Alvefur
4b01c2691b net.server_event: Pass ondrain handler from listener 2013-07-22 18:17:30 +02:00
Kim Alvefur
74b83382ab net.http.server: Fix Keep-Alive requests with HTTP 1.0 2013-07-22 17:28:37 +02:00
Matthew Wild
e5f6bd8c4c Merge 0.9->trunk 2013-07-15 23:43:37 +01:00
Matthew Wild
6575f3a4e9 util.net: Fix compilation on Windows (outputs an empty list of addresses for now) (tested only in my head) 2013-07-15 23:43:20 +01:00
Matthew Wild
a4810c029e Merge 0.9->trunk 2013-07-15 23:35:49 +01:00
Matthew Wild
8dd5866eda util.net: Include missing header needed for successful compiltion on FreeBSD 2013-07-15 23:34:59 +01:00
Matthew Wild
3df683edb7 util.events: Remove varargs, event handlers can now only accept a single parameter 2013-07-15 12:15:51 +01:00
Matthew Wild
cab180216b mod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, and shared modules make it easy for global modules to hook per-host now) 2013-07-15 11:44:49 +01:00
Matthew Wild
71ab938d53 rostermanager, mod_groups: Change roster-load event to pass an event table for consistency 2013-07-15 11:43:23 +01:00
Matthew Wild
7a8fd288b5 Merge 0.9->trunk 2013-07-13 13:17:53 +01:00
Matthew Wild
2840e0726a certmanager: Set our own default cipher string, which includes only ciphers regarded as 'HIGH' strength (by OpenSSL). In particular this disables RC4. 2013-07-13 13:15:24 +01:00
Kim Alvefur
f7acbbc783 util.sql: Do lazy fetching of affected/rowcount 2013-07-12 17:44:30 +02:00
Kim Alvefur
051779d694 Backed out changeset 3c57c2281087 2013-07-12 17:41:54 +02:00
Kim Alvefur
c41f00e53f util.sql: Don't fetch row count of result sets for queries that don't have result sets 2013-07-12 17:03:09 +02:00
Kim Alvefur
3d9b1be698 mod_storage_sql2: Add archive store with append and find methods 2013-07-12 02:53:24 +02:00
Kim Alvefur
8a80110435 mod_storage_sql2: Create an additional table prosodyarchive for chronological collections 2013-07-12 01:34:38 +02:00
Kim Alvefur
06e7d7b489 util.sql: Set charset and collation for MySQL when creating tables 2013-07-11 22:07:55 +02:00
Matthew Wild
7fa95071ed Remove plugins/storage/sqlbasic.lib.lua, which seems obsolete 2013-07-11 15:13:45 +01:00
Matthew Wild
cda9b9c8f8 Merge 0.9->trunk 2013-07-11 15:10:04 +01:00
Matthew Wild
26511c10d4 mod_storage_sql2: Remove from 0.9 2013-07-11 15:08:47 +01:00
Kim Alvefur
298aef6be7 mod_storage_sql2: Support XML serialization for stanzas. 2013-07-10 13:19:33 +02:00
Kim Alvefur
1e1834a4ec mod_storage_sql2: Keep available store types in a table 2013-07-10 13:18:10 +02:00
Kim Alvefur
06561ae513 mod_storage_sql2: Fix iteration over users and stores 2013-07-10 12:08:44 +02:00
Kim Alvefur
01de781b7b mod_storage_sql2: Make sure the user field is not NULL 2013-07-10 12:01:23 +02:00
Kim Alvefur
7cbbf991bc Merge 0.9->trunk 2013-07-10 07:47:54 +02:00
Kim Alvefur
5b13d561ee net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix) 2013-07-10 07:45:10 +02:00
Matthew Wild
b5ccfb0d78 Merge 0.9->trunk 2013-07-09 00:04:30 +01:00
Matthew Wild
98ce253063 mod_component: Local imports for some functions, including xpcall 2013-07-08 23:59:51 +01:00
Matthew Wild
b4da24a9cb mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listeners. This ensures that stanzas following a traceback-causing stanza in a request will still be processed (as would happen on normal c2s). 2013-07-08 23:59:27 +01:00