aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->0.10Matthew Wild2014-08-2810-20/+36
|\
| * util.filters: Ignore filters being added twice (fixes issues on removal)Matthew Wild2014-08-281-0/+2
| * mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)Matthew Wild2014-08-281-1/+1
| * mod_c2s, mod_s2s: Log received invalid stream headersMatthew Wild2014-08-232-1/+2
| * util.xmppstream: When error is 'no-stream', pass the received tagname to the ...Matthew Wild2014-08-231-1/+1
| * mod_s2s: Reset stream ID when resetting stream [compliance]Kim Alvefur2014-08-271-0/+1
| * modulemanager: Reduce warning to debug level message about modules already be...Kim Alvefur2014-08-271-1/+1
| * net.http.server: Comment out a log messageKim Alvefur2014-08-271-1/+1
| * mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double...Kim Alvefur2014-08-261-1/+2
| * mod_compression: Handle compression setup errors by logging a warning about i...Kim Alvefur2014-08-261-0/+6
| * mod_posix: Make sure that 'pidfile' is a stringKim Alvefur2014-08-261-1/+1
| * prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwiseKim Alvefur2014-08-262-0/+5
* | util.xmppstream: Don't include empty stream ID in stream header (got here fro...Kim Alvefur2014-08-271-1/+1
* | mod_private: Fix traceback due to missing table indexKim Alvefur2014-08-131-1/+1
* | mod_blocklist: Use full word as variable name, we can afford thatKim Alvefur2014-08-121-4/+4
* | mod_blocklist: Correct commentKim Alvefur2014-08-121-1/+1
* | mod_blocklist: Fix any unblock emptying the blocklistKim Alvefur2014-08-121-1/+1
* | mod_privacy: Remove, leave a log message about being replaced by mod_blocklis...Kim Alvefur2014-08-101-438/+3
* | prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default c...Kim Alvefur2014-08-101-1/+1
* | mod_blocklist: XEP-0191 implementation written for speed and independence fro...Kim Alvefur2014-08-101-0/+273
* | mod_private: Cleanup and more tailcallsKim Alvefur2014-08-091-30/+26
* | util.jid: Optimize bareKim Alvefur2014-08-071-5/+1
* | util.jid: Use existing join function in jid.prepKim Alvefur2014-08-071-15/+8
* | util.jid: Return early in join on invalid jidsKim Alvefur2014-08-071-6/+5
* | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
* | Merge 0.9->0.10Matthew Wild2014-07-312-4/+7
|\|
| * prosodyctl: Remove nonsensical warningMatthew Wild2014-07-311-1/+0
| * prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluserMatthew Wild2014-07-311-3/+5
| * configmanager: nameprep VirtualHost and Component namesMatthew Wild2014-07-311-0/+5
* | mod_s2s_auth_certs: Pick a logging function once and stick with itKim Alvefur2014-07-251-4/+5
* | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into n...Kim Alvefur2014-07-253-34/+46
* | Merge 0.9->0.10Matthew Wild2014-07-252-0/+2
|\|
| * net.server_select/event: Switch sender mode to *a when reading, to make sure ...Matthew Wild2014-07-252-0/+2
* | Merge 0.9->0.10Matthew Wild2014-07-252-11/+8
|\|
| * mod_admin_telnet: Fix dns:(add,set)nameservers()Kim Alvefur2014-07-251-2/+2
| * net.dns: Remove unused obsolete codeMatthew Wild2014-07-251-4/+1
| * net.dns: Ensure all pending requests get notified of a timeout when looking u...Matthew Wild2014-07-251-5/+5
* | mod_dialback: Respect dwd config optionKim Alvefur2014-07-091-1/+1
* | mod_dialback.lua: Only check certificates on secure connectionsKim Alvefur2014-07-041-6/+8
* | mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use th...Kim Alvefur2014-07-046-12/+13
* | mod_dialback: Short-circuit dialback auth if certificate is considered validKim Alvefur2014-07-042-1/+11
* | mod_dialback: Keep the same dialback secret across module reloadsKim Alvefur2014-07-031-1/+9
* | hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-222-2/+4
* | Merge 0.9->0.10Kim Alvefur2014-07-040-0/+0
|\|
| * mod_register: get_child_text! (thanks Lloyd)Kim Alvefur2014-07-031-2/+2
* | mod_tls: Simplify and use new ssl config merging in certmanagerKim Alvefur2014-07-031-15/+17
* | core.portmanager: Simplify and take advantage of new ssl config merging in ce...Kim Alvefur2014-07-031-28/+9
* | core.certmanager: Make create_context() support an arbitrary number of option...Kim Alvefur2014-07-031-3/+6
* | core.certmanager: Use util.sslconfigKim Alvefur2014-07-031-71/+14
* | util.sslconfig: Add lib to deal with LuaSec SSL context configsKim Alvefur2014-07-031-0/+87