aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.8->trunkMatthew Wild2011-01-117-10/+10
|\
| * util.sasl.*: Add 'sasl.' prefix to module namesMatthew Wild2011-01-114-6/+6
| * util.datamanager: Change from 'Failed to load' to 'Assuming empty' for data s...Matthew Wild2011-01-111-2/+2
| * net.server_select, net.server_event: Silence 'error during ssl handshake' for...Matthew Wild2011-01-112-2/+2
* | Merge 0.8->trunkMatthew Wild2011-01-112-14/+33
|\|
| * mod_storage_sql: Create index when creating a new tableMatthew Wild2011-01-111-13/+32
| * util.datamanager: Handle gracefully the lack of prosody.paths.dataMatthew Wild2011-01-111-1/+1
* | Merge 0.8->trunkMatthew Wild2011-01-102-20/+51
|\|
| * s2smanager: Don't bounce error replies for error and result stanzas.Waqas Hussain2011-01-101-5/+4
| * mod_storage_sql: Reconnect in all cases, and rollback on error.Waqas Hussain2011-01-101-15/+47
* | Merge 0.8->trunkMatthew Wild2011-01-083-20/+24
|\|
| * net.adns: Fix logging to handle unconnected UDP socketsMatthew Wild2011-01-081-1/+2
| * mod_bosh: Return true from send()Matthew Wild2011-01-081-0/+1
| * mod_storage_sql: Create table automatically for all databases now, not just S...Matthew Wild2011-01-081-19/+21
* | util.pubsub: Pass true instead of nil as the actor in a bunch of places, and ...Matthew Wild2011-01-081-7/+7
* | util.pubsub: Some tidying/optimisation to service:may()Matthew Wild2011-01-081-4/+3
* | certs/openssl.cnf: Specify output encoding.Kim Alvefur2011-01-081-2/+2
* | Merge 0.8->trunkMatthew Wild2011-01-074-10/+18
|\|
| * mod_storage_sql: Make the 'database' value for the SQLite3 driver relative to...Matthew Wild2011-01-071-2/+9
| * prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.p...Matthew Wild2011-01-071-3/+4
| * prosody: Instead of calling datamanager.set_path(), just ensure prosody.path...Matthew Wild2011-01-071-4/+3
| * util.datamanager: Use prosody.paths.data as the initial value for data_pathMatthew Wild2011-01-071-1/+2
* | Merge 0.8->trunkMatthew Wild2011-01-071-4/+6
|\|
| * prosody.cfg.lua: Give example for logging to consoleMatthew Wild2011-01-071-0/+1
| * prosody.cfg.lua: Improve comment about enabling debug loggingMatthew Wild2011-01-071-1/+1
| * prosody.cfg.lua: Add mod_offline to the list of modules that can be disabled,...Matthew Wild2011-01-071-3/+4
* | Merge 0.8->trunkMatthew Wild2011-01-074-36/+57
|\|
| * prosody.cfg.lua.dist: Update to include storage configuration and examples fo...Matthew Wild2011-01-071-0/+12
| * prosody.cfg.lua.dist: Add note about the require_encryption optionsMatthew Wild2011-01-071-1/+6
| * storagemanager, mod_storage_internal: Split out default driver to mod_storage...Matthew Wild2011-01-072-35/+36
| * prosody.cfg.lua.dist: Add motd pluginMatthew Wild2011-01-071-0/+1
| * mod_motd: Process value to strip any indentation from the configMatthew Wild2011-01-071-0/+2
* | Merge 0.8->trunkMatthew Wild2011-01-073-674/+0
|\|
| * ejabberdstore.lib.lua: Remove now needless libraryMatthew Wild2011-01-071-190/+0
| * ejabberd_init.lib.lua: Remove now needless libraryMatthew Wild2011-01-071-252/+0
| * mod_storage_sql_ejabberd: Remove (moving to prosody-modules)Matthew Wild2011-01-071-232/+0
* | Merge 0.8->trunkMatthew Wild2011-01-060-0/+0
|\|
| * storagemanager: Fix log message (s/internal/null/)Matthew Wild2011-01-061-1/+1
| * storagemanager: Add new "null" provider to get used when loading a driver or ...Matthew Wild2011-01-061-4/+20
| * storagemanager: Log host in message when loading storage provider failsMatthew Wild2011-01-061-1/+1
| * net.server_event: Log interface and port number when binding failsMatthew Wild2011-01-061-1/+1
| * mod_storage_sql: Catch Lua errors during SQL transactions, and rollback.Waqas Hussain2011-01-051-13/+30
| * net.httpserver: Removed unused import and variables.Waqas Hussain2011-01-051-2/+0
| * net.httpserver: Changed an unnecessary global access.Waqas Hussain2011-01-051-1/+1
| * mod_storage_sql: Removed unnecessary initialization of a variable.Waqas Hussain2011-01-051-1/+1
| * net.httpserver: Decode percent-encoded characters in URL path.Waqas Hussain2011-01-051-0/+1
| * modulemanager: Removed an unused variable.Waqas Hussain2011-01-051-2/+0
| * configmanager: Added rawget().Waqas Hussain2011-01-051-0/+9
| * mod_bosh: Fix for miscalculating inactivity, causing disconnects under a stea...Matthew Wild2011-01-041-5/+6
| * prosody, prosodyctl: Filter out relative paths from package.(c)path when inst...Matthew Wild2011-01-042-4/+28