aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge 0.9->trunkMatthew Wild2013-03-287-23/+63
|\|
| * mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from thei...Tobias Markmann2013-03-281-0/+4
| * portmanager: Add use_ipv4 option, default to true.Kim Alvefur2013-03-271-2/+6
| * portmanager: use_ipv6 defaults to true if luasocket has ipv6 supportKim Alvefur2013-03-271-1/+2
| * mod_s2s: Prevent s2s to and from hosts we serve locallyKim Alvefur2013-03-271-0/+12
| * mod_s2s: Prevent traceback when replying to incoming connection to a host we ...Kim Alvefur2013-03-261-1/+1
| * mod_s2s: Reset secure flag on new connection attemptKim Alvefur2013-03-251-0/+4
| * mod_s2s: session.from_host does not allways exist on incoming connections, tr...Kim Alvefur2013-03-251-1/+1
| * mod_s2s: Keep the dns answer object around a while so plugins can look at itKim Alvefur2013-03-231-1/+1
| * net.server, _select: Reorganise configuration of server_select to be more lik...Kim Alvefur2013-03-232-4/+23
| * prosody, prosodyctl: Remove last trace of "core" \o/Kim Alvefur2013-03-232-11/+11
| * net.server: No sections in config anymoreKim Alvefur2013-03-231-2/+2
* | mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from thei...Tobias Markmann2013-03-281-0/+4
* | Merge 0.9->trunkKim Alvefur2013-03-2329-52/+48
|\|
| * configmanager: Fix so unset variables are searched for in the global sectionKim Alvefur2013-03-231-1/+1
| * util.{prosodyctl,openssl}: More use of config sections removedKim Alvefur2013-03-232-7/+7
| * mod_tls: More use of config sections removedKim Alvefur2013-03-231-2/+2
| * core.*: Complete removal of all traces of the "core" section and section-rela...Kim Alvefur2013-03-237-23/+20
| * MUC: Access prosody.hosts instead of the old global hostsKim Alvefur2013-03-231-1/+1
| * mod_proxy65: Fix typo in commentKim Alvefur2013-03-231-1/+1
| * mod_http: Import portmanagerKim Alvefur2013-03-231-0/+1
| * mod_groups: Use module API for reading configKim Alvefur2013-03-231-1/+1
| * mod_roster: Remove unused variableKim Alvefur2013-03-231-1/+0
| * mod_motd, mod_register, mod_private, mod_http_errors, mod_admin_adhoc: Remove...Kim Alvefur2013-03-235-8/+2
| * mod_announce, mod_auth_anonymous, mod_c2s, mod_c2s, mod_component, mod_iq, mo...Kim Alvefur2013-03-239-7/+12
* | Merge 0.9->trunkMatthew Wild2013-03-222-9/+9
|\|
| * mod_s2s: Fix variable usage in check_auth_policy (thanks Florob)Matthew Wild2013-03-221-6/+7
| * s2smanager: Remove unused function parameterMatthew Wild2013-03-221-1/+1
| * s2smanager: Access prosody.hosts instead of hosts global directlyMatthew Wild2013-03-221-1/+1
| * mod_s2s: Remove unused variableMatthew Wild2013-03-221-1/+0
* | Merge 0.9->trunkMatthew Wild2013-03-228-141/+156
|\|
| * mod_s2s: Add controls for certificate validation via the s2s_secure_auth opti...Matthew Wild2013-03-221-3/+32
| * s2smanager, mod_s2s, mod_dialback, mod_saslauth: Move s2smanager.make_authent...Matthew Wild2013-03-224-81/+80
| * hostmanager: Use rawget to check for activated hosts to prevent recursion in ...Matthew Wild2013-03-221-2/+2
| * hostmanager: Use prosody.hosts instead of 'hosts' globalMatthew Wild2013-03-221-1/+1
| * util.pposix: Allow fetching RLIMIT_NICE when availableMatthew Wild2013-03-221-0/+3
| * prosody: Add COMPAT note about globalsMatthew Wild2013-03-221-0/+1
| * configmanager, hostmanager, prosody: Almost complete removal of section-relat...Matthew Wild2013-03-223-54/+37
* | Merge...Matthew Wild2013-03-200-0/+0
|\ \
| * \ Merge 0.9->trunkKim Alvefur2013-03-168-33/+37
| |\ \
* | \ \ Merge 0.9->trunkMatthew Wild2013-03-209-34/+43
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | net.http: Disable SSLv2 support for HTTPS connectionsMatthew Wild2013-03-201-1/+1
| * | net.http: Allow passing an SSL context or options table to be used for HTTPS ...Matthew Wild2013-03-201-1/+6
| |/
| * mod_s2s, mod_saslauth, mod_compression: Refactor to have common code for open...Kim Alvefur2013-03-164-22/+28
| * certs/openssl.cnf: Update XMPP-Core references to reflect RFC publicationKim Alvefur2013-03-151-2/+2
| * s2smanager: Use unused local, reduce table indexingKim Alvefur2013-03-131-5/+5
| * rostermanager: Remove unused importsKim Alvefur2013-03-131-4/+1
| * hostmanager: Import core_post_stanza from the global prosody tableKim Alvefur2013-03-131-0/+1
* | Merge 0.9->trunkMatthew Wild2013-03-121-3/+4
|\|
| * mod_s2s: Do not include xmlns:db declaration in stream header if mod_dialback...Matthew Wild2013-03-121-1/+2