Experimental ulimit script

diff --git a/.cvsignore b/.cvsignore
index 44ddd60..f436e3a 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,6 @@
 LocalSettings.php
 AdminSettings.php
 *~
-bin
 .classpath
 .project
 project.index

diff --git a/bin/ulimit.sh b/bin/ulimit.sh
new file mode 100644 (file)
index 0000000..7a1925c
--- /dev/null
+++ b/bin/ulimit.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+ulimit -t $1
+ulimit -v $2
+shift 2
+"$@"
+

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d459466..3d0ac19 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1572,4 +1572,19 @@ function wfIsWellFormedXmlFragment( $text ) {
        return wfIsWellFormedXml( $html );
 }
 
+/**
+ * shell_exec() with time and memory limits mirrored from the PHP configuration,
+ * if supported.
+ */
+function wfShellExec( $cmd )
+{
+       global $IP;
+       if ( php_uname( 's' ) == 'Linux' ) {
+               $time = ini_get( 'max_execution_time' );
+               $memKB = intval( ini_get( 'memory_limit' ) / 1024 );
+               $cmd = escapeshellarg( "$IP/ulimit.sh" ) . " $time $memKB $cmd";
+       }
+       return shell_exec( $cmd );
+}
+
 ?>