Don't send stream:features to incoming s2s connections

Fix logger ids for c2s and s2sout

Automated merge with http://waqas.ath.cx/

Change modules to use the new add_feature module API method.

Added function add_feature to modules API (for adding disco features)

Reorder the disco info elements to place always included elements first

Added tag 0.1.0 for changeset c157c1412bda

Fix Makefile to link with Lua again 0.1.0

Fix configure to save LFLAGS, and also set proper defaults for all sensible OSes

Automated merge with http://84.46.7.57:1234

Making makefile work under OS X finally. Yeah OS X's gcc is a little bit strange.

Using new LFLAGS variable.

Added an error log message for this case

Quick fix for an issue that needs more looking into

Automated merge with http://waqas.ath.cx/

Fix for handling latin1 encoded hostnames in SASL

Fix GPL'ing MIT/X licensed code :)

Update HACKERS

Fill blank with URL

Remove stray merge marker

Merge from waqas

config and data directories taken from path, and quoted to allow spaces in path

Converted prosody.cfg.lua.dist to use windows end-of-lines

Fix license (left some boilerplate in)

and the C files too

Insert copyright/license headers

Fix port number in mod_console instructions

lxmppd -> Prosody

Fix macosx ostype target

Fix debian ostype target

Change sed usage back into one sed script for incompetent versions of sed

Use install to strip symbols

'install' libs to util before top-level make install

Potential fixes for building on Mac OSX

No need for the placeholder file in tests/ because the directory is no longer empty

Add test for latin1toutf8 (which passes)

Converting latin encoded responsed to utf-8 when needed.

Automerge with waqas.

Automated merge with h-h.

Remove that idn stuff for realm because it's either an ugly hack that the password_handler isn't ready for or something worse.

Added function latin1toutf8 to sasl.lua, for processing non-utf8 responses

Makefile fix for creating datadir in correct place on install

Installation improvements (auto-creation of data directories)

Don't overwrite config on make install if it already exists

Path fix for auto-creating directories

Merge from waqas

Auto-create data directories on start

Merge with Tobias

idna-to-unicode so password_handler looks for the right domain.

Do idna-to-ascii to the realm we send first in Digest-MD5.

Yet another fix for the makefile :)

Fix missing prosody.cfg.lua.install

Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :(

Add -fPIC to util-src/Makefile

Another automatic merge, this gets annoying."

Fixed the ejabberd importer to work with the pipe sign "|" as a separator in erlang lists

Autocommit.

Automated merge.

Automated merge.

Make ejabberd2prosody.lua a little more cross-platform :)

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

mercurial