Merge "[FileBackend] Only show "copied file(s)" for files the script had to copy."

[lhc/web/wiklou.git] / includes / CryptRand.php

diff --git a/includes/CryptRand.php b/includes/CryptRand.php
index 8994082..bb80eeb 100644 (file)
--- a/includes/CryptRand.php
+++ b/includes/CryptRand.php
@@ -5,6 +5,21 @@
  * This is based in part on Drupal code as well as what we used in our own code
  * prior to introduction of this class.
  *
+ * 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
+ *
  * @author Daniel Friesen
  * @file
  */
@@ -54,7 +69,7 @@ class MWCryptRand {
                // It'll also vary slightly across different machines
                $state = serialize( $_SERVER );
 
-               // To try and vary the system information of the state a bit more
+               // To try vary the system information of the state a bit more
                // by including the system's hostname into the state
                $state .= wfHostname();
 
@@ -72,10 +87,13 @@ class MWCryptRand {
                $files[] = dirname( dirname( __FILE__ ) );
 
                // The config file is likely the most often edited file we know should be around
-               // so if the constant with it's location is defined include it's stat info into the state
+               // so include its stat info into the state.
+               // The constant with its location will almost always be defined, as WebStart.php defines
+               // MW_CONFIG_FILE to $IP/LocalSettings.php unless being configured with MW_CONFIG_CALLBACK (eg. the installer)
                if ( defined( 'MW_CONFIG_FILE' ) ) {
                        $files[] = MW_CONFIG_FILE;
                }
+
                foreach ( $files as $file ) {
                        wfSuppressWarnings();
                        $stat = stat( $file );
@@ -281,7 +299,7 @@ class MWCryptRand {
                if ( strlen( $buffer ) < $bytes ) {
                        // If available make use of mcrypt_create_iv URANDOM source to generate randomness
                        // On unix-like systems this reads from /dev/urandom but does it without any buffering
-                       // and bypasses openbasdir restrictions so it's preferable to reading directly
+                       // and bypasses openbasedir restrictions, so it's preferable to reading directly
                        // On Windows starting in PHP 5.3.0 Windows' native CryptGenRandom is used to generate
                        // entropy so this is also preferable to just trying to read urandom because it may work
                        // on Windows systems as well.
@@ -300,9 +318,10 @@ class MWCryptRand {
                }
 
                if ( strlen( $buffer ) < $bytes ) {
-                       // If available make use of openssl's random_pesudo_bytes method to attempt to generate randomness.
+                       // If available make use of openssl's random_pseudo_bytes method to attempt to generate randomness.
                        // However don't do this on Windows with PHP < 5.3.4 due to a bug:
                        // http://stackoverflow.com/questions/1940168/openssl-random-pseudo-bytes-is-slow-php
+                       // http://git.php.net/?p=php-src.git;a=commitdiff;h=cd62a70863c261b07f6dadedad9464f7e213cad5
                        if ( function_exists( 'openssl_random_pseudo_bytes' )
                                && ( !wfIsWindows() || version_compare( PHP_VERSION, '5.3.4', '>=' ) )
                        ) {