aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkWaqas Hussain2013-01-2220-46/+91
|\
| * mod_auth_internal_plain, mod_auth_internal_hashed: No need to nodeprep here.Waqas Hussain2013-01-222-14/+2
| * util.sasl.{plain,scram,digest-md5}: nodeprep username before passing to callb...Waqas Hussain2013-01-223-5/+25
| * net.http.server: Properly handle persistent connectionsFlorian Zeitz2013-01-121-3/+14
| * util.http: New module for HTTP helper functionsFlorian Zeitz2013-01-121-0/+15
| * mod_component: Make listener private (thanks Ge0rG)Kim Alvefur2013-01-171-0/+1
| * mod_presence: Put a timestamp on presence we store for probesKim Alvefur2013-01-111-0/+2
| * prosodyctl, prosody: Pass the selected config file from prosodyctl to prosodyKim Alvefur2013-01-092-0/+5
| * prosodyctl: Pop arg items after use. Fixes #306Kim Alvefur2013-01-091-1/+1
| * MUC: Don't reply to errors (thanks iron)Kim Alvefur2013-01-091-1/+1
| * prosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as suffix for cert...Kim Alvefur2013-01-084-5/+5
| * prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful w...Kim Alvefur2013-01-081-2/+4
| * net.http.parser: Abort if no status line is received.Kim Alvefur2013-01-081-0/+1
| * util.openssl: Cleanup; remove some unused variables.Kim Alvefur2013-01-071-8/+4
| * net.server_select: Remove useless duplicated settimeout() callKim Alvefur2013-01-071-1/+0
| * net.server_select: Fix global accessKim Alvefur2013-01-071-0/+1
| * certmanager: Fix nil index if no LuaSec availableKim Alvefur2013-01-071-1/+1
| * net.server_event: Optimize socket write buffers (don't do buf=buf..newdata).Waqas Hussain2013-01-061-5/+9
* | Merge 0.9->trunkKim Alvefur2012-12-291-2/+1
|\|
| * net.server: Don't return anything from config-reloaded hook, fixes logrotate ...Kim Alvefur2012-12-291-2/+1
* | Merge 0.9->trunkKim Alvefur2012-12-287-51/+60
|\|
| * core.certmanager: Add support for LuaSec 0.5. Also compat with MattJs luasec-hgKim Alvefur2012-12-281-2/+12
| * prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective...Kim Alvefur2012-12-283-37/+18
| * net.server_select: Pause servers while they are fullKim Alvefur2012-12-281-0/+4
| * net.server_select: Add pause and resume methodsKim Alvefur2012-12-281-0/+19
| * mod_admin_telnet: Stop processing lines when session is closedKim Alvefur2012-12-281-0/+2
| * net.server_event: Destroy interfaces immediately, fixes reopening of servers.Kim Alvefur2012-12-281-8/+2
| * net.server_event: Remove comments about not closing event handlers from withi...Kim Alvefur2012-12-281-4/+3
* | Merge 0.9->trunkMatthew Wild2012-12-281-1/+1
|\|
| * mod_s2s: Remove connection from sessions table as soon as we learn it is disc...Matthew Wild2012-12-281-1/+1
* | Merge 0.9->trunkKim Alvefur2012-12-281-1/+1
|\|
| * core.loggingmanager: Don't create file log rules from [level] = "*sink" style...Kim Alvefur2012-12-271-1/+1
* | Merge 0.9->trunkKim Alvefur2012-12-264-74/+106
|\|
| * mod_admin_telnet: Add info about port commands to helpKim Alvefur2012-12-261-0/+4
| * mod_http_files: Fix sending Content-Type for index filesKim Alvefur2012-12-231-1/+1
| * mod_http_files: Allow passing a string to serve()Kim Alvefur2012-12-231-1/+4
| * net.dns: Close voided sockets, so they don't stay in net.serverKim Alvefur2012-12-221-0/+1
| * net.dns: Clean up query list when a server is marked downMatthew Wild2012-12-221-0/+5
| * mod_http_files: Expose function other modules can use to combine their routes...Kim Alvefur2012-12-211-0/+8
| * mod_http_files: Work with non-wildcard-routes. Key cache on the original HTTP...Kim Alvefur2012-12-211-5/+5
| * mod_http_files: Replace file listing with an event, allowing a different plug...Kim Alvefur2012-12-211-19/+7
| * mod_http_files: Export function can be used by other modules to serve files. ...Kim Alvefur2012-12-211-73/+88
| * mod_http_files: Rename config options and variable namesKim Alvefur2012-12-211-5/+5
| * mod_http_files: Log the error if we can't open or read a fileKim Alvefur2012-12-211-1/+2
| * net.http.parser: Skip url.parse when we don't have a full URL (also fixes tra...Waqas Hussain2012-12-211-1/+8
* | Merge 0.9->trunkKim Alvefur2012-12-211-16/+25
|\|
| * mod_http_files: Escape paths in redirectsKim Alvefur2012-12-211-1/+4
| * mod_http_files: Only match on modification date when if-none-match is not pre...Kim Alvefur2012-12-211-1/+1
| * mod_http_files: Only serve cached data if etag is unchanged.Kim Alvefur2012-12-211-3/+3
| * mod_http_files: Make sure file extensions are not nil or empty stringKim Alvefur2012-12-211-2/+2