diff --git a/core/modules/file/file.install b/core/modules/file/file.install index 05eedf0f953310cb29537e7946a551253ceac29a..d371384664e8c5caf8a8dd0e0635c2879e7ad8ed 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -96,13 +96,9 @@ function file_requirements($phase) { $value = t('Not enabled'); $description = t('Your server is not capable of displaying file upload progress. File upload progress requires PHP be run with mod_php or PHP-FPM and not as FastCGI.'); } - elseif (!$implementation && extension_loaded('apcu')) { - $value = t('Not enabled'); - $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.'); - } elseif (!$implementation) { $value = t('Not enabled'); - $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); + $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library.'); } elseif ($implementation == 'apc') { $value = t('Enabled (APC RFC1867)'); diff --git a/core/modules/file/file.module b/core/modules/file/file.module index c63fff4358fce165fb3b4f74a03770d9b5df0bf3..687a62c70b297872ad4cd220261cf1b25aa0d7c6 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -929,7 +929,7 @@ function file_progress_implementation() { if (extension_loaded('uploadprogress')) { $implementation = 'uploadprogress'; } - elseif (extension_loaded('apc') && ini_get('apc.rfc1867')) { + elseif (version_compare(PHP_VERSION, '7', '<') && extension_loaded('apc') && ini_get('apc.rfc1867')) { $implementation = 'apc'; } }