aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_s2s: Fix typoKim Alvefur2012-02-221-1/+1
* mod_s2s: Add some missing importsKim Alvefur2012-02-221-0/+3
* net.http, httpclient_listener: Merge listener into net.httpMatthew Wild2012-01-232-71/+47
* xmppserver_listener: RemoveMatthew Wild2012-01-231-209/+0
* s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smana...Matthew Wild2012-01-233-570/+772
* stanza_router: Replace s2s send logic with firing of a 'route/remote' eventMatthew Wild2012-01-231-16/+7
* stanza_router: Remove obsolete commented codeMatthew Wild2012-01-231-5/+0
* sessionmanager: Require uuid_generate()Matthew Wild2012-01-231-0/+1
* mod_c2s: Code reductionMatthew Wild2012-01-231-3/+2
* mod_admin_telnet: Port to portmanagerMatthew Wild2012-01-231-5/+5
* prosody: sandboxed require(): Point __index of _G at current env for modules ...Matthew Wild2012-01-231-1/+5
* sessionmanager, mod_c2s: Move timeout logic to mod_c2sMatthew Wild2012-01-232-10/+11
* prosody: Remove connlisteners, and net_activate_portsMatthew Wild2012-01-231-72/+0
* portmanager: Pass port to friendly_error_message()Matthew Wild2012-01-231-2/+2
* util.iterators: Make a standard library (no longer injects into global namesp...Matthew Wild2012-01-231-11/+14
* util.set: Accept nil to add_list()Matthew Wild2012-01-221-2/+4
* mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream...Matthew Wild2012-01-222-90/+86
* portmanager: One manager to, in the darkness, bind themMatthew Wild2012-01-221-0/+132
* Merge with trunkMatthew Wild2012-01-2230-388/+559
|\
| * mod_admin_telnet: Use module:shared() to expose commands table and default co...Matthew Wild2012-01-221-4/+2
| * moduleapi: Add module:shared(), a way to easily share data between multiple l...Matthew Wild2012-01-221-0/+23
| * moduleapi: Add module:depends(), a way to safely depend upon another module a...Matthew Wild2012-01-221-0/+29
| * modulemanager: load(): Return and use the correct module objectMatthew Wild2012-01-221-2/+2
| * util.helpers: After nearly 'fixing' this code, I conclude it instead only des...Matthew Wild2012-01-221-1/+1
| * modulemanager: Cleanup some unused variables, imports, whitespace and add a c...Matthew Wild2012-01-221-3/+1
| * modulemanager, moduleapi: Replace hooks multitable with an event_handlers map...Matthew Wild2012-01-222-21/+12
| * modulemanager: Drop unnecessary prosody_events localMatthew Wild2012-01-221-3/+1
| * modulemanager: Some reorganisation. Only external change is (should be) that ...Matthew Wild2012-01-221-62/+94
| * modulemanager: Move in-module API functions to core.moduleapi (half the file ...Matthew Wild2012-01-222-212/+240
| * mod_compression: Change default compression level to 7Kim Alvefur2012-01-191-1/+1
| * mod_compression: Use get_option_numberKim Alvefur2012-01-191-5/+1
| * Merge with trunkMatthew Wild2012-01-181-6/+25
| |\
| | * util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| * | Merge with 0.9Matthew Wild2012-01-181-1/+1
| |\ \
| | * | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| | * | prosodyctl: Adjust description of 'reload' command (thanks crocket)Matthew Wild2012-01-171-1/+1
| * | | mod_tls: Fix log statement (thanks Zash)Matthew Wild2012-01-181-1/+1
| | |/ | |/|
| * | xmppserver_listener: Only re-attempt connection on disconnect if it was an un...Matthew Wild2012-01-171-1/+1
| * | Merge with 0.9Matthew Wild2012-01-171-2/+2
| |\|
| | * net.http: Pass response object to callbacks (feels hacky, should this be pass...Matthew Wild2012-01-171-2/+2
| | * util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| | * util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| * | net.server_event: Fix :pause() to actually stop reading from the socket, rath...Matthew Wild2012-01-161-1/+8
| * | util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| * | util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| * | util.debug: Adjust level within get_locals_table() to account for the additio...Matthew Wild2012-01-131-0/+1
| * | mod_component: removed unused variable reference, added "flagging" to assert ...Marco Cirillo2012-01-061-2/+2
| * | net.xmppcomponent_listener: removed unused variable reference.Marco Cirillo2012-01-061-2/+0
| * | util.stanza: Remove unused __add metamethodMatthew Wild2011-12-211-5/+0
| * | s2smanager: Fix missing import of 'type' (thanks darkrain)Matthew Wild2011-12-201-2/+2