Merge pull request #13593 from owncloud/add-check-for-raw-post-data
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
This commit is contained in:
commit
7e4afa3f25
|
@ -12,6 +12,7 @@ php_value upload_max_filesize 513M
|
||||||
php_value post_max_size 513M
|
php_value post_max_size 513M
|
||||||
php_value memory_limit 512M
|
php_value memory_limit 512M
|
||||||
php_value mbstring.func_overload 0
|
php_value mbstring.func_overload 0
|
||||||
|
php_value always_populate_raw_post_data -1
|
||||||
<IfModule env_module>
|
<IfModule env_module>
|
||||||
SetEnv htaccessWorking true
|
SetEnv htaccessWorking true
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
|
|
@ -2,3 +2,4 @@ upload_max_filesize=513M
|
||||||
post_max_size=513M
|
post_max_size=513M
|
||||||
memory_limit=512M
|
memory_limit=512M
|
||||||
mbstring.func_overload=0
|
mbstring.func_overload=0
|
||||||
|
always_populate_raw_post_data=-1
|
||||||
|
|
|
@ -628,10 +628,25 @@ class OC_Util {
|
||||||
);
|
);
|
||||||
$webServerRestart = true;
|
$webServerRestart = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PHP 5.6 ships with a PHP setting which throws notices by default for a
|
||||||
|
* lot of endpoints. Thus we need to ensure that the value is set to -1
|
||||||
|
*
|
||||||
|
* @link https://github.com/owncloud/core/issues/13592
|
||||||
|
*/
|
||||||
|
if(version_compare(phpversion(), '5.6.0', '>=') &&
|
||||||
|
\OC::$server->getIniWrapper()->getNumeric('always_populate_raw_post_data') !== -1) {
|
||||||
|
$errors[] = array(
|
||||||
|
'error' => $l->t('PHP is configured to populate raw post data. Since PHP 5.6 this will lead to PHP throwing notices for perfectly valid code.'),
|
||||||
|
'hint' => $l->t('To fix this issue set <code>always_populate_raw_post_data</code> to <code>-1</code> in your php.ini')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (!self::isAnnotationsWorking()) {
|
if (!self::isAnnotationsWorking()) {
|
||||||
$errors[] = array(
|
$errors[] = array(
|
||||||
'error' => 'PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.',
|
'error' => $l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.'),
|
||||||
'hint' => 'This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.'
|
'hint' => $l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue