diff --git a/src/HttpServer.php b/src/HttpServer.php index f2334733..856e2d67 100644 --- a/src/HttpServer.php +++ b/src/HttpServer.php @@ -234,13 +234,13 @@ public function __construct($requestHandlerOrLoop) $middleware[] = new LimitConcurrentRequestsMiddleware($concurrency); } $middleware[] = new RequestBodyBufferMiddleware($maxSize); - // Checking for an empty string because that is what a boolean - // false is returned as by ini_get depending on the PHP version. + // Legacy PHP < 5.4 and HHVM do not support this setting and return + // false instead, so only disable when explicitly disabled. // @link http://php.net/manual/en/ini.core.php#ini.enable-post-data-reading // @link http://php.net/manual/en/function.ini-get.php#refsect1-function.ini-get-notes // @link https://3v4l.org/qJtsa $enablePostDataReading = \ini_get('enable_post_data_reading'); - if ($enablePostDataReading !== '') { + if ($enablePostDataReading === false || IniUtil::iniBoolean($enablePostDataReading)) { $middleware[] = new RequestBodyParserMiddleware(); } } diff --git a/src/Io/IniUtil.php b/src/Io/IniUtil.php index 612aae29..19f9b400 100644 --- a/src/Io/IniUtil.php +++ b/src/Io/IniUtil.php @@ -45,4 +45,16 @@ public static function iniSizeToBytes($size) return (int)$size; } + + /** + * Convert a ini like boolean to a boolean value just like PHP does. + * + * @param string $value + * @return bool + * @link https://github.com/php/php-src/blob/master/Zend/zend_ini.c + */ + public static function iniBoolean($value) + { + return (int) $value !== 0 || \in_array(\strtolower($value), array('on', 'yes', 'true'), true); + } } diff --git a/src/Io/MultipartParser.php b/src/Io/MultipartParser.php index 539107ae..20056b7e 100644 --- a/src/Io/MultipartParser.php +++ b/src/Io/MultipartParser.php @@ -95,7 +95,7 @@ public function __construct($uploadMaxFilesize = null, $maxFileUploads = null) } $this->uploadMaxFilesize = IniUtil::iniSizeToBytes($uploadMaxFilesize); - $this->maxFileUploads = $maxFileUploads === null ? (\ini_get('file_uploads') === '' ? 0 : (int)\ini_get('max_file_uploads')) : (int)$maxFileUploads; + $this->maxFileUploads = $maxFileUploads === null ? (!IniUtil::iniBoolean(\ini_get('file_uploads')) ? 0 : (int) \ini_get('max_file_uploads')) : (int) $maxFileUploads; $this->maxMultipartBodyParts = $this->maxInputVars + $this->maxFileUploads; } diff --git a/tests/Io/IniUtilTest.php b/tests/Io/IniUtilTest.php index 155c6ed2..184e36d4 100644 --- a/tests/Io/IniUtilTest.php +++ b/tests/Io/IniUtilTest.php @@ -78,4 +78,50 @@ public function testInvalidInputIniSizeToBytes($input) $this->setExpectedException('InvalidArgumentException'); IniUtil::iniSizeToBytes($input); } + + public function provideIniBooleansEnabled() + { + return array( + array('1'), + array('On'), + array('on'), + array('yes'), + array('true'), + array('TRUE'), + array('2'), + array('-1'), + array('1abc'), + ); + } + + /** + * @dataProvider provideIniBooleansEnabled + */ + public function testIniBooleanReturnsTrueForEnabledValue($input) + { + $this->assertTrue(IniUtil::iniBoolean($input)); + } + + public function provideIniBooleansDisabled() + { + return array( + array(''), + array('0'), + array('Off'), + array('off'), + array('no'), + array('false'), + array('none'), + array('00'), + array('abc'), + ); + } + + /** + * @dataProvider provideIniBooleansDisabled + */ + public function testIniBooleanReturnsFalseForDisabledValue($input) + { + $this->assertFalse(IniUtil::iniBoolean($input)); + } }