aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge trunk with trunkMatthew Wild2010-02-210-0/+0
|\
| * Merge with 0.7.Waqas Hussain2010-02-212-0/+13
| |\
* | \ Merge 0.7 with 0.7 with trunk \o/Matthew Wild2010-02-212-0/+13
|\ \ \
| * \ \ Merge 0.7 with 0.7Matthew Wild2010-02-212-0/+13
| |\ \ \ | | | |/ | | |/|
| | * | mod_iq: Fire sub-events for iq/self events.Waqas Hussain2010-02-211-0/+12
| | | |
| | * | stanza_router: Make sure /self events are fired when the 'to' attribute is ↵Waqas Hussain2010-02-211-0/+1
| | | | | | | | | | | | | | | | missing.
* | | | Merge with 0.7Matthew Wild2010-02-211-1/+1
|\| | | | |_|/ |/| |
| * | ejabberdsql2prosody: Don't print password of imported accounts (thanks azerttyu)Matthew Wild2010-02-211-1/+1
| |/
* | Merge with 0.7Matthew Wild2010-02-202-252/+0
|\|
| * mod_debug: Obsoleted by mod_consoleMatthew Wild2010-02-201-191/+0
| |
| * mod_selftests: Obsolete, removeMatthew Wild2010-02-201-61/+0
| |
| * mod_offline: Remove from 0.7 (offline messages are handled in core at the ↵Matthew Wild2010-02-201-56/+0
| | | | | | | | moment)
* | Backed out changeset e7b09424b486 (not removing mod_offline for trunk)Matthew Wild2010-02-201-0/+56
| |
* | mod_offline: Remove from 0.7 (offline messages are handled in core at the ↵Matthew Wild2010-02-201-56/+0
| | | | | | | | moment)
* | mod_storage, plus a bit of SQL and XML.Waqas Hussain2010-02-195-0/+594
| |
* | Merge with 0.7Matthew Wild2010-02-193-13/+17
|\|
| * s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo)Matthew Wild2010-02-191-1/+1
| |
| * net.http: Update print()s to log()s - don't ask how this came to be, I have ↵Matthew Wild2010-02-191-8/+7
| | | | | | | | no idea :)
| * net.httpclient_listener: Don't notify request of closed connection if the ↵Matthew Wild2010-02-191-1/+1
| | | | | | | | close was initiated by us
| * net.http: destroy_request(): Remove update for new server API, pass ↵Matthew Wild2010-02-191-2/+3
| | | | | | | | request.handler instead of request.conn to ondisconnect
| * net.http: Close connection when invalid status line is received from the serverMatthew Wild2010-02-191-1/+4
| |
| * net.http: Don't re-destroy a request when the connection is closedMatthew Wild2010-02-191-0/+1
| |
* | Merge with 0.7Matthew Wild2010-02-191-5/+14
|\|
| * net.http: Port commit 2f235c57d713 to net.http to fix headers in responses ↵Matthew Wild2010-02-191-5/+14
| | | | | | | | (thanks dersd)
* | Merge with 0.7Matthew Wild2010-02-180-0/+0
|\|
| * MUC: Allow role changes based on JIDs.Waqas Hussain2010-02-181-0/+3
| | | | | | | | (transplanted from a4879b1e6cde5aedb6bd5827d710b6dba5e8a736)
* | Merge with 0.7Matthew Wild2010-02-183-6/+19
|\|
| * README: Update URL for installation docsMatthew Wild2010-02-181-1/+1
| |
| * HACKERS: UpdateMatthew Wild2010-02-181-3/+5
| |
| * TODO: UpdateMatthew Wild2010-02-181-2/+13
| |
* | Merge with 0.7Matthew Wild2010-02-183-9/+11
|\|
| * net.adns: Don't treat locally-initiated disconnects as fatal with libevent ↵Matthew Wild2010-02-181-6/+8
| | | | | | | | backend in use (thanks Flo)
| * net.server_event: Pass false as connection error to disconnect handler if ↵Matthew Wild2010-02-181-1/+1
| | | | | | | | close was initiated by us
| * modulemanager: Fix traceback on unloading global modules (thanks KSid)Matthew Wild2010-02-181-2/+2
| |
* | MUC: Allow role changes based on JIDs.Waqas Hussain2010-02-181-0/+3
| |
* | Merge with 0.7Matthew Wild2010-02-171-4/+4
|\|
| * net.server_event: Increase SSL handshake timeout to 30s, make handshake ↵Matthew Wild2010-02-171-4/+4
| | | | | | | | round-trip count configurable, and bump connect timeout to 20s (thanks Flo)
* | Merge with 0.7Matthew Wild2010-02-161-1/+3
|\|
| * mod_tls: Only negotiate TLS on outgoing s2s connections if we have an SSL ↵Matthew Wild2010-02-161-1/+3
| | | | | | | | context (thanks Flo...)
* | Merge with 0.7Matthew Wild2010-02-161-1/+3
|\|
| * net.adns: Fix potential traceback on DNS responses with libevent enabled ↵Matthew Wild2010-02-161-1/+3
| | | | | | | | (thanks Flo)
| * Makefile: Remove fallbacks/Matthew Wild2010-02-151-2/+1
| |
* | Makefile: Remove fallbacks/Matthew Wild2010-02-151-2/+1
| |
* | prosody: Don't add fallbacks to package.path and package.cpath.Waqas Hussain2010-02-161-3/+0
|/
* util.sasl.scram: Removed unnecessary dependency on bitlib.Waqas Hussain2010-02-161-1/+0
|
* mod_saslauth: Log debug message with full error if cyrussasl couldn't be loadedMatthew Wild2010-02-151-0/+1
|
* mod_saslauth: Correct syntax for gracefully handling a missing cyrussasl libraryMatthew Wild2010-02-151-2/+2
|
* net.server: Remove redundant commented code and some trailing whitespaceMatthew Wild2010-02-151-2/+1
|
* mod_presence: Added config option 'bare_message_delivery_policy'. Allowed ↵Waqas Hussain2010-02-151-11/+30
| | | | values are 'priority' (default) and 'broadcast'.
* mod_presence: Reflect the user's own presence back to them.Waqas Hussain2010-02-151-0/+3
|