prosody.git
11 years agonet.http.server: Properly handle persistent connections
Florian Zeitz [Sat, 12 Jan 2013 16:26:50 +0000 (17:26 +0100)]
net.http.server: Properly handle persistent connections

11 years agoutil.http: New module for HTTP helper functions
Florian Zeitz [Sat, 12 Jan 2013 15:55:39 +0000 (16:55 +0100)]
util.http: New module for HTTP helper functions

11 years agomod_component: Make listener private (thanks Ge0rG)
Kim Alvefur [Thu, 17 Jan 2013 20:57:35 +0000 (21:57 +0100)]
mod_component: Make listener private (thanks Ge0rG)

11 years agomod_presence: Put a timestamp on presence we store for probes
Kim Alvefur [Fri, 11 Jan 2013 18:38:29 +0000 (19:38 +0100)]
mod_presence: Put a timestamp on presence we store for probes

11 years agoprosodyctl, prosody: Pass the selected config file from prosodyctl to prosody
Kim Alvefur [Wed, 9 Jan 2013 21:01:52 +0000 (22:01 +0100)]
prosodyctl, prosody: Pass the selected config file from prosodyctl to prosody

11 years agoprosodyctl: Pop arg items after use. Fixes #306
Kim Alvefur [Wed, 9 Jan 2013 19:40:44 +0000 (20:40 +0100)]
prosodyctl: Pop arg items after use. Fixes #306

11 years agoMUC: Don't reply to errors (thanks iron)
Kim Alvefur [Wed, 9 Jan 2013 16:56:40 +0000 (17:56 +0100)]
MUC: Don't reply to errors (thanks iron)

11 years agoprosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as suffix for certificates...
Kim Alvefur [Tue, 8 Jan 2013 20:20:00 +0000 (21:20 +0100)]
prosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as suffix for certificates everywhere (thanks jasperixla)

11 years agoprosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings...
Kim Alvefur [Tue, 8 Jan 2013 12:33:35 +0000 (13:33 +0100)]
prosodyctl: Load LFS and util.openssl when actually needed (fixes unhelpful warnings if no LuaSec installed)

11 years agonet.http.parser: Abort if no status line is received.
Kim Alvefur [Tue, 8 Jan 2013 12:33:01 +0000 (13:33 +0100)]
net.http.parser: Abort if no status line is received.

11 years agoutil.openssl: Cleanup; remove some unused variables.
Kim Alvefur [Mon, 7 Jan 2013 03:07:25 +0000 (04:07 +0100)]
util.openssl: Cleanup; remove some unused variables.

11 years agonet.server_select: Remove useless duplicated settimeout() call
Kim Alvefur [Mon, 7 Jan 2013 01:21:03 +0000 (02:21 +0100)]
net.server_select: Remove useless duplicated settimeout() call

11 years agonet.server_select: Fix global access
Kim Alvefur [Mon, 7 Jan 2013 01:20:43 +0000 (02:20 +0100)]
net.server_select: Fix global access

11 years agocertmanager: Fix nil index if no LuaSec available
Kim Alvefur [Mon, 7 Jan 2013 01:17:07 +0000 (02:17 +0100)]
certmanager: Fix nil index if no LuaSec available

