Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 2 | -6/+3 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 2 | -6/+3 |
| |\ | |||||
| | * | net.server_select: Don't remove the socket from sendlist when we might have ↵ | Matthew Wild | 2013-12-16 | 1 | -5/+1 |
| | | | | | | | | | | | | data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator) | ||||
| | * | net.http: assert() for socket creation success so it doesn't silently fail ↵ | Matthew Wild | 2013-12-16 | 1 | -1/+2 |
| | | | | | | | | | | | | (thanks daurnimator) | ||||
* | | | Merge with trunk | Matthew Wild | 2013-12-16 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge 0.10->trunk | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 2 | -2/+5 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 1 | -1/+4 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | util.jid: Strip trailing '.' when normalizing hostnames | Matthew Wild | 2013-12-16 | 1 | -1/+4 |
| | | | |||||
| | * | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
| |\| | |||||
| | * | mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B) | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| | | | |||||
| | * | prosody: Store the config file name so the same file can be used when reloading | Kim Alvefur | 2013-12-13 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
| |\| | |||||
| | * | Tagging 0.9.2 (again) | Matthew Wild | 2013-12-04 | 0 | -0/+0 |
| | | | |||||
| | * | Makefile, configure: Add option for disabling generation of example certificates | Kim Alvefur | 2013-11-30 | 2 | -1/+9 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
| |\| | |||||
| | * | Tagging 0.9.2 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
| |\| | |||||
| | * | util.pposix: Verify that file handle is open | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
| |\| | |||||
| | * | Makefile, certs: Generate example certificates on build, remove the old ↵ | Kim Alvefur | 2013-11-22 | 4 | -37/+25 |
| | | | | | | | | | | | | static one | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| |\| | |||||
| | * | certmanager: Further cipher string tweaking. Re-enable ciphers required for ↵ | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | DSA and ECDH certs/keys. | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-13 | 1 | -1/+1 |
|\| | | |||||
| * | | util.sql: Fix previous commit | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
| | | | |||||
| * | | util.sql: Get character set info from the correct database. | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-12 | 0 | -0/+0 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-12 | 0 | -0/+0 |
| |\| | |||||
| | * | Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ↵ | Matthew Wild | 2013-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | network. Also, although obsolete, SSLv3 isn't documented to have any weaknesses that TLS 1.0 (the most common version used today) doesn't also have. Get your act together clients! | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-11 | 2 | -4/+5 |
|\| | | |||||
| * | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
| | | | |||||
| * | | util.sql: Rewrite auto increment columns to SERIAL for PostgreSQL | Kim Alvefur | 2013-11-11 | 1 | -3/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
|\| | | |||||
| * | | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng) | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 2 | -2/+2 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-10 | 2 | -2/+2 |
| |\| | |||||
| | * | certmanager: Update default cipher string to prefer forward-secrecy over ↵ | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | cipher strength and to disable triple-DES (weaker and much slower than AES) | ||||
| | * | util.set: Remove unused variable | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 2 | -2/+2 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| |\| | |||||
| | * | certmanager: Fix order of options, so that the dynamic option is at the end ↵ | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | of the array | ||||
| | * | certmanager: Default to using the server's cipher preference order by ↵ | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | default, as clients have been shown to commonly select weak and insecure ciphers even when they support stronger ones |