Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/HttpServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/Io/IniUtil.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion src/Io/MultipartParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
46 changes: 46 additions & 0 deletions tests/Io/IniUtilTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
Loading