11 years agonet.server_event: Optimize socket write buffers (don't do buf=buf..newdata).
Waqas Hussain [Sat, 5 Jan 2013 23:55:53 +0000 (04:55 +0500)]
net.server_event: Optimize socket write buffers (don't do buf=buf..newdata).

11 years agoMerge 0.9->trunk
Kim Alvefur [Sat, 29 Dec 2012 18:13:42 +0000 (19:13 +0100)]
Merge 0.9->trunk

11 years agonet.server: Don't return anything from config-reloaded hook, fixes logrotate heisenbug
Kim Alvefur [Sat, 29 Dec 2012 18:09:23 +0000 (19:09 +0100)]
net.server: Don't return anything from config-reloaded hook, fixes logrotate heisenbug

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 28 Dec 2012 14:14:11 +0000 (15:14 +0100)]
Merge 0.9->trunk

11 years agocore.certmanager: Add support for LuaSec 0.5. Also compat with MattJs luasec-hg
Kim Alvefur [Fri, 28 Dec 2012 14:00:43 +0000 (15:00 +0100)]
core.certmanager: Add support for LuaSec 0.5. Also compat with MattJs luasec-hg

11 years agoprosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins
Kim Alvefur [Fri, 28 Dec 2012 13:33:47 +0000 (14:33 +0100)]
prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins

11 years agonet.server_select: Pause servers while they are full
Kim Alvefur [Fri, 28 Dec 2012 13:33:27 +0000 (14:33 +0100)]
net.server_select: Pause servers while they are full

11 years agonet.server_select: Add pause and resume methods
Kim Alvefur [Fri, 28 Dec 2012 13:33:27 +0000 (14:33 +0100)]
net.server_select: Add pause and resume methods

11 years agomod_admin_telnet: Stop processing lines when session is closed
Kim Alvefur [Fri, 28 Dec 2012 13:32:22 +0000 (14:32 +0100)]
mod_admin_telnet: Stop processing lines when session is closed

11 years agonet.server_event: Destroy interfaces immediately, fixes reopening of servers.
Kim Alvefur [Fri, 28 Dec 2012 13:26:21 +0000 (14:26 +0100)]
net.server_event: Destroy interfaces immediately, fixes reopening of servers.

11 years agonet.server_event: Remove comments about not closing event handlers from within callba...
Kim Alvefur [Fri, 28 Dec 2012 13:25:11 +0000 (14:25 +0100)]
net.server_event: Remove comments about not closing event handlers from within callbacks, fixed in luaevent

11 years agoMerge 0.9->trunk
Matthew Wild [Fri, 28 Dec 2012 12:50:55 +0000 (12:50 +0000)]
Merge 0.9->trunk

11 years agomod_s2s: Remove connection from sessions table as soon as we learn it is disconnected...
Matthew Wild [Fri, 28 Dec 2012 12:47:44 +0000 (12:47 +0000)]
mod_s2s: Remove connection from sessions table as soon as we learn it is disconnected. Fixes a connection/session leak.

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 28 Dec 2012 02:03:56 +0000 (03:03 +0100)]
Merge 0.9->trunk

11 years agocore.loggingmanager: Don't create file log rules from [level] = "*sink" style config
Kim Alvefur [Thu, 27 Dec 2012 19:44:58 +0000 (20:44 +0100)]
core.loggingmanager: Don't create file log rules from [level] = "*sink" style config

11 years agoMerge 0.9->trunk
Kim Alvefur [Wed, 26 Dec 2012 19:35:40 +0000 (20:35 +0100)]
Merge 0.9->trunk

11 years agomod_admin_telnet: Add info about port commands to help
Kim Alvefur [Wed, 26 Dec 2012 01:46:49 +0000 (02:46 +0100)]
mod_admin_telnet: Add info about port commands to help

11 years agomod_http_files: Fix sending Content-Type for index files
Kim Alvefur [Sun, 23 Dec 2012 16:04:44 +0000 (17:04 +0100)]
mod_http_files: Fix sending Content-Type for index files

11 years agomod_http_files: Allow passing a string to serve()
Kim Alvefur [Sun, 23 Dec 2012 10:17:44 +0000 (11:17 +0100)]
mod_http_files: Allow passing a string to serve()

11 years agonet.dns: Close voided sockets, so they don't stay in net.server
Kim Alvefur [Sat, 22 Dec 2012 13:20:12 +0000 (14:20 +0100)]
net.dns: Close voided sockets, so they don't stay in net.server

11 years agonet.dns: Clean up query list when a server is marked down
Matthew Wild [Sat, 22 Dec 2012 12:06:36 +0000 (12:06 +0000)]
net.dns: Clean up query list when a server is marked down

11 years agomod_http_files: Expose function other modules can use to combine their routes with...
Kim Alvefur [Fri, 21 Dec 2012 19:40:29 +0000 (20:40 +0100)]
mod_http_files: Expose function other modules can use to combine their routes with file paths to serve

11 years agomod_http_files: Work with non-wildcard-routes. Key cache on the original HTTP path.
Kim Alvefur [Fri, 21 Dec 2012 19:34:40 +0000 (20:34 +0100)]
mod_http_files: Work with non-wildcard-routes. Key cache on the original HTTP path.

11 years agomod_http_files: Replace file listing with an event, allowing a different plugin to...
Kim Alvefur [Fri, 21 Dec 2012 19:08:33 +0000 (20:08 +0100)]
mod_http_files: Replace file listing with an event, allowing a different plugin to generate it

11 years agomod_http_files: Export function can be used by other modules to serve files. Don...
Kim Alvefur [Fri, 21 Dec 2012 16:54:43 +0000 (17:54 +0100)]
mod_http_files: Export function can be used by other modules to serve files. Don't serve files by default unless http_files_dir is set

11 years agomod_http_files: Rename config options and variable names
Kim Alvefur [Fri, 21 Dec 2012 16:22:19 +0000 (17:22 +0100)]
mod_http_files: Rename config options and variable names

11 years agomod_http_files: Log the error if we can't open or read a file
Kim Alvefur [Fri, 21 Dec 2012 15:10:45 +0000 (16:10 +0100)]
mod_http_files: Log the error if we can't open or read a file

11 years agonet.http.parser: Skip url.parse when we don't have a full URL (also fixes traceback...
Waqas Hussain [Fri, 21 Dec 2012 08:37:39 +0000 (13:37 +0500)]
net.http.parser: Skip url.parse when we don't have a full URL (also fixes traceback on paths starting with '//').

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 21 Dec 2012 08:04:54 +0000 (09:04 +0100)]
Merge 0.9->trunk

11 years agomod_http_files: Escape paths in redirects
Kim Alvefur [Fri, 21 Dec 2012 08:04:02 +0000 (09:04 +0100)]
mod_http_files: Escape paths in redirects

11 years agomod_http_files: Only match on modification date when if-none-match is not present
Kim Alvefur [Fri, 21 Dec 2012 07:27:14 +0000 (08:27 +0100)]
mod_http_files: Only match on modification date when if-none-match is not present

11 years agomod_http_files: Only serve cached data if etag is unchanged.
Kim Alvefur [Fri, 21 Dec 2012 07:25:09 +0000 (08:25 +0100)]
mod_http_files: Only serve cached data if etag is unchanged.

11 years agomod_http_files: Make sure file extensions are not nil or empty string
Kim Alvefur [Fri, 21 Dec 2012 07:19:58 +0000 (08:19 +0100)]
mod_http_files: Make sure file extensions are not nil or empty string

11 years agomod_http_files: Avoid a bunch of table lookups
Kim Alvefur [Fri, 21 Dec 2012 07:14:33 +0000 (08:14 +0100)]
mod_http_files: Avoid a bunch of table lookups

11 years agomod_http_files: No use in closing a file handle if we couldn't open it
Kim Alvefur [Fri, 21 Dec 2012 07:10:07 +0000 (08:10 +0100)]
mod_http_files: No use in closing a file handle if we couldn't open it

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 16 Dec 2012 13:36:44 +0000 (14:36 +0100)]
Merge 0.9->trunk

11 years agoutil.datamanager: Don't escape the name of a store
Kim Alvefur [Sun, 16 Dec 2012 13:36:24 +0000 (14:36 +0100)]
util.datamanager: Don't escape the name of a store

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 16 Dec 2012 07:37:14 +0000 (08:37 +0100)]
Merge 0.9->trunk

11 years agomod_http_files: Compare If-Modified-Since to last modification date
Kim Alvefur [Sun, 16 Dec 2012 07:34:50 +0000 (08:34 +0100)]
mod_http_files: Compare If-Modified-Since to last modification date

11 years agomod_http_files: Fix caching the stringified directory index
Kim Alvefur [Sun, 16 Dec 2012 07:17:28 +0000 (08:17 +0100)]
mod_http_files: Fix caching the stringified directory index

11 years agoMerge 0.9->trunk
Kim Alvefur [Sat, 15 Dec 2012 04:35:43 +0000 (05:35 +0100)]
Merge 0.9->trunk

11 years agoMerge
Kim Alvefur [Sat, 15 Dec 2012 04:34:30 +0000 (05:34 +0100)]
Merge

11 years agoMerge 0.9->trunk
Waqas Hussain [Sat, 15 Dec 2012 02:12:32 +0000 (07:12 +0500)]
Merge 0.9->trunk

11 years agoMUC: Support invite messages when stanza type is explicitly set to "normal" or to...
Waqas Hussain [Sat, 15 Dec 2012 02:08:54 +0000 (07:08 +0500)]
MUC: Support invite messages when stanza type is explicitly set to "normal" or to an unknown value.

11 years agoutil.sasl.plain: Reduce some code.
Waqas Hussain [Sat, 15 Dec 2012 02:06:45 +0000 (07:06 +0500)]
util.sasl.plain: Reduce some code.

11 years agoutil.datamanager: Remove unused variable
Kim Alvefur [Fri, 14 Dec 2012 13:25:58 +0000 (14:25 +0100)]
util.datamanager: Remove unused variable

11 years agoutil.datamanager: Remove dead code path
Kim Alvefur [Fri, 14 Dec 2012 13:21:32 +0000 (14:21 +0100)]
util.datamanager: Remove dead code path

11 years agoMerge 0.9->trunk
Kim Alvefur [Tue, 11 Dec 2012 22:41:02 +0000 (23:41 +0100)]
Merge 0.9->trunk

11 years agomod_http_files: Generate simple directory index.
Kim Alvefur [Tue, 11 Dec 2012 22:40:30 +0000 (23:40 +0100)]
mod_http_files: Generate simple directory index.

11 years agomod_http_files: Have mimetypes in a shared table. Get mimetypes from /etc/mime.types...
Kim Alvefur [Tue, 11 Dec 2012 22:21:25 +0000 (23:21 +0100)]
mod_http_files: Have mimetypes in a shared table. Get mimetypes from /etc/mime.types if exists.

11 years agomod_http_files: Cache data read from disk in a weak table
Kim Alvefur [Tue, 11 Dec 2012 22:02:06 +0000 (23:02 +0100)]
mod_http_files: Cache data read from disk in a weak table

11 years agomod_http_files: Add Last-Modified header
Kim Alvefur [Tue, 11 Dec 2012 21:30:50 +0000 (22:30 +0100)]
mod_http_files: Add Last-Modified header

11 years agomod_http_files: Add ETag and check If-None-Match to allow client-side cache
Kim Alvefur [Tue, 11 Dec 2012 21:30:13 +0000 (22:30 +0100)]
mod_http_files: Add ETag and check If-None-Match to allow client-side cache

11 years agomod_http_files: Return 404 faster if file does not exist
Kim Alvefur [Tue, 11 Dec 2012 21:26:41 +0000 (22:26 +0100)]
mod_http_files: Return 404 faster if file does not exist

11 years agomod_http_files: Configurable number of index files to check for
Kim Alvefur [Tue, 11 Dec 2012 21:14:55 +0000 (22:14 +0100)]
mod_http_files: Configurable number of index files to check for

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 9 Dec 2012 11:39:49 +0000 (12:39 +0100)]
Merge 0.9->trunk

11 years agomod_http: Fix path length pattern
Kim Alvefur [Sun, 9 Dec 2012 11:20:55 +0000 (12:20 +0100)]
mod_http: Fix path length pattern

11 years agomod_auth_anonymous: Implement user iteration API
Kim Alvefur [Sun, 9 Dec 2012 11:19:08 +0000 (12:19 +0100)]
mod_auth_anonymous: Implement user iteration API

11 years agomod_c2s: Check if TLS compression is used
Kim Alvefur [Sun, 9 Dec 2012 10:50:09 +0000 (11:50 +0100)]
mod_c2s: Check if TLS compression is used

11 years agomod_admin_telnet: Improve wording when listing users
Kim Alvefur [Sun, 9 Dec 2012 10:44:45 +0000 (11:44 +0100)]
mod_admin_telnet: Improve wording when listing users

11 years agoMerge
Matthew Wild [Tue, 4 Dec 2012 20:11:41 +0000 (20:11 +0000)]
Merge

