You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2017/08/10 19:24:52 UTC
svn commit: r1804710 - /vcl/trunk/web/testsetup.php
Author: jfthomps
Date: Thu Aug 10 19:24:52 2017
New Revision: 1804710
URL: http://svn.apache.org/viewvc?rev=1804710&view=rev
Log:
VCL-1053 - Prepare VCL 2.5 release
testsetup.php:
-added $aborting global flag that keeps the abort function from doing anything if called
-moved dbConnect to before initGlobals due to initGlobals accessing the database
Modified:
vcl/trunk/web/testsetup.php
Modified: vcl/trunk/web/testsetup.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/testsetup.php?rev=1804710&r1=1804709&r2=1804710&view=diff
==============================================================================
--- vcl/trunk/web/testsetup.php (original)
+++ vcl/trunk/web/testsetup.php Thu Aug 10 19:24:52 2017
@@ -326,6 +326,8 @@ if($createcryptkey) {
title("Checking asymmetric encryption key for this web server");
print "<ul>\n";
if(is_readable('.ht-inc/utils.php') && @(include '.ht-inc/utils.php') == TRUE) {
+ global $aboarting;
+ $aborting = 1; # set this so if abort function in utils.php is called, it just returns
$file = preg_replace('|/testsetup.php|', '', $_SERVER['SCRIPT_FILENAME']);
$filebase = $file . "/.ht-inc/cryptkey";
$file1 = "$filebase/cryptkeyid";
@@ -339,8 +341,8 @@ if($createcryptkey) {
$_SERVER['SCRIPT_FILENAME'] = str_replace('testsetup.php', 'index.php', $_SERVER['SCRIPT_FILENAME']);
$actions = array('pages' => array());
unset($_COOKIE['VCLAUTH']);
- initGlobals();
dbConnect();
+ initGlobals();
checkCryptkey();
dbDisconnect();
$_SERVER['SCRIPT_FILENAME'] = $tmp;