Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | mod_pubsub: Don't sent error replies from service disco events, let ↵ | Kim Alvefur | 2013-12-30 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | mod_disco handle that | |||||
| * | | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵ | Kim Alvefur | 2013-12-25 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | Conflicting items are removed. | |||||
| * | | | mod_storage_sql2: Include user, host and store in id lookup | Kim Alvefur | 2013-12-25 | 1 | -4/+6 | |
| |/ / | ||||||
* | | | net.server_{select,event}: addclient: Handle missing getaddrinfo | Kim Alvefur | 2013-12-23 | 2 | -8/+4 | |
| | | | ||||||
* | | | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ↵ | Kim Alvefur | 2013-12-23 | 2 | -2/+17 | |
| | | | | | | | | | | | | type if no socket type argument given. (Argument must be given for non-TCP) | |||||
* | | | net.server_{select,event}: addclient: Add argument for overriding socket type | Kim Alvefur | 2013-12-23 | 2 | -6/+22 | |
| | | | ||||||
* | | | net/http: Use server.addclient | daurnimator | 2013-12-18 | 1 | -11/+6 | |
| | | | ||||||
* | | | net/server: addclient: wrapclient already calls startconnection for us | daurnimator | 2013-12-18 | 1 | -2/+1 | |
| | | | ||||||
* | | | net/server_event: pcall require ssl rather than relying on globals | daurnimator | 2013-12-18 | 1 | -19/+11 | |
| | | | ||||||
* | | | net/server_select: Fix typo | daurnimator | 2013-12-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | net/server_select: addclient: Check arguments | daurnimator | 2013-12-18 | 1 | -0/+15 | |
| | | | ||||||
* | | | net/server_select: addclient: Check for failure correctly; remove ↵ | daurnimator | 2013-12-18 | 1 | -3/+3 | |
| | | | | | | | | | | | | wrapconnection call on failure | |||||
* | | | net/server_event: add_client should have same arguments no-matter the server ↵ | daurnimator | 2013-12-18 | 1 | -21/+6 | |
| | | | | | | | | | | | | backend | |||||
* | | | net/server_select: Check arguments to add_server correctly | daurnimator | 2013-12-18 | 1 | -3/+4 | |
| | | | ||||||
* | | | net/server_select: pcall require ssl (easy to forget to require ssl) | daurnimator | 2013-12-18 | 1 | -5/+5 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-12-18 | 1 | -1/+7 | |
|\| | | ||||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-12-18 | 1 | -1/+7 | |
| |\| | ||||||
| | * | mod_component: Enable TCP keepalives on component streams | Kim Alvefur | 2013-12-18 | 1 | -0/+6 | |
| | | | ||||||
| | * | mod_component: Decrease priority of component auth hook | Kim Alvefur | 2013-12-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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. |