Author: jfthomps
Date: Wed Sep 24 13:49:47 2014
New Revision: 1627322
URL: http://svn.apache.org/r1627322
Log:
utils.php: modified abort: added global flag to prevent a loop where something
in the abort function causes abort to get called
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=1627322&r1=1627321&r2=1627322&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Wed Sep 24 13:49:47 2014
@@ -865,7 +865,11 @@ function main() {
////////////////////////////////////////////////////////////////////////////////
function abort($errcode, $query="") {
global $mysql_link_vcl, $mysql_link_acct, $ERRORS, $user, $mode;
- global $ENABLE_ITECSAUTH, $requestInfo;
+ global $ENABLE_ITECSAUTH, $requestInfo, $aborting;
+ if(! isset($aborting))
+ $aborting = 1;
+ elseif($aborting == 1)
+ return;
if($mode == 'xmlrpccall')
xmlRPCabort($errcode, $query);
if(ONLINEDEBUG && checkUserHasPerm('View Debug Information')) {
