Author: jfthomps
Date: Thu May 10 19:07:13 2012
New Revision: 1336831

URL: http://svn.apache.org/viewvc?rev=1336831&view=rev
Log:
VCL-576
Finalizing for 2.3 release

testsetup.php:
-removed mcrypt from required php extensions
-changed check for $mcryptkey to $cryptkey
-removed checks of $mcryptiv

Modified:
    incubator/vcl/trunk/web/testsetup.php

Modified: incubator/vcl/trunk/web/testsetup.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/testsetup.php?rev=1336831&r1=1336830&r2=1336831&view=diff
==============================================================================
--- incubator/vcl/trunk/web/testsetup.php (original)
+++ incubator/vcl/trunk/web/testsetup.php Thu May 10 19:07:13 2012
@@ -268,9 +268,9 @@ if($includeconf && include('.ht-inc/conf
 # required extentions
 title("Testing for required php extensions");
 if(version_compare(phpversion(), "5.2", "<"))
-       $requiredexts = array('gd', 'mcrypt', 'mysql', 'openssl', 'sysvsem', 
'xml', 'xmlrpc', 'session', 'pcre', 'sockets', 'ldap');
+       $requiredexts = array('gd', 'mysql', 'openssl', 'sysvsem', 'xml', 
'xmlrpc', 'session', 'pcre', 'sockets', 'ldap');
 else
-       $requiredexts = array('gd', 'mcrypt', 'mysql', 'openssl', 'sysvsem', 
'xml', 'xmlrpc', 'session', 'pcre', 'sockets', 'json', 'ldap');
+       $requiredexts = array('gd', 'mysql', 'openssl', 'sysvsem', 'xml', 
'xmlrpc', 'session', 'pcre', 'sockets', 'json', 'ldap');
 $exts = get_loaded_extensions();
 $diff = array_diff($requiredexts, $exts);
 print "<ul>\n";
@@ -311,16 +311,8 @@ if($includesecrets && include('.ht-inc/s
                $trymysqlconnect = 0;
                $allok = 0;
        }
-       if(empty($mcryptkey)) {
-               fail("\$mcryptkey in .ht-inc/secrets.php is not set");
-               $allok = 0;
-       }
-       if(empty($mcryptiv)) {
-               fail("\$mcryptiv in .ht-inc/secrets.php is not set");
-               $allok = 0;
-       }
-       elseif(strlen($mcryptiv) != 8) {
-               fail("\$mcryptiv in .ht-inc/secrets.php needs to be 8 
characters");
+       if(empty($cryptkey)) {
+               fail("\$cryptkey in .ht-inc/secrets.php is not set");
                $allok = 0;
        }
        if(empty($pemkey)) {


Reply via email to