Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->trunk | Matthew Wild | 2013-03-31 | 1 | -9/+11 |
|\ | |||||
| * | portmanager: Log error and fail to bind when port is invalid (not a number) | Matthew Wild | 2013-03-31 | 1 | -9/+11 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-03-28 | 1 | -1/+1 |
|\| | |||||
| * | mod_muc/muc.lib: Don't add messages without a body (such as chat state ↵ | Matthew Wild | 2013-03-28 | 1 | -1/+1 |
| | | | | | | | | notifications) to the room history (thanks louiz?, Link Mauve, poezio and all its users) | ||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-03-28 | 1 | -0/+5 |
|\| | |||||
| * | util.json: Add json.encode_array() (thanks B) | Matthew Wild | 2013-03-28 | 1 | -0/+5 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-03-28 | 7 | -23/+63 |
|\| | |||||
| * | mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from ↵ | Tobias Markmann | 2013-03-28 | 1 | -0/+4 |
| | | | | | | | | their chatrooms when blocking specific MUC occupants. | ||||
| * | portmanager: Add use_ipv4 option, default to true. | Kim Alvefur | 2013-03-27 | 1 | -2/+6 |
| | | |||||
| * | portmanager: use_ipv6 defaults to true if luasocket has ipv6 support | Kim Alvefur | 2013-03-27 | 1 | -1/+2 |
| | | |||||
| * | mod_s2s: Prevent s2s to and from hosts we serve locally | Kim Alvefur | 2013-03-27 | 1 | -0/+12 |
| | | |||||
| * | mod_s2s: Prevent traceback when replying to incoming connection to a host we ↵ | Kim Alvefur | 2013-03-26 | 1 | -1/+1 |
| | | | | | | | | don't serve | ||||
| * | mod_s2s: Reset secure flag on new connection attempt | Kim Alvefur | 2013-03-25 | 1 | -0/+4 |
| | | |||||
| * | mod_s2s: session.from_host does not allways exist on incoming connections, ↵ | Kim Alvefur | 2013-03-25 | 1 | -1/+1 |
| | | | | | | | | true and nil or "our hostname" does not evaluate to what we want here | ||||
| * | mod_s2s: Keep the dns answer object around a while so plugins can look at it | Kim Alvefur | 2013-03-23 | 1 | -1/+1 |
| | | |||||
| * | net.server, _select: Reorganise configuration of server_select to be more ↵ | Kim Alvefur | 2013-03-23 | 2 | -4/+23 |
| | | | | | | | | like server_event | ||||
| * | prosody, prosodyctl: Remove last trace of "core" \o/ | Kim Alvefur | 2013-03-23 | 2 | -11/+11 |
| | | |||||
| * | net.server: No sections in config anymore | Kim Alvefur | 2013-03-23 | 1 | -2/+2 |
| | | |||||
* | | mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from ↵ | Tobias Markmann | 2013-03-28 | 1 | -0/+4 |
| | | | | | | | | their chatrooms when blocking specific MUC occupants. | ||||
* | | Merge 0.9->trunk | Kim Alvefur | 2013-03-23 | 29 | -52/+48 |
|\| | |||||
| * | configmanager: Fix so unset variables are searched for in the global section | Kim Alvefur | 2013-03-23 | 1 | -1/+1 |
| | | |||||
| * | util.{prosodyctl,openssl}: More use of config sections removed | Kim Alvefur | 2013-03-23 | 2 | -7/+7 |
| | | |||||
| * | mod_tls: More use of config sections removed | Kim Alvefur | 2013-03-23 | 1 | -2/+2 |
| | | |||||
| * | core.*: Complete removal of all traces of the "core" section and ↵ | Kim Alvefur | 2013-03-23 | 7 | -23/+20 |
| | | | | | | | | section-related code. | ||||
| * | MUC: Access prosody.hosts instead of the old global hosts | Kim Alvefur | 2013-03-23 | 1 | -1/+1 |
| | | |||||
| * | mod_proxy65: Fix typo in comment | Kim Alvefur | 2013-03-23 | 1 | -1/+1 |
| | | |||||
| * | mod_http: Import portmanager | Kim Alvefur | 2013-03-23 | 1 | -0/+1 |
| | | |||||
| * | mod_groups: Use module API for reading config | Kim Alvefur | 2013-03-23 | 1 | -1/+1 |
| | | |||||
| * | mod_roster: Remove unused variable | Kim Alvefur | 2013-03-23 | 1 | -1/+0 |
| | | |||||
| * | mod_motd, mod_register, mod_private, mod_http_errors, mod_admin_adhoc: ↵ | Kim Alvefur | 2013-03-23 | 5 | -8/+2 |
| | | | | | | | | Remove unused imports | ||||
| * | mod_announce, mod_auth_anonymous, mod_c2s, mod_c2s, mod_component, mod_iq, ↵ | Kim Alvefur | 2013-03-23 | 9 | -7/+12 |
| | | | | | | | | mod_message, mod_presence, mod_tls: Access prosody.{hosts,bare_sessions,full_sessions} instead of the old globals | ||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-03-22 | 2 | -9/+9 |
|\| | |||||
| * | mod_s2s: Fix variable usage in check_auth_policy (thanks Florob) | Matthew Wild | 2013-03-22 | 1 | -6/+7 |
| | | |||||
| * | s2smanager: Remove unused function parameter | Matthew Wild | 2013-03-22 | 1 | -1/+1 |
| | | |||||
| * | s2smanager: Access prosody.hosts instead of hosts global directly | Matthew Wild | 2013-03-22 | 1 | -1/+1 |
| | | |||||
| * | mod_s2s: Remove unused variable | Matthew Wild | 2013-03-22 | 1 | -1/+0 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-03-22 | 8 | -141/+156 |
|\| | |||||
| * | mod_s2s: Add controls for certificate validation via the s2s_secure_auth ↵ | Matthew Wild | 2013-03-22 | 1 | -3/+32 |
| | | | | | | | | option. Plugins can now return false from handling s2s-check-certificate to prevent connection establishment (s2sin+s2sout) | ||||
| * | s2smanager, mod_s2s, mod_dialback, mod_saslauth: Move ↵ | Matthew Wild | 2013-03-22 | 4 | -81/+80 |
| | | | | | | | | s2smanager.make_authenticated() to mod_s2s, and plugins now signal authentication via the s2s-authenticated event | ||||
| * | hostmanager: Use rawget to check for activated hosts to prevent recursion in ↵ | Matthew Wild | 2013-03-22 | 1 | -2/+2 |
| | | | | | | | | dynamic host loaders | ||||
| * | hostmanager: Use prosody.hosts instead of 'hosts' global | Matthew Wild | 2013-03-22 | 1 | -1/+1 |
| | | |||||
| * | util.pposix: Allow fetching RLIMIT_NICE when available | Matthew Wild | 2013-03-22 | 1 | -0/+3 |
| | | |||||
| * | prosody: Add COMPAT note about globals | Matthew Wild | 2013-03-22 | 1 | -0/+1 |
| | | |||||
| * | configmanager, hostmanager, prosody: Almost complete removal of ↵ | Matthew Wild | 2013-03-22 | 3 | -54/+37 |
| | | | | | | | | section-related code, and the infamous 'core' section. Still backwards-compatible with API users. | ||||
* | | Merge... | Matthew Wild | 2013-03-20 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge 0.9->trunk | Kim Alvefur | 2013-03-16 | 8 | -33/+37 |
| |\ \ | |||||
* | \ \ | Merge 0.9->trunk | Matthew Wild | 2013-03-20 | 9 | -34/+43 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | net.http: Disable SSLv2 support for HTTPS connections | Matthew Wild | 2013-03-20 | 1 | -1/+1 |
| | | | |||||
| * | | net.http: Allow passing an SSL context or options table to be used for HTTPS ↵ | Matthew Wild | 2013-03-20 | 1 | -1/+6 |
| |/ | | | | | | | requests (thanks daurnimator) | ||||
| * | mod_s2s, mod_saslauth, mod_compression: Refactor to have common code for ↵ | Kim Alvefur | 2013-03-16 | 4 | -22/+28 |
| | | | | | | | | opening streams |