aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-04-183-0/+586
|\
| * mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting ↵Matthew Wild2013-04-183-0/+586
| | | | | | | | cross-module connection sharing, transactions and Things - a work in progress
* | Merge 0.9->trunkMatthew Wild2013-04-181-1/+4
|\|
| * net.server_select: Don't call onconnect twice for SSL connectionsMatthew Wild2013-04-181-1/+1
| |
| * Merge backoutMatthew Wild2013-04-181-0/+3
| |\
| | * Backed out changeset f2631a14b953Matthew Wild2013-04-181-0/+3
| | |
* | | Merge 0.9->trunkMatthew Wild2013-04-183-38/+44
|\| |
| * | net.http: When HTTP request fails due to a network or SSL error, call the ↵Matthew Wild2013-04-181-7/+12
| | | | | | | | | | | | callback to let it know
| * | net.http.server: The correct Connection header value to look for is ↵Waqas Hussain2013-04-171-1/+1
| | | | | | | | | | | | Keep-Alive, not keep-alive.
| * | net.server_select: Add and improve some comments.Waqas Hussain2013-04-161-2/+5
| | |
| * | net.server_select: Move socket timeout cleanup code out of a timer, into the ↵Waqas Hussain2013-04-161-22/+20
| | | | | | | | | | | | select loop (which makes util.timer the only timer using server_select._addtimer).
| * | net.server_select: Normalize indentationKim Alvefur2013-04-171-6/+6
| |/
* | Merge 0.9->trunkKim Alvefur2013-04-172-4/+3
|\|
| * net.server_select: Don't call onconnect twice on SSL connectionsKim Alvefur2013-04-171-3/+0
| |
| * mod_pubsub: Only assign id to item element if there is oneMatthew Wild2013-04-171-1/+3
| |
* | Merge 0.9->trunkMatthew Wild2013-04-171-1/+5
|\|
| * mod_pubsub: Add id to stored item when auto-generated. Fixes #335Matthew Wild2013-04-171-1/+5
| |
* | Merge 0.9->trunkMatthew Wild2013-04-151-1/+0
|\|
| * net.http.parser: Remove accidentally-committed debuggingMatthew Wild2013-04-151-1/+0
| |
* | Merge 0.9->trunkMatthew Wild2013-04-152-2/+3
|\|
| * net.http.parser: Fix off-by-one error in chunked encoding parserMatthew Wild2013-04-151-1/+2
| |
| * mod_s2s: Add missing spaceKim Alvefur2013-04-151-1/+1
| |
* | Merge 0.9->trunkMatthew Wild2013-04-152-10/+14
|\|
| * Makefile: Specify explicit mode when installing prosody.version, to avoid it ↵Matthew Wild2013-04-151-1/+1
| | | | | | | | defaulting to something nasty (executable)
| * util.http: Refactor and import all necessary functionsMatthew Wild2013-04-121-9/+13
| |
| * prosodyctl: Bump util.pposix version for API changeKim Alvefur2013-04-091-1/+1
| |
* | Merge 0.9->trunkMatthew Wild2013-04-121-0/+5
|\|
| * util.iterators: Add ripairs() (ipairs() in reverse) (thanks Maranda)Matthew Wild2013-04-121-0/+5
| |
* | Merge 0.9->trunkMatthew Wild2013-04-126-199/+80
|\|
| * net.http: Swap response and request parameters passed to callback (will ↵Matthew Wild2013-04-121-2/+1
| | | | | | | | break some modules)
| * util.httpstream: Unused, removeMatthew Wild2013-04-111-134/+0
| |
| * net.http: Switch from util.httpstream to net.http.parser, introduces small ↵Matthew Wild2013-04-111-1/+1
| | | | | | | | but backwards-incompatible API changes - see http://prosody.im/doc/developers/http
| * net.http.parser: Fix chunked encoding response parsing, and make it more robustMatthew Wild2013-04-111-15/+20
| |
| * net.http.parser: Convert status_code to a number before trying to compare it ↵Matthew Wild2013-04-111-0/+1
| | | | | | | | to numbers
| * net.http.parser: Break when no more usable data in buffer (client part of ↵Matthew Wild2013-04-111-0/+2
| | | | | | | | e5ec60dfb202)
| * net.http.parser: Depend on util.http instead of net.http for urlencodeMatthew Wild2013-04-111-1/+1
| |
| * sessionmanager, s2smanager: Remove unused importsMatthew Wild2013-04-112-5/+2
| |
| * net.http, util.http: Move definitions of urlencode/decode and ↵Matthew Wild2013-04-112-41/+52
| | | | | | | | formencode/decode to util.http (possible to use them without unnecessary network-related dependencies)
* | Merge 0.9->trunkKim Alvefur2013-04-091-1/+1
|\ \
| * | prosodyctl: Bump util.pposix version for API changeKim Alvefur2013-04-091-1/+1
| |/
* | Merge 0.9->trunkKim Alvefur2013-04-081-2/+2
|\|
| * mod_s2s: Adjust priority of route/remote hooks to negative values (like most ↵Kim Alvefur2013-04-081-2/+2
| | | | | | | | other internal hooks)
* | Merge 0.9->trunkMatthew Wild2013-04-085-27/+19
|\|
| * mod_posix: Improve error message for a pposix version mismatchMatthew Wild2013-04-081-1/+3
| |
| * mod_posix, util.pposix: Bump version for API changeMatthew Wild2013-04-082-2/+2
| |
| * mod_posix: Pass logger name to syslog, so that sources now get loggedMatthew Wild2013-04-081-2/+2
| |
| * util.pposix: syslog(): Support an optional source parameter (producing ↵Matthew Wild2013-04-081-4/+5
| | | | | | | | messages of the form '<source>: <message>'
| * net.http: Throw error when connecting to a http:// URL without LuaSec availableMatthew Wild2013-04-081-0/+5
| |
| * sessionmanager, s2smanager: Remove open_session tracingMatthew Wild2013-04-082-18/+2
| |
* | Merge 0.9->trunkMatthew Wild2013-04-081-1/+3
|\|