1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 14:47:37 +03:00
Commit graph

1624 commits

Author SHA1 Message Date
Kim Alvefur
38c157896a Merge 0.10->trunk 2017-11-20 02:22:09 +01:00
Kim Alvefur
0158bad7ad certmanager: Set single curve conditioned on LuaSec advertising EC crypto support 2017-11-20 00:27:26 +01:00
Kim Alvefur
b9005e7b8a certmanager: Filter out curves not supported by LuaSec 2017-11-20 00:26:41 +01:00
Kim Alvefur
0315d775b2 certmanager: Change table representing LuaSec capabilities to match capabilities table exposed in LuaSec 0.7 2017-11-20 00:25:18 +01:00
Kim Alvefur
5618526b31 Merge 0.10->trunk 2017-10-29 02:05:19 +02:00
Kim Alvefur
efcd11b541 rostermanager: Log warning if removal self-contact failed 2017-10-29 00:07:45 +02:00
Kim Alvefur
04bdf078d3 rostermanager: Use internal method for storing removal of self-contact 2017-10-29 00:07:18 +02:00
Kim Alvefur
314beadb4b rostermanager: Demote warning to debug message 2017-10-29 00:06:26 +02:00
Kim Alvefur
bf3bb71ed6 rostermanager: Capitalize log message 2017-10-29 00:05:26 +02:00
Kim Alvefur
81dc4dad41 Merge 0.10->trunk 2017-10-25 01:32:30 +02:00
Kim Alvefur
a9461d5ec8 core.stanza_router: Verify that xmlns exists for firing stanza/iq/xmlns/name events (fixes ) (thanks SamWhited) 2017-10-17 07:09:00 +02:00
Kim Alvefur
ca622317f1 Merge 0.10->trunk 2017-09-29 13:45:03 +02:00
Kim Alvefur
e1a94acbb9 core.certmanager: Set a default curveslist [sic], fixes , , if used along with luasec 0.7 and openssl 1.1 2017-09-27 15:45:07 +02:00
Kim Alvefur
296e430244 prosodyctl: cert import: Reuse function from certmanager for locating certificates and keys 2017-09-27 15:21:20 +02:00
Matthew Wild
d6833915bc Merge 0.10->trunk 2017-09-26 17:24:25 +01:00
Matthew Wild
2ae9801ba6 certmanager: Add debug logging (thanks av6) 2017-09-23 17:13:29 +01:00
Kim Alvefur
43e5d4df29 Merge 0.10->trunk 2017-09-21 02:36:28 +02:00
Matthew Wild
d16959ce16 hostmanager: Add support for 'disco_hidden' option to hide hosts from disco#items (thanks Ge0rG) 2017-09-20 14:42:21 +01:00
Emmanuel Gil Peyrot
67e92afe78 rostermanager: Remove self-contact entry (fixes ) 2017-09-19 19:17:23 +02:00
Emmanuel Gil Peyrot
519ef501d2 rostermanager: Simplify logging. 2017-09-19 19:17:07 +02:00
Kim Alvefur
4c39528a44 loggingmanager: Make timestamps enabled by default in file sink (fixes ) 2017-10-26 22:30:52 +02:00
Kim Alvefur
4c6c255113 Merge 0.10->trunk 2017-09-14 02:48:34 +02:00
Kim Alvefur
a5f43007f1 core.loggingmanager: Remove now unused locals [luacheck] 2017-09-11 19:32:51 +02:00
Kim Alvefur
35717a1e41 loggingmanager, mod_posix: Import util.format correctly (fixes ) 2017-09-11 19:32:12 +02:00
Waqas Hussain
f4aebb575e loggingmanager: Slight cleanup and optimization of file sink 2017-09-10 13:13:24 -04:00
Waqas Hussain
00cb31f022 loggingmanager, mod_posix: Replace the old inconsistent log formatting with the new util.format 2017-09-10 13:05:45 -04:00
Kim Alvefur
73b75571e6 core.usermanager, various modules: Disconnect other resources on password change (thanks waqas) (fixes ) 2017-07-28 13:15:29 +02:00
Matthew Wild
15ee257b35 sessionmanager: Revert session.type if binding fails due to roster load error 2017-07-28 23:45:05 +01:00
Kim Alvefur
f65858dd27 certmanager: Update the 'certificates' option after the config has been reloaded (fixes ) 2017-06-01 14:03:50 +02:00
Kim Alvefur
c5fc8dc1c1 rostermanager: Use correct variable (missed one place while renaming variable in b98006bfd97a) 2017-05-18 01:59:55 +02:00
Kim Alvefur
38f73e28ae Merge 0.10->trunk 2017-08-28 21:05:12 +02:00
Matthew Wild
e9d37d780b Merge 0.10 -> trunk 2017-07-28 23:47:38 +01:00
Kim Alvefur
6fc795d35e Merge 0.10->trunk 2017-06-01 14:05:58 +02:00
Kim Alvefur
ab47caa72f configmanager: Remove unused local [luacheck] 2017-05-28 23:40:26 +02:00
Emmanuel Gil Peyrot
eb231e9eab configmanager: Remove support for multiple parsers, fixes . 2017-05-27 15:32:28 +01:00
Kim Alvefur
cdb000e818 Merge 0.10->trunk 2017-05-18 02:01:20 +02:00
Kim Alvefur
597d317427 Merge 0.10->trunk 2017-03-23 01:30:58 +01:00
Kim Alvefur
932c6e1f44 storagemanager: Use the existing local reference to 'hosts' 2017-03-22 10:38:36 +01:00
Kim Alvefur
3e5d5895f9 Merge 0.10->trunk 2017-03-16 23:49:27 +01:00
Kim Alvefur
911bea7746 core.moduleapi: Factor out code for getting a scalar config option 2017-03-15 15:07:16 +01:00
Kim Alvefur
ca65f0d2d3 Merge 0.10->trunk 2017-03-06 01:14:32 +01:00
Kim Alvefur
e45c5961ac core: Allow select core modules to mutate some globals (needs luacheck 1.19) 2017-03-04 20:09:28 +01:00
Kim Alvefur
1ecc3a7918 core: Split some very long lines [luacheck] 2017-03-04 17:49:48 +01:00
Kim Alvefur
5e7ee9e513 Merge 0.10->trunk 2017-01-02 03:06:51 +01:00
Kim Alvefur
0516532553 stanza_router: Fix typo 2017-01-02 01:59:03 +01:00
Kim Alvefur
90de22b946 Merge 0.10->trunk 2016-12-14 01:47:19 +01:00
Kim Alvefur
2c7554d634 core.stanza_router: Remove hack for allowing resource binding IQ before resource binding 2016-12-13 18:16:20 +01:00
Kim Alvefur
e701756ba9 core.sessionmanager, mod_saslauth: Introduce intermediate session type for authenticated but unbound sessions so that resource binding is not treated as a normal stanza 2016-12-13 18:15:17 +01:00
Kim Alvefur
21a13c5bca Merge 0.10->trunk 2016-12-10 02:55:38 +01:00
Kim Alvefur
bbaaaa99a4 Merge 0.9->0.10 2016-12-09 17:07:57 +01:00