11 years agoportmanager: Return first service with the specified name from get_service() (instead...
Matthew Wild [Tue, 4 Dec 2012 20:08:44 +0000 (20:08 +0000)]
portmanager: Return first service with the specified name from get_service() (instead of the array of possible services) (thanks xnyhps)

11 years agoMerge 0.9->trunk.
Waqas Hussain [Mon, 3 Dec 2012 05:04:34 +0000 (10:04 +0500)]
Merge 0.9->trunk.

11 years agoutil.xml: Fix module name.
Waqas Hussain [Mon, 3 Dec 2012 05:01:46 +0000 (10:01 +0500)]
util.xml: Fix module name.

11 years agonet.http.parser: Fix syntax error introduced in c5edb08fc7cb.
Waqas Hussain [Mon, 3 Dec 2012 05:01:06 +0000 (10:01 +0500)]
net.http.parser: Fix syntax error introduced in c5edb08fc7cb.

11 years agoMerge 0.9->trunk.
Waqas Hussain [Mon, 3 Dec 2012 01:07:00 +0000 (06:07 +0500)]
Merge 0.9->trunk.

11 years agoplugins/storage/xmlparse.lib.lua: Delete.
Waqas Hussain [Mon, 3 Dec 2012 00:50:39 +0000 (05:50 +0500)]
plugins/storage/xmlparse.lib.lua: Delete.

11 years agoplugins/storage/mod_xep0227: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:49:05 +0000 (05:49 +0500)]
plugins/storage/mod_xep0227: Use util.xml.

11 years agotools/migration/migrator/jabberd14: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:44:48 +0000 (05:44 +0500)]
tools/migration/migrator/jabberd14: Use util.xml.

11 years agotools/openfire2prosody: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:42:17 +0000 (05:42 +0500)]
tools/openfire2prosody: Use util.xml.

11 years agotools/jabberd14sql2prosody: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:41:18 +0000 (05:41 +0500)]
tools/jabberd14sql2prosody: Use util.xml.

11 years agotools/ejabberdsql2prosody: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:34:46 +0000 (05:34 +0500)]
tools/ejabberdsql2prosody: Use util.xml.

11 years agoutil.template: Use util.xml.
Waqas Hussain [Mon, 3 Dec 2012 00:33:56 +0000 (05:33 +0500)]
util.template: Use util.xml.

11 years agoutil.xml: Initial commit; exposes parse(), which is now the canonical way to convert...
Waqas Hussain [Mon, 3 Dec 2012 00:32:51 +0000 (05:32 +0500)]
util.xml: Initial commit; exposes parse(), which is now the canonical way to convert a string to a stanza.

11 years agoMerge 0.9->trunk.
Waqas Hussain [Fri, 30 Nov 2012 19:31:33 +0000 (00:31 +0500)]
Merge 0.9->trunk.

11 years agosessionmanager: Log the actual error message when roster loading fails.
Waqas Hussain [Fri, 30 Nov 2012 04:05:51 +0000 (09:05 +0500)]
sessionmanager: Log the actual error message when roster loading fails.

11 years agoMUC: Expose create_room(jid).
Waqas Hussain [Fri, 30 Nov 2012 03:57:58 +0000 (08:57 +0500)]
MUC: Expose create_room(jid).

11 years agomod_storage_sql: Return actual error string on commit failure.
Waqas Hussain [Fri, 30 Nov 2012 03:50:03 +0000 (08:50 +0500)]
mod_storage_sql: Return actual error string on commit failure.

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 29 Nov 2012 02:38:24 +0000 (07:38 +0500)]
Merge 0.9->trunk

11 years agonet.http.parser: Collapse multiple consecutive slashes in a path to a single slash
Matthew Wild [Thu, 29 Nov 2012 02:38:00 +0000 (07:38 +0500)]
net.http.parser: Collapse multiple consecutive slashes in a path to a single slash

11 years agoMerge
Matthew Wild [Thu, 29 Nov 2012 02:17:31 +0000 (07:17 +0500)]
Merge

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 29 Nov 2012 02:16:45 +0000 (07:16 +0500)]
Merge 0.9->trunk

11 years agomod_http: Fix pattern and slightly improve efficiency and memory usage of wildcard...
Matthew Wild [Thu, 29 Nov 2012 02:15:04 +0000 (07:15 +0500)]
mod_http: Fix pattern and slightly improve efficiency and memory usage of wildcard HTTP handlers

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 25 Nov 2012 04:12:46 +0000 (05:12 +0100)]
Merge 0.9->trunk

11 years agomod_admin_adhoc: Remove unused form
Kim Alvefur [Sun, 25 Nov 2012 04:12:13 +0000 (05:12 +0100)]
mod_admin_adhoc: Remove unused form

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 23 Nov 2012 16:17:02 +0000 (17:17 +0100)]
Merge 0.9->trunk