From 88aadf3804d5719788245061f9c40ff5ec7bad64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Sun, 11 Jun 2017 00:43:06 +0200
Subject: [PATCH] Use HTTPS for the www.cakephp.org URL

Do not change those in tests.
---
 app/View/Layouts/default.ctp                             | 2 +-
 app/View/Layouts/error.ctp                               | 2 +-
 lib/Cake/Console/Templates/skel/View/Layouts/default.ctp | 2 +-
 lib/Cake/Console/Templates/skel/View/Layouts/error.ctp   | 2 +-
 lib/Cake/Network/CakeResponse.php                        | 4 ++--
 lib/Cake/Network/Http/HttpSocket.php                     | 4 ++--
 lib/Cake/TestSuite/templates/footer.php                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index d8925255d..2f8d3cb8e 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -49,7 +49,7 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false, 'id' => 'cake-powered')
 				);
 			?>
diff --git a/app/View/Layouts/error.ctp b/app/View/Layouts/error.ctp
index c0a80b7cd..9c5d9cff5 100644
--- a/app/View/Layouts/error.ctp
+++ b/app/View/Layouts/error.ctp
@@ -48,7 +48,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
 			?>
diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
index 43bc4f285..397089b8c 100644
--- a/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
+++ b/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
@@ -39,7 +39,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
 			?>
diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
index 43bc4f285..397089b8c 100644
--- a/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
+++ b/lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
@@ -39,7 +39,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
 			?>
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
index ca8c27009..21dfd7b2e 100644
--- a/lib/Cake/Network/CakeResponse.php
+++ b/lib/Cake/Network/CakeResponse.php
@@ -1260,7 +1260,7 @@ class CakeResponse {
  * This method allow multiple ways to setup the domains, see the examples
  *
  * ### Full URI
- * e.g `cors($request, 'http://www.cakephp.org');`
+ * e.g `cors($request, 'https://www.cakephp.org');`
  *
  * ### URI with wildcard
  * e.g `cors($request, 'http://*.cakephp.org');`
@@ -1272,7 +1272,7 @@ class CakeResponse {
  * e.g `cors($request, '*');`
  *
  * ### Whitelist of URIs
- * e.g `cors($request, array('http://www.cakephp.org', '*.google.com', 'https://myproject.github.io'));`
+ * e.g `cors($request, array('https://www.cakephp.org', '*.google.com', 'https://myproject.github.io'));`
  *
  * @param CakeRequest $request Request object
  * @param string|array $allowedDomains List of allowed domains, see method description for more details
diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php
index a6e79253c..8aacde4ef 100644
--- a/lib/Cake/Network/Http/HttpSocket.php
+++ b/lib/Cake/Network/Http/HttpSocket.php
@@ -564,11 +564,11 @@ class HttpSocket extends CakeSocket {
  * URLs.
  *
  * ```
- * $http = new HttpSocket('http://www.cakephp.org');
+ * $http = new HttpSocket('https://www.cakephp.org');
  * $url = $http->url('/search?q=bar');
  * ```
  *
- * Would return `http://www.cakephp.org/search?q=bar`
+ * Would return `https://cakephp.org/search?q=bar`
  *
  * url() can also be used with custom templates:
  *
diff --git a/lib/Cake/TestSuite/templates/footer.php b/lib/Cake/TestSuite/templates/footer.php
index f1ed35d9a..d1a582cb4 100644
--- a/lib/Cake/TestSuite/templates/footer.php
+++ b/lib/Cake/TestSuite/templates/footer.php
@@ -20,7 +20,7 @@
 		<div id="footer">
 			<p>
 			<!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
-			<a href="http://www.cakephp.org/" target="_blank">
+			<a href="https://cakephp.org/" target="_blank">
 				<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a>
 			</p>
 		</div>