Software / code / prosody
Changeset
6925:3c4799467dae
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 17 Nov 2015 17:12:45 +0000 |
| parents | 6920:7596c37e0a63 (current diff) 6924:c37ad3e1fdd9 (diff) |
| children | 6928:02717098cbba |
| files | plugins/muc/muc.lib.lua |
| diffstat | 3 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/certs/openssl.cnf Mon Nov 09 22:56:32 2015 +0100 +++ b/certs/openssl.cnf Tue Nov 17 17:12:45 2015 +0000 @@ -13,8 +13,8 @@ default_bits = 4096 default_keyfile = example.com.key distinguished_name = distinguished_name -req_extensions = v3_extensions -x509_extensions = v3_extensions +req_extensions = certrequest +x509_extensions = selfsigned # ask about the DN? prompt = no @@ -28,16 +28,22 @@ organizationalUnitName = XMPP Department emailAddress = xmpp@example.com -[ v3_extensions ] +[ certrequest ] # for certificate requests (req_extensions) -# and self-signed certificates (x509_extensions) basicConstraints = CA:FALSE keyUsage = digitalSignature,keyEncipherment extendedKeyUsage = serverAuth,clientAuth subjectAltName = @subject_alternative_name +[ selfsigned ] + +# and self-signed certificates (x509_extensions) + +basicConstraints = CA:TRUE +subjectAltName = @subject_alternative_name + [ subject_alternative_name ] # See http://tools.ietf.org/html/rfc6120#section-13.7.1.2 for more info.
--- a/plugins/muc/muc.lib.lua Mon Nov 09 22:56:32 2015 +0100 +++ b/plugins/muc/muc.lib.lua Tue Nov 17 17:12:45 2015 +0000 @@ -546,7 +546,7 @@ if (type == "error" or type == "result") then do -- deconstruct_stanza_id if not occupant then return nil; end - local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$"); + local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$"); if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end local from_occupant_jid = self:get_occupant_jid(from_jid); if from_occupant_jid == nil then return nil; end
--- a/prosody Mon Nov 09 22:56:32 2015 +0100 +++ b/prosody Tue Nov 17 17:12:45 2015 +0000 @@ -372,8 +372,10 @@ prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback}); end + local sleep = require"socket".sleep; + while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do - socket.sleep(0.2); + sleep(0.2); end end
