net.server: Fix copyright header line endings and text

net.server: Correct fix for SSL traceback earlier

Merge with 0.5

mod_bosh: Mark a session as secure if it is created with HTTPS

net.httpserver: Mark a request as secure if it is made using HTTPS

Merge with 0.5

mod_httpserver: Use new httpserver helper to initialise ports

mod_bosh: Use new httpserver helper to initialise ports

net.httpserver: Add helper function to set up HTTP server according to given config options

net.server: Don't continue with socket initialisation if SSL handshake failed, fixes nil socket traceback

Merge with 0.5

net.server: Don't close handler if it is already nil when SSL handshake fails

prosody: Load util.helpers at startup

util.helpers: New util library to aid with debugging, etc.

prosody: Call initialisation functions at once

prosody: Start of refactoring of main file

util.pubsub -> util.broadcast

prosody.cfg.lua: Various small changes

prosody.cfg.lua.dist: Move enabled line higher up (people including myself often miss it)

prosody.cfg.lua.dist: Add auto-loaded modules to the config

mod_uptime: Fix bad uptime if module is loaded at startup

Remove version number from copyright headers

Add copyright header to those files missing one

stanza_router: Catch and log an error case which I don't think should happen (but sometimes seems to)

Remove completed items from TODO

util.pubsub: Fix undefined global accesses

util.sasl: Convert spaces to tabs

util.stanza: Convert spaces to tabs

util.hmac: Convert spaces to tabs

util.prosodyctl: Fix undefined global access

eventmanager: Convert from Windows line endings

mod_time Convert from Windows line endings

discomanager: Convert from Windows line endings

mod_ping: Convert from Windows line endings

mod_disco: Convert from Windows line endings

util.discohelper: Convert from Windows line endings

mod_presence: Convert from Windows line endings

util.events: Convert from Windows line endings

mod_console: Expose commands and environment table

modulemanager: Small code improvement, move autoloaded modules list to the top of the file

configmanager, modulemanager: Allow components to have modules specified in the config (but don't load the global set of modules for them)

mod_console: Add quit and exit as aliases for 'bye' command

mod_console: Check for commands when not executing in the global environment

prosodyctl: Quit when user pressed ^C in password prompts

prosodyctl: Don't 'blugh' when ^C is pressed during reading passwords

prosodyctl: Fix traceback when issued with no parameters

util.xmlrpc: Support for multiple parameters in requests

util.xmlrpc: Add create_request

mod_console: server:version() and server:uptime() commands

mod_uptime: Use time of server start rather than module load

mod_uptime: Convert to unix line endings

prosody: Record time the server started

s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly

mod_console: Add c2s:close() command

net.xmppclient_listener: Fix potential traceback when no reason is specified for closing a session

Merged with trunk

mod_presence: Fixed: Presence probe replies now get sent to the full JID of the probe sender

Merge with main branch.

Remove to-unicode conversion because it's done in sasl.lua now.

Move to-unicode conversion from mod_saslauth.lua to sasl.lua.

(0) -1000 -300 -100 -60 +60 +100 +300 +1000 tip

mercurial