prosody: Fix to net_activate_ports to mend binding to specific interfaces

net.http: Don't expect the body on redirects

prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports.

mod_httpserver: Text files are text/plain, and not plain/text.

net.httpserver: Removed mime handling (now in mod_httpserver). Unknown dynamic content is now always served as text/html.

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

mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility enabled, fixes intercepting stanzas to the full JID that it shouldn't

util.signal: Make kill() available on Solaris; really fixes #136.

mod_posix: Fix to not loop in SIGTERM either, but the same happens with SIGHUP (where the same 'fix' can't be applied) - shall investigate tomorrow

prosody: Report the current socket backend in use

net.server_event: Add get_backend() method

net.server_select: Add get_backend() method

mod_posix: Set empty SIGINT handler when a SIGINT is caught

prosody: Clarify and add some comments to describe what we're doing when and why

Rename closeallservers to closeall in the public API (same as net.server_select) and expose setquitting

net.server_event: Add setquitting() function to be compatible with net.server_select

net.server_event: Fix closeallservers() to work correctly after the giant refactorizification

net.server_event: Return "quitting" on loop exit to be compatible with net.server_select, and give Prosody a way to know why the loop broke

mod_posix: Catch SIGINT

Merge with trunk

prosody: Less strict matching for the magic 'interrupted' error

mod_pep: Support item retrieval use cases

mod_pep: Allow storage of urn:xmpp:avatar:data node (payload only with base64 data)

prosodyctl: Nicer errors when addplugin command fails

util.datamanager: Store data stores with no host in '_global' folder

util.pluginloader: Don't specify a host for the plugin data store (clever waqas...)

mod_compression: Tweak some log levels

componentmanager: Set ssl_ctx[_in] for components correctly, and use global SSL context if available

prosody: Expose global_ssl_ctx through prosody object

Disable SSLv2 by default, it's known to be insecure.

mod_proxy65: Strip trailing whitespace

util-src/Makefile: Clean up makefile (re-commit because MattJ shouldn't commit anything at 3AM)

net.server_select, net.server_event: Convert to unix line endings from Windows

util-src/Makefile: Clean up makefile, rename lsignal.c to signal.c

configure: fix typo of 'yes' -> 'yet'

configure: Add 'linux' ostype and rename lflags to LDFLAGS to match expectations.

Redo merge with Waqas' PBKDF2 optimizations.

Merge with Waqas.

net.server_select: Restore checks for wantread/timeout errors on receive

mod_proxy65: Don't read data from the connection untill the proxying is activated

mod_proxy65: Make the proxying bidirectional

mod_proxy65: Use a bigger buffer for data we're proxying

mod_proxy65: Only lock the reading side when throttling

net.server_select: Add a function to just lock a stream for reading

mod_proxy65: Throttle connections to prevent senders flooding the server's buffers if the receiver doesn't receive fast enough

mod_proxy65: Replace error() calls with module:log("error", ...)

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

mercurial