X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FScopedPHPTimeout.php;h=d1493c30b7ad0efee52cde73bd70f636393f978c;hb=8fc8ddfa80ddc06ab9dab54288118288468fffcd;hp=97c6bbfc9b800e99836cedafbeb85f9169f834bb;hpb=d05de487c31db528919e7ec7ac64b78bb33fb9e5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ScopedPHPTimeout.php b/includes/ScopedPHPTimeout.php
index 97c6bbfc9b..d1493c30b7 100644
--- a/includes/ScopedPHPTimeout.php
+++ b/includes/ScopedPHPTimeout.php
@@ -1,14 +1,38 @@
 <?php
+/**
+ * Expansion of the PHP execution time limit feature for a function call.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
 
 /**
  * Class to expand PHP execution time for a function call.
+ * Use this when performing changes that should not be interrupted.
+ *
  * On construction, set_time_limit() is called and set to $seconds.
+ * If the client aborts the connection, PHP will continue to run.
  * When the object goes out of scope, the timer is restarted, with
  * the original time limit minus the time the object existed.
  */
 class ScopedPHPTimeout {
 	protected $startTime; // float; seconds
 	protected $oldTimeout; // integer; seconds
+	protected $oldIgnoreAbort; // boolean
 
 	protected static $stackDepth = 0; // integer
 	protected static $totalCalls = 0; // integer
@@ -30,6 +54,7 @@ class ScopedPHPTimeout {
 			} elseif ( self::$stackDepth > 0 ) { // recursion guard
 				trigger_error( "Resursive invocation of " . __CLASS__ . " attempted." );
 			} else {
+				$this->oldIgnoreAbort = ignore_user_abort( true );
 				$this->oldTimeout = ini_set( 'max_execution_time', $seconds );
 				$this->startTime = microtime( true );
 				++self::$stackDepth;
@@ -53,6 +78,7 @@ class ScopedPHPTimeout {
 			// take some measures to prevent this. Track total time and calls.
 			self::$totalElapsed += $elapsed;
 			--self::$stackDepth;
+			ignore_user_abort( $this->oldIgnoreAbort );
 		}
 	}
 }