From 8d114ca4265b97c9d74592947aedce58cabed6e7 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 17 Dec 2009 22:02:26 +0000
Subject: [PATCH] - Patch #648268 by boombatower: allow run-tests.sh to work
with https.
---
scripts/run-tests.sh | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 7dc16e4b6b4d..43e08a1a1711 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -117,7 +117,8 @@ function simpletest_script_help() {
--url Immediately preceeds a URL to set the host and path. You will
need this parameter if Drupal is in a subdirectory on your
- localhost and you have not set \$base_url in settings.php.
+ localhost and you have not set \$base_url in settings.php. Tests
+ can be run under SSL by including https:// in the URL.
--php The absolute path to the PHP executable. Usually not needed.
@@ -264,6 +265,12 @@ function simpletest_script_init($server_software) {
$parsed_url = parse_url($args['url']);
$host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
$path = $parsed_url['path'];
+
+ // If the passed URL schema is 'https' then setup the $_SERVER variables
+ // properly so that testing will run under https.
+ if ($parsed_url['scheme'] == 'https') {
+ $_SERVER['HTTPS'] = 'on';
+ }
}
$_SERVER['HTTP_HOST'] = $host;
@@ -277,6 +284,13 @@ function simpletest_script_init($server_software) {
$_SERVER['PHP_SELF'] = $path .'/index.php';
$_SERVER['HTTP_USER_AGENT'] = 'Drupal command line';
+ if ($_SERVER['HTTPS'] == 'on') {
+ // Ensure that any and all environment variables are changed to https://.
+ foreach ($_SERVER as $key => $value) {
+ $_SERVER[$key] = str_replace('http://', 'https://', $_SERVER[$key]);
+ }
+ }
+
chdir(realpath(dirname(__FILE__) . '/..'));
define('DRUPAL_ROOT', getcwd());
require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
--
GitLab