aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with backoutMatthew Wild2012-05-111-1/+0
|\
| * Backed out changeset 661752889535 - obsoleted by 878f75ccc4fb.Matthew Wild2012-05-111-1/+0
| |
* | Merge with backoutMatthew Wild2012-05-111-1/+5
|\ \
| * | Backed out changeset 9f1fb34cd7f8 - obsoleted by 5ef05f32bc42.Matthew Wild2012-05-111-15/+9
| | |
* | | Merge with backoutMatthew Wild2012-05-111-3/+1
|\ \ \
| * | | Backed out changeset 751510cd558d - obsoleted by 5ef05f32bc42.Matthew Wild2012-05-111-3/+0
| | | |
* | | | muc.lib: return feature-not-implemented when a foregoing discovery node is ↵Marco Cirillo2012-05-101-1/+5
| |_|/ |/| | | | | | | | specified in a disco#info request.
* | | mod_auth_anonymous: add disallow_s2s to the host object if s2s communication ↵Marco Cirillo2012-05-101-0/+1
| |/ |/| | | | | is disallowed.
* | mod_dialback: make change a bit more wide, encompass to and from and reject ↵Marco Cirillo2012-05-091-9/+15
| | | | | | | | with proper addressing when neither are there.
* | mod_dialback: add better safe then sorry nameprepping to the from attribute.Marco Cirillo2012-05-091-3/+9
|/
* mod_dialback: COMPAT reset session.send function for servers (e.g. ejabberd) ↵Marco Cirillo2012-05-091-0/+3
| | | | which don't include a from attr when opening the stream.
* mod_auth_anonymous: Block s2s when enabled on a host (and disallow_s2s ~= false)Matthew Wild2012-05-041-5/+7
|
* mod_s2s: Cache to_host and from_host in local variables, and use these ↵Matthew Wild2012-05-041-10/+13
| | | | instead of repeated lookups
* mod_s2s: Add session.send() only to incoming streams, and fire the ↵Matthew Wild2012-05-041-1/+5
| | | | route/remote event on the host (not global anymore)
* mod_s2s: Become a shared module (yay)Matthew Wild2012-05-041-4/+14
|
* stanza_router: Fire route/remote per-hostMatthew Wild2012-05-041-3/+4
|
* stanza_router: Allow route/remote handlers to return false to block a stanzaMatthew Wild2012-05-041-1/+1
|
* prosodyctl: Fix import of util.iteratorsKim Alvefur2012-05-041-1/+1
|
* Rename plugins/s2s/ to plugins/mod_s2s/Matthew Wild2012-05-042-0/+0
|
* sessionmanager: Remove max_resources config option and check, incorrect ↵Matthew Wild2012-05-031-4/+0
| | | | anyway (thanks Zash)
* util.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani)Matthew Wild2012-05-031-2/+2
|
* net.server: server_select != server_event (thanks Nulani, Florob)Matthew Wild2012-05-031-1/+1
|
* Merge with ZashMatthew Wild2012-05-031-1/+1
|\
| * portmanager: Import pairsKim Alvefur2012-05-031-1/+1
| |
* | net.server, net.timer, net.server_select: Rearrange dependencies between ↵Matthew Wild2012-05-033-23/+9
| | | | | | | | these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani)
* | mod_admin_telnet: Add muc:room(jid) command to get the MUC room objectMatthew Wild2012-05-021-1/+25
|/
* mod_component: Allow unauthenticated components to authenticate (thanks Maranda)Matthew Wild2012-04-301-1/+1
|
* mod_component: Components start out as component_unauthed until successful ↵Matthew Wild2012-04-301-1/+2
| | | | authentication (thanks xnyhps)
* modulemanager: Pass the module's final host (e.g. '*') to the module-loaded ↵Matthew Wild2012-04-301-1/+1
| | | | event
* mod_component: Send <?xml on initial stream (thanks xnyhps)Matthew Wild2012-04-301-0/+1
|
* util.xmlrpc: Remove (unused)Matthew Wild2012-04-291-182/+0
|
* modulemanager: Hide deprecation warning for modules loaded on '*' directly ↵Matthew Wild2012-04-291-1/+3
| | | | (e.g. prosodyctl mod_<command>) (thanks Zash)
* portmanager: Import ipairs (thanks Maranda)Matthew Wild2012-04-291-1/+1
|
* Merge with ZashMatthew Wild2012-04-291-1/+1
|\
| * mod_s2s: Don't try to continue attempting to connect when an s2sin is closedKim Alvefur2012-04-291-1/+1
| |
* | Merge 0.9->trunkMatthew Wild2012-04-2981-2595/+4065
|\|
| * net.connlisteners: Add COMPAT stub, use portmanager!Matthew Wild2012-04-281-0/+15
| |
| * s2sout.lib: Check whether lua-socket supports IPv6Florian Zeitz2012-04-281-0/+4
| |
| * moduleapi: Add module:get_directory() to get module file's directory, and ↵Matthew Wild2012-04-281-0/+10
| | | | | | | | module:load_resource() to load a file relative to that directory
| * portmanager: Import tonumber (thanks Zash)Matthew Wild2012-04-281-1/+1
| |
| * net.http.server: Code cleanup/adjustment now that send_response() accepts ↵Matthew Wild2012-04-281-3/+1
| | | | | | | | response.body
| * net.http.server: Use response.body if it exists and body is not specified to ↵Matthew Wild2012-04-281-1/+1
| | | | | | | | send_response
| * portmanager: Ensure port is always a number (thanks Zash)Matthew Wild2012-04-281-0/+1
| |
| * mod_muc/muc.lib: Fall back to default_history_length if no length in configMatthew Wild2012-04-281-1/+1
| |
| * net.httpserver: Add compatibility stubMatthew Wild2012-04-281-0/+15
| |
| * mod_s2s: Log certificate errors, for troubleshooting goodnessPaul Aurich2012-04-281-0/+3
| |
| * mod_s2s: Fix import of core_process_stanza. I don't know why I thought it ↵Matthew Wild2012-04-281-1/+1
| | | | | | | | was there (thanks Zash)
| * Merge with ZashMatthew Wild2012-04-281-0/+10
| |\
| | * mod_admin_telnet: Add c2s:count() which shows number of connected users.Kim Alvefur2012-04-281-0/+10
| | |
| * | mod_admin_adhoc: Small style fixMatthew Wild2012-04-281-1/+1
| | |