aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge 0.9->trunkMatthew Wild2013-03-1012-71/+262
|\|
| * mod_s2s, mod_dialback: Rename s2s-authenticate-legacy event to s2sout-authent...Matthew Wild2013-03-102-2/+2
| * net.dns: Make sure argument to math.randomseed does not overflow a 32 bit uns...Kim Alvefur2013-03-051-1/+1
| * net.server_event: Remove unused localKim Alvefur2013-03-011-1/+0
| * net.server_select: Optimization, clean bufferqueue when it makes sense.Kim Alvefur2013-03-011-16/+5
| * net.server_select: Use # operator instead of string.lenKim Alvefur2013-03-011-3/+2
| * mod_proxy65: Only handle service discovery requests when no node is present i...Waqas Hussain2013-02-261-6/+10
| * MUC: Always return <service-unavailable/> when a node is present in service d...Waqas Hussain2013-02-262-9/+6
| * MUC: Fix affiliation check for admins, and bring it in line with the spec (th...Waqas Hussain2013-02-261-1/+1
| * net.http.server: Ensure HTTP callbacks are never called recursively for pipel...Waqas Hussain2013-02-261-9/+10
| * mod_http: Expand $host in http_pathsKim Alvefur2013-02-181-2/+3
| * net.server_select: Limit global number of sockets passed to select.Kim Alvefur2013-02-121-9/+23
| * net.server_select: Be less aggressive about server pauseKim Alvefur2013-02-121-8/+11
| * mod_admin_adhoc: Fix 'Shut down service' commandFlorian Zeitz2013-02-071-1/+1
| * mod_admin_adhoc: Implement global module unloadingFlorian Zeitz2013-02-071-0/+64
| * mod_admin_adhoc: Implement global module reloadingFlorian Zeitz2013-02-071-0/+63
| * mod_admin_adhoc: Fix info message for module reload/unloadFlorian Zeitz2013-02-061-2/+4
| * mod_admin_adhoc: Implement global module loadingFlorian Zeitz2013-02-061-0/+55
| * mod_admin_adhoc: Remove a TODO, our pretty_print turns out not to be helpful ...Florian Zeitz2013-02-051-2/+1
| * net.http.parser: Ensure full URL in status line contains a path.Waqas Hussain2013-02-081-1/+1
| * net.http.parser: Fix traceback on invalid URL in status line.Waqas Hussain2013-02-081-0/+1
* | Merge 0.9->trunkKim Alvefur2013-02-039-22/+117
|\|
| * mod_pubsub, util.pubsub: Add delete actionKim Alvefur2013-01-312-0/+30
| * portmanager: Make sure foo_ports is a tableKim Alvefur2013-01-311-2/+3
| * mod_pubsub: More strict checks for node and idsKim Alvefur2013-01-311-4/+19
| * mod_pubsub: Broadcast items correctly on new subscriptionsKim Alvefur2013-01-281-1/+1
| * mod_component: Look for the correct xmlns (thanks NebuK)Kim Alvefur2013-01-271-1/+1
| * util.pubsub: Fix nil access error in get_subscriptions.Waqas Hussain2013-01-261-1/+1
| * mod_pubsub: require usermanager.Waqas Hussain2013-01-261-0/+1
| * mod_pubsub: Fix nil access error.Waqas Hussain2013-01-261-1/+1
| * mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> elementFlorian Zeitz2013-01-252-19/+29
| * util.xmppstream: Include error stanza in error message if no error handler is...Waqas Hussain2013-01-261-1/+1
| * ejabberd2prosody.lua: Don't make assumptions about file name.Kim Alvefur2013-01-251-2/+2
| * ejabberd2prosody.lua: Replace util.logger with a dummy before requiring util....Kim Alvefur2013-01-241-1/+1
| * mod_pubsub: Ignore subscription options for now, fixes traceback due to missi...Kim Alvefur2013-01-241-0/+3
| * mod_s2s: Don't try to close sessions that were destroyed before timeoutKim Alvefur2013-01-241-0/+2
| * s2smanager: Generate session names used for logging the same way everywhereKim Alvefur2013-01-243-3/+3
| * mod_pubsub, util.pubsub: Implement the purge actionKim Alvefur2013-01-242-1/+34
| * mod_pubsub: Advertise autocreate_on_publish correctly.Kim Alvefur2013-01-231-2/+2
* | Merge 0.9->trunkWaqas Hussain2013-01-2220-46/+91
|\|
| * mod_auth_internal_plain, mod_auth_internal_hashed: No need to nodeprep here.Waqas Hussain2013-01-222-14/+2
| * util.sasl.{plain,scram,digest-md5}: nodeprep username before passing to callb...Waqas Hussain2013-01-223-5/+25
| * net.http.server: Properly handle persistent connectionsFlorian Zeitz2013-01-121-3/+14
| * util.http: New module for HTTP helper functionsFlorian Zeitz2013-01-121-0/+15
| * mod_component: Make listener private (thanks Ge0rG)Kim Alvefur2013-01-171-0/+1
| * mod_presence: Put a timestamp on presence we store for probesKim Alvefur2013-01-111-0/+2
| * prosodyctl, prosody: Pass the selected config file from prosodyctl to prosodyKim Alvefur2013-01-092-0/+5
| * prosodyctl: Pop arg items after use. Fixes #306Kim Alvefur2013-01-091-1/+1
| * MUC: Don't reply to errors (thanks iron)Kim Alvefur2013-01-091-1/+1
| * prosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use .crt as suffix for cert...Kim Alvefur2013-01-084-5/+5