Merge remote-tracking branch 'upstream/io' into oscar

packages/backend/src/core/UtilityService.ts

@@ -35,7 +35,7 @@ export class UtilityService {
 
 	@bindThis
 	public isUriLocal(uri: string): boolean {
-		return this.normalizeHost(this.config.hostname) === this.extractHost(uri);
+		return this.normalizeHost(this.config.host) === this.extractHost(uri);
 	}
 
 	@bindThis

packages/backend/test/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     environment:
       DFLY_version_check: false
       DFLY_tcp_backlog: 2048
-      DFLY_lock_on_hashtags: true
+      DFLY_default_lua_flags: allow-undeclared-keys
       DFLY_pipeline_squash: 0
       DFLY_multi_exec_squash: false
       DFLY_conn_io_threads: 4