9 files changed, 19 insertions, 19 deletions
diff --git a/phpBB/config/routing.yml b/phpBB/config/routing.yml
index d8e890d063..94146e1ec2 100644
--- a/phpBB/config/routing.yml
+++ b/phpBB/config/routing.yml
@@ -1,7 +1,7 @@
 # Structure:
 #
 # foo_controller:
-#     pattern: /foo
+#     path: /foo
 #     defaults: { _controller: foo_sevice:method }
 #
 # The above will be accessed via app.php?controller=foo and it will
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index dc90d942c3..691d0d5bef 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1063,7 +1063,7 @@ class session
 
 		$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
 		$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
-		$domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain'];
+		$domain = (!$config['cookie_domain'] || $config['cookie_domain'] == '127.0.0.1' || strpos($config['cookie_domain'], '.') === false) ? '' : '; domain=' . $config['cookie_domain'];
 
 		header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . ';' . (($httponly) ? ' HttpOnly' : ''), false);
 	}
diff --git a/tests/controller/config/routing.yml b/tests/controller/config/routing.yml
index 175b11f130..1e7df02684 100644
--- a/tests/controller/config/routing.yml
+++ b/tests/controller/config/routing.yml
@@ -1,3 +1,3 @@
 core_controller:
-    pattern: /core_foo
+    path: /core_foo
     defaults: { _controller: core_foo.controller:bar }
diff --git a/tests/controller/ext/vendor2/foo/config/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml
index 6cc275d96d..e3e8ee5f98 100644
--- a/tests/controller/ext/vendor2/foo/config/routing.yml
+++ b/tests/controller/ext/vendor2/foo/config/routing.yml
@@ -1,5 +1,5 @@
 controller1:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo.controller:handle }
 
 include_controller2:
diff --git a/tests/controller/ext/vendor2/foo/config/routing_2.yml b/tests/controller/ext/vendor2/foo/config/routing_2.yml
index d987a65aea..ee05898c66 100644
--- a/tests/controller/ext/vendor2/foo/config/routing_2.yml
+++ b/tests/controller/ext/vendor2/foo/config/routing_2.yml
@@ -1,6 +1,6 @@
 controller2:
-    pattern: /bar
+    path: /bar
     defaults: { _controller: foo.controller:handle }
 controller3:
-    pattern: /bar/p-{p}
+    path: /bar/p-{p}
     defaults: { _controller: foo.controller:handle }
diff --git a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
index b4d8d19107..20810a8f25 100644
--- a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
+++ b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
@@ -1,3 +1,3 @@
 controller_noroute:
-    pattern: /donotfindthis
+    path: /donotfindthis
     defaults: { _controller: foo.controller:handle }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 08bc73038f..374a58046d 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -1,35 +1,35 @@
 foo_bar_controller:
-    pattern: /foo/bar
+    path: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
 
 foo_baz_controller:
-    pattern: /foo/baz
+    path: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
 
 foo_template_controller:
-    pattern: /foo/template
+    path: /foo/template
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/exception
+    path: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
 
 foo_login_redirect_controller:
-    pattern: /foo/login_redirect
+    path: /foo/login_redirect
     defaults: { _controller: foo_bar.controller:login_redirect }
 
 foo_redirect_controller:
-    pattern: /foo/redirect
+    path: /foo/redirect
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_index_controller:
-    pattern: /index
+    path: /index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_index_controller:
-    pattern: /tests/index
+    path: /tests/index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_dotdot_index_controller:
-    pattern: /tests/../index
+    path: /tests/../index
     defaults: { _controller: foo_bar.controller:redirect }
diff --git a/tests/functional/fixtures/ext/foo/foo/config/resource.yml b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
index ed1d018016..4f2b9cce70 100644
--- a/tests/functional/fixtures/ext/foo/foo/config/resource.yml
+++ b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
@@ -1,3 +1,3 @@
 foo_foo_controller:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo_foo.controller:handle }
diff --git a/tests/pagination/config/routing.yml b/tests/pagination/config/routing.yml
index dd667274cd..2ce082c9d1 100644
--- a/tests/pagination/config/routing.yml
+++ b/tests/pagination/config/routing.yml
@@ -1,6 +1,6 @@
 core_controller:
-    pattern: /test
+    path: /test
     defaults: { _controller: core_foo.controller:bar, page: 1}
 core_page_controller:
-    pattern: /test/page/{page}
+    path: /test/page/{page}
     defaults: { _controller: core_foo.controller:bar}