mod_httpserver: Removed a log message.

mod_httpserver: Read files in binary mode; fixes issues with serving binary files.

mod_httpserver: Skip returning a Content-Type when not known (application/octet-stream is not a correct default).

mod_httpserver: Return Content-Type header based on file extension.

mod_httpserver: Delay setup until after server is started.

mod_bosh: Delay setup until after server is started.

prosody: Use the multiplex listener when the 'ports' config option is specified.

net_activate_ports: Use the default config option 'ports' when no option is specified.

multiplex_listener: Initial commit. Multiple protocols on a single port.

modulemanager: Fire item-removed events on module unload.

modulemanager: Fixed a global access.

prosody: Call tostring on the key being used for nil global read before concatenating it with a string.

prosody: Log a warning and traceback, but don't throw an error on nil global read.

Mainfile: Broke up a really long line.

Merge with 0.6

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

mercurial