Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-06-18 | 1 | -21/+12 | |
|\| | | ||||||
| * | | mod_s2s/s2sout.lib: Remove unused variables and imports | Matthew Wild | 2013-06-18 | 1 | -6/+2 | |
| | | | ||||||
| * | | mod_s2s/s2sout.lib: Remove reference to undefined global | Matthew Wild | 2013-06-18 | 1 | -1/+0 | |
| | | | ||||||
| * | | mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local ↵ | Matthew Wild | 2013-06-18 | 1 | -12/+5 | |
| | | | | | | | | | | | | interface addresses | |||||
| * | | mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket ↵ | Matthew Wild | 2013-06-18 | 1 | -2/+5 | |
| | | | | | | | | | | | | supports IPv6 | |||||
* | | | mod_tls: Remove debug statement | Kim Alvefur | 2013-06-16 | 1 | -1/+0 | |
| | | | ||||||
* | | | mod_muc: Add Ad-Hoc command to destroy MUC rooms | Florian Zeitz | 2013-06-05 | 1 | -0/+36 | |
| | | | ||||||
* | | | mod_muc: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -14/+9 | |
| | | | ||||||
* | | | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -130/+108 | |
| | | | ||||||
* | | | mod_disco: Allow ansering disco requests including nodes, and adding custom ↵ | Florian Zeitz | 2013-06-04 | 1 | -8/+35 | |
| | | | | | | | | | | | | items to disco#items requests | |||||
* | | | mod_http_files: Put the MIME type map in a global shared table | Kim Alvefur | 2013-06-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s ↵ | Kim Alvefur | 2013-06-13 | 1 | -26/+36 | |
| | | | | | | | | | | | | connections | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -2/+3 | |
|\| | | ||||||
| * | | mod_pep: When a client supplies no id on a published item, reflect our ↵ | Florian Zeitz | 2013-06-13 | 1 | -2/+3 | |
| | | | | | | | | | | | | generated id back to it | |||||
| * | | mod_muc: Fix incorrect variable name | Matthew Wild | 2013-05-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | mod_admin_telnet: Add server:memory() command to view details of Prosody's ↵ | Matthew Wild | 2013-05-16 | 1 | -0/+21 | |
| | | | | | | | | | | | | memory usage | |||||
| * | | mod_bosh: Remove Connection: keep-alive header (conflicts with new ↵ | Matthew Wild | 2013-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | net.http.server) | |||||
| * | | mod_bosh: Fix global write | Matthew Wild | 2013-06-07 | 1 | -1/+2 | |
| | | | ||||||
* | | | mod_c2s, mod_s2s: Fire an event on read timeouts | Kim Alvefur | 2013-06-11 | 2 | -3/+16 | |
| | | | ||||||
* | | | mod_c2s: Become a shared module and allow being disabled on some virtualhosts | Kim Alvefur | 2013-06-11 | 1 | -1/+3 | |
| | | | ||||||
* | | | mod_bosh: Reduce a little code. | Waqas Hussain | 2013-06-11 | 1 | -6/+2 | |
| | | | ||||||
* | | | Merge 0.9->trunk | Kim Alvefur | 2013-06-10 | 1 | -1/+1 | |
|\| | | ||||||
| * | | mod_admin_telnet: Fix another wrong boolean expression | Kim Alvefur | 2013-06-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback | Kim Alvefur | 2013-06-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | mod_s2s: Set s2s_session.ip | Kim Alvefur | 2013-06-09 | 1 | -0/+1 | |
| | | | ||||||
* | | | mod_bosh: Make waiting_requests and dead_sessions shared to preserve across ↵ | Matthew Wild | 2013-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | reloads | |||||
* | | | mod_muc: Include status code 332 on service shutdown (thanks mathieui) | Matthew Wild | 2013-06-08 | 1 | -1/+2 | |
| | | | ||||||
* | | | mod_bosh: Don't tostring() stream:features when passing to session.send(). | Waqas Hussain | 2013-06-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | mod_bosh: Only return CORS headers if the Origin header is received, and ↵ | Waqas Hussain | 2013-06-07 | 1 | -2/+4 | |
| | | | | | | | | | | | | CORS is enabled. | |||||
* | | | mod_bosh: Return empty string from the OPTIONS event handler, don't return ↵ | Waqas Hussain | 2013-06-07 | 1 | -1/+2 | |
| | | | | | | | | | | | | the response object itself. | |||||
* | | | mod_bosh: Rename event handler argument to event, not request. | Waqas Hussain | 2013-06-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-06-07 | 1 | -1/+1 | |
|\| | | ||||||
| * | | mod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP ↵ | Matthew Wild | 2013-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | server API (thanks Mikael Nordfeldth) | |||||
* | | | mod_bosh: Remove another place we set headers, fixes #348 | Matthew Wild | 2013-06-06 | 1 | -1/+0 | |
| | | | ||||||
* | | | mod_bosh: Clean up handling of response headers, set them only in one place | Matthew Wild | 2013-06-05 | 1 | -23/+23 | |
| | | | ||||||
* | | | mod_bosh: Return errors when appropriate (invalid XML, missing sid) | Matthew Wild | 2013-06-05 | 1 | -1/+6 | |
| | | | ||||||
* | | | mod_bosh: Remove some very verbose logging | Matthew Wild | 2013-06-05 | 1 | -3/+0 | |
| | | | ||||||
* | | | Merge 0.9->trunk | Matthew Wild | 2013-06-05 | 2 | -1/+2 | |
|\| | | ||||||
| * | | mod_bosh: Reset creating_session to prevent putting unnecessary attributes ↵ | Matthew Wild | 2013-06-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | into every BOSH response | |||||
| * | | mod_admin_telnet: Fix inverted boolean logic | Kim Alvefur | 2013-06-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge 0.9->trunk | Kim Alvefur | 2013-06-02 | 1 | -1/+1 | |
|\| | | ||||||
| * | | mod_bosh: Fix traceback in case session is destroyed during the ↵ | Kim Alvefur | 2013-06-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | stream-features event (thanks Biszkopcik) | |||||
* | | | mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into ↵ | Kim Alvefur | 2013-05-30 | 2 | -0/+14 | |
| | | | | | | | | | | | | detecting if the connection died | |||||
* | | | mod_register: get_child_text()! | Kim Alvefur | 2013-05-28 | 1 | -2/+2 | |
| | | | ||||||
* | | | mod_s2s: Remove unnecessary debug message | Matthew Wild | 2013-05-28 | 1 | -1/+0 | |
| | | | ||||||
* | | | mod_bosh: rename variable for clarity | Matthew Wild | 2013-05-24 | 1 | -2/+2 | |
| | | | ||||||
* | | | mod_bosh: Some very minor whitespace/layout fixes | Matthew Wild | 2013-05-24 | 1 | -3/+4 | |
| | | | ||||||
* | | | Merge 0.9->trunk | Kim Alvefur | 2013-05-26 | 1 | -0/+2 | |
|\| | | ||||||
| * | | mod_admin_telnet: Make the muc:create() command complain if the room already ↵ | Kim Alvefur | 2013-05-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | exists | |||||
* | | | mod_disco: Emit events for disco requests, which contain a node, on user ↵ | Florian Zeitz | 2013-05-17 | 2 | -10/+32 | |
| | | | | | | | | | | | | accounts |