Cleanup to wfGetNull():

* Add override in case /dev/null isn't accessible (bug 11009)
* Use wfGetNull() in ProxyTools rather than hardcoding it

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e94bf4c..23f61fc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,6 +68,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   and should still be used in code meant to be compatible with v1.13 or older.
 * MediaWiki can be forced to use private IPs forwarded by a proxy server by
   using $wgUsePrivateIPs.
+* (bug 11009) The null file (ie: /dev/null) can be configured with $wgNullFile. 
+  Useful for overriding if the normal file isn't accessible
 
 === Migrated extensions ===
 The following extensions are migrated into MediaWiki 1.14:

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f299ec6..06035d4 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -169,6 +169,13 @@ $wgUploadBaseUrl    = "";
  */
 $wgDirectoryMode = 0777;
 
+/**
+ * Path to null output (/dev/null on *nix, NUL on Windows)
+ * Can be left unset unless you need to override it (ie:
+ * open_basedir won't let you hit /dev/null. See bug 11009)
+ */
+$wgNullFile = false;
+
 /**
  * New file storage paths; currently used only for deleted files.
  * Set it like this:

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4430440..d99bf67 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2816,6 +2816,10 @@ function wfLoadExtensionMessages( $extensionName, $langcode = false ) {
  * @return string
  */
 function wfGetNull() {
+       global $wgNullFile;
+       if ( $wgNullFile ) {
+               return $wgNullFile;
+       }
        return wfIsWindows()
                ? 'NUL'
                : '/dev/null';

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 771fd57..e7c22f8 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -166,7 +166,7 @@ function wfProxyCheck() {
                                                escapeshellarg( $port ),
                                                escapeshellarg( $url )
                                                ));
-                       exec( "php $params &>/dev/null &" );
+                       exec( "php $params &>" . wfGetNull() . " &" );
                }
                # Set MemCached key
                $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );