Author: jfthomps
Date: Wed Nov 28 15:25:00 2012
New Revision: 1414756
URL: http://svn.apache.org/viewvc?rev=1414756&view=rev
Log:
VCL-650
VCL breaks with PHP 5.4
utils.php: modified getKey - changed from looping through items to create an
md5 of everything to just doing an md5 of the serialized data
Modified:
vcl/trunk/web/.ht-inc/utils.php
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1414756&r1=1414755&r2=1414756&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Wed Nov 28 15:25:00 2012
@@ -2305,16 +2305,7 @@ function updateResourcePrivs($group, $no
///
////////////////////////////////////////////////////////////////////////////////
function getKey($data) {
- $newdata = array();
- foreach($data as $arr)
- if(is_array($arr))
- $newdata = array_merge_recursive($newdata, $arr);
- else
- array_push($newdata, $arr);
- $rc = '';
- foreach($newdata as $key => $val)
- $rc = md5("$rc$key$val");
- return $rc;
+ return md5(serialize($data));
}
////////////////////////////////////////////////////////////////////////////////
