aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.6->0.7Matthew Wild2010-04-091-1/+1
|\
| * net.server: Fix logic error causing traceback when receiving a non-number portMatthew Wild2010-04-091-1/+1
* | util.timer: When using libevent hold onto the event handle to stop it being c...Matthew Wild2010-04-071-2/+3
* | Merge 0.6->0.7Matthew Wild2010-04-033-5/+5
|\|
| * Merge 0.6/MattJ -> 0.6Matthew Wild2010-04-033-6/+8
| |\
| | * util.ztact: Fixed global accesses.Waqas Hussain2010-04-011-2/+2
| | * util.uuid: Use a local instead of a global.Waqas Hussain2010-04-011-1/+1
| | * util.stanza: Fixed some more nil global accesses.Waqas Hussain2010-04-011-3/+3
| | * util.stanza: Fixed a nil global access.Waqas Hussain2010-04-011-0/+2
| * | mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to wor...Matthew Wild2010-04-031-2/+2
| |/
* | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-301-4/+4
|\ \
| * | net.server_event: Fixed spelling fail.Waqas Hussain2010-03-261-4/+4
* | | Merge 0.6->0.7Matthew Wild2010-03-304-10/+10
|\ \ \ | |/ / |/| / | |/
| * xmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns...Matthew Wild2010-03-301-0/+3
| * stanza_router, s2smanager, modulemanager: Fix for handling of the default nam...Matthew Wild2010-03-303-10/+7
* | tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax errorMatthew Wild2010-03-251-0/+6
* | tools/erlparse: Report the line number when showing a syntax error in the inp...Matthew Wild2010-03-251-2/+6
* | tools/erlparse: Optimisations aplenty for faster processing of large filesMatthew Wild2010-03-251-28/+30
* | tools/ejabberd2prosody: Create prosody singleton so datamanager can detect th...Matthew Wild2010-03-251-0/+2
* | net.server_event: Don't re-try a write if the connection closed (thanks Flo)Matthew Wild2010-03-251-1/+1
* | net.server_event: Bump timeout values up somewhatMatthew Wild2010-03-241-3/+3
* | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-243-4/+12
|\ \
| * | util.sasl.digest-md5: Removed unnnecessary check (which included a nil global...Waqas Hussain2010-03-241-2/+0
| * | mod_register: Use set_password to set passwords instead of create_user.Waqas Hussain2010-03-241-2/+3
| * | usermanager: Added function set_password.Waqas Hussain2010-03-241-0/+9
* | | Merge 0.6->0.7Matthew Wild2010-03-241-2/+3
|\ \ \ | |/ / |/| / | |/
| * mod_tls: Add s2s_allow_encryption option which, when set to false, disabled T...Matthew Wild2010-03-241-18/+27
* | prosody.cfg.lua.dist: Whitespace fix.Waqas Hussain2010-03-231-89/+89
* | prosody.cfg.lua.dist: Disable mod_privacy by default.Waqas Hussain2010-03-231-1/+1
* | usermanager: Return sane errors/results when Cyrus SASL is in use.Waqas Hussain2010-03-231-1/+8
* | mod_saslauth: Tidier code for SASL backend selection.Waqas Hussain2010-03-231-8/+6
* | mod_saslauth: Fail with an error when the requested SASL backend cannot be used.Waqas Hussain2010-03-231-4/+6
* | Merge 0.6->0.7Matthew Wild2010-03-2297-238/+258
|\|
| * util.windows: Convert from Windows line endingsMatthew Wild2010-03-221-58/+58
| * Update copyright headers for 2010Matthew Wild2010-03-22100-199/+212
| * loggingmanager: Don't use non-standard format specifier to format the timestamp.Waqas Hussain2010-03-221-1/+1
* | stanza_router: Don't send error replies for stanzas of type 'error' and 'resu...Waqas Hussain2010-03-221-1/+3
* | stanza_router: Allow non-jabber:client elements after auth, before bind. [ori...Waqas Hussain2010-03-221-1/+1
* | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fi...Matthew Wild2010-03-222-0/+2
* | mod_groups: Ignore whitespace on group member JID lines (thanks Luis!)Matthew Wild2010-03-221-1/+1
* | mod_groups: Fixes to make compatible with roster versioning - set version to ...Matthew Wild2010-03-221-0/+5
* | mod_groups: Missed hunk from last commit, don't create the list of public gro...Matthew Wild2010-03-221-1/+1
* | mod_groups: Only create group lists when necessary (now we can reliably detec...Matthew Wild2010-03-221-7/+16
* | rostermanager: Don't bump the roster version if it is == true (ie. we are not...Matthew Wild2010-03-221-2/+8
* | mod_roster: Tidier code for the roster versioning logicMatthew Wild2010-03-221-3/+4
* | .hgignore: Ignore prosody.version (thanks Florob)Matthew Wild2010-03-201-0/+1
* | util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition wher...Matthew Wild2010-03-181-6/+2
* | util.sasl_cyrus: Clarify some log messages and levelsMatthew Wild2010-03-181-3/+3
* | util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.Paul Aurich2010-03-171-5/+8
* | util.sasl_cyrus: If available, use a c14n callback for interoperability with ...Paul Aurich2010-03-171-0/+10