diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 34cc40fed060..18844a3c68b0 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -124,6 +124,18 @@ public function getOptions(): array
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Returns the path segments.
+	 *
+	 * @return array
+	 */
+	public function getSegments(): array
+	{
+		return $this->segments;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Returns the value for a single CLI option that was passed in.
 	 *
@@ -178,7 +190,7 @@ public function getOptionString(): string
 			$out .= "-{$name} $value ";
 		}
 
-		return $out;
+		return trim($out);
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3eb725c69dfe..ce7baaa33954 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 /**
  * CodeIgniter
@@ -71,10 +73,10 @@ class CURLRequest extends Request
 	 * @var array
 	 */
 	protected $config = [
-		'timeout'			 => 0.0,
-		'connect_timeout'	 => 150,
-		'debug'				 => false,
-		'verify'			 => true
+		'timeout' => 0.0,
+		'connect_timeout' => 150,
+		'debug' => false,
+		'verify' => true
 	];
 
 	/**
@@ -84,9 +86,9 @@ class CURLRequest extends Request
 	 * @var array
 	 */
 	protected $redirectDefaults = [
-		'max'		 => 5,
-		'strict'	 => true,
-		'protocols'	 => ['http', 'https'],
+		'max' => 5,
+		'strict' => true,
+		'protocols' => ['http', 'https'],
 	];
 
 	/**
@@ -114,7 +116,10 @@ public function __construct(App $config, URI $uri, ResponseInterface $response =
 	{
 		if ( ! function_exists('curl_version'))
 		{
+			// we won't see this during travis-CI
+			// @codeCoverageIgnoreStart
 			throw HTTPException::forMissingCurl();
+			// @codeCoverageIgnoreEnd
 		}
 
 		parent::__construct($config);
@@ -571,7 +576,7 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 				$cert = $cert[0];
 			}
 
-			if (! file_exists($cert))
+			if ( ! file_exists($cert))
 			{
 				throw HTTPException::forSSLCertNotFound($cert);
 			}
@@ -586,7 +591,7 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 			{
 				$file = realpath($config['ssl_key']);
 
-				if (! $file)
+				if ( ! $file)
 				{
 					throw HTTPException::forInvalidSSLKey($config['ssl_key']);
 				}
@@ -723,6 +728,8 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 	 * Does the actual work of initializing cURL, setting the options,
 	 * and grabbing the output.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param array $curl_options
 	 *
 	 * @return string
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 9b9cf56730aa..39c4ae81492d 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -11,6 +11,9 @@ class HTTPException extends FrameworkException implements ExceptionInterface
 	 * For CurlRequest
 	 *
 	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * 
+	 * Not testable with travis-ci
+	 * @codeCoverageIgnore		
 	 */
 	public static function forMissingCurl()
 	{
@@ -48,6 +51,9 @@ public static function forInvalidSSLKey(string $key)
 	 * @param string $error
 	 *
 	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * 
+	 * Not testable with travis-ci; we over-ride the method which triggers it
+	 * @codeCoverageIgnore		
 	 */
 	public static function forCurlError(string $errorNum, string $error)
 	{
diff --git a/tests/_support/HTTP/Files/CookiesHolder.txt b/tests/_support/HTTP/Files/CookiesHolder.txt
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/tests/_support/HTTP/Files/CookiesHolder.txt
@@ -0,0 +1 @@
+
diff --git a/tests/_support/HTTP/MockCURLRequest.php b/tests/_support/HTTP/MockCURLRequest.php
index 0f650847cf37..2cd73b54de37 100644
--- a/tests/_support/HTTP/MockCURLRequest.php
+++ b/tests/_support/HTTP/MockCURLRequest.php
@@ -1,4 +1,6 @@
-<?php namespace Tests\Support\HTTP;
+<?php
+
+namespace Tests\Support\HTTP;
 
 use CodeIgniter\HTTP\CURLRequest;
 
@@ -11,8 +13,8 @@
  */
 class MockCURLRequest extends CURLRequest
 {
-	public $curl_options;
 
+	public $curl_options;
 	protected $output = '';
 
 	//--------------------------------------------------------------------
@@ -35,5 +37,16 @@ protected function sendRequest(array $curl_options = []): string
 	}
 
 	//--------------------------------------------------------------------
+	// for testing purposes only
+	public function getBaseURI()
+	{
+		return $this->baseURI;
+	}
+
+	// for testing purposes only
+	public function getDelay()
+	{
+		return $this->delay;
+	}
 
 }
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
new file mode 100644
index 000000000000..801b781ad99d
--- /dev/null
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -0,0 +1,520 @@
+<?php
+namespace CodeIgniter\HTTP;
+
+use Config\App;
+
+/**
+ * This should be the same as RequestTest,
+ * except also testing the methods added by CLIRequest
+ * 
+ * @backupGlobals enabled
+ */
+class CLIRequestTest extends \CIUnitTestCase
+{
+
+	/**
+	 * @var \CodeIgniter\HTTP\Request
+	 */
+	protected $request;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->request	 = new CLIRequest(new App());
+		$_POST			 = [];
+		$_GET			 = [];
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testParsingSegments() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','bar'];
+		$_SERVER['argc'] = 6;
+
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$segments = ['users','21','profile'];
+		$this->assertEquals($segments,$this->request->getSegments());
+	}
+	
+	public function testParsingOptions() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','bar'];
+		$_SERVER['argc'] = 6;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$options = ['foo'=>'bar'];
+		$this->assertEquals($options,$this->request->getOptions());		
+	}
+	
+	public function testParsingOptionDetails() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','bar'];
+		$_SERVER['argc'] = 6;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$this->assertEquals('bar',$this->request->getOption('foo'));		
+		$this->assertNull($this->request->getOption('notthere'));
+	}
+	
+	public function testParsingOptionString() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','bar', '-baz', 'queue some stuff'];
+		$_SERVER['argc'] = 8;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expected = '-foo bar -baz "queue some stuff"';
+		$this->assertEquals($expected,$this->request->getOptionString());		
+	}
+	
+	public function testParsingNoOptions() {
+		$_SERVER['argv'] = ['index.php','users','21','profile'];
+		$_SERVER['argc'] = 4;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expected = '';
+		$this->assertEquals($expected,$this->request->getOptionString());		
+	}
+	
+	public function testParsingPath() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','bar'];
+		$_SERVER['argc'] = 6;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expected = "users/21/profile";
+		$this->assertEquals($expected,$this->request->getPath());		
+	}
+	
+	public function testParsingMalformed() {
+		$_SERVER['argv'] = ['index.php','users','21','pro-file','-foo','bar', '-baz', 'queue some stuff'];
+		$_SERVER['argc'] = 8;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expectedOptions = '-foo bar -baz "queue some stuff"';
+		$expectedPath = "users/21";
+		$this->assertEquals($expectedOptions,$this->request->getOptionString());		
+		$this->assertEquals($expectedPath,$this->request->getPath());		
+	}
+	
+	public function testParsingMalformed2() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','oops-bar', '-baz', 'queue some stuff'];
+		$_SERVER['argc'] = 8;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expectedOptions = '-foo oops-bar -baz "queue some stuff"';
+		$expectedPath = "users/21/profile";
+		$this->assertEquals($expectedOptions,$this->request->getOptionString());		
+		$this->assertEquals($expectedPath,$this->request->getPath());		
+	}
+	
+	public function testParsingMalformed3() {
+		$_SERVER['argv'] = ['index.php','users','21','profile','-foo','oops', 'bar', '-baz', 'queue some stuff'];
+		$_SERVER['argc'] = 9;
+		
+		// reinstantiate it to force parsing
+		$this->request	 = new CLIRequest(new App());
+		
+		$expectedOptions = '-foo oops -baz "queue some stuff"';
+		$expectedPath = "users/21/profile";
+		$this->assertEquals($expectedOptions,$this->request->getOptionString());		
+		$this->assertEquals($expectedPath,$this->request->getPath());		
+	}
+	
+	//--------------------------------------------------------------------
+
+	public function testFetchGlobalsSingleValue()
+	{
+		$_POST['foo']	 = 'bar';
+		$_GET['bar']	 = 'baz';
+
+		$this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
+		$this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
+	}
+
+	public function testFetchGlobalsReturnsNullWhenNotFound()
+	{
+		$this->assertNull($this->request->fetchGlobal('post', 'foo'));
+	}
+
+	public function testFetchGlobalsFiltersValues()
+	{
+		$this->request->setGlobal('post', [
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz',
+		]);
+
+		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+	}
+
+	public function testFetchGlobalsWithFilterFlag()
+	{
+		$this->request->setGlobal('post', [
+			'foo'	 => '`bar<script>',
+			'bar'	 => 'baz',
+		]);
+
+		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+	}
+
+	public function testFetchGlobalReturnsAllWhenEmpty()
+	{
+		$post = [
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
+			'xxx'	 => 'yyy',
+			'yyy'	 => 'zzz'
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals($post, $this->request->fetchGlobal('post'));
+	}
+
+	public function testFetchGlobalFiltersAllValues()
+	{
+		$post		 = [
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz<script>',
+			'xxx'	 => 'yyy<script>',
+			'yyy'	 => 'zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+			'xxx'	 => 'yyy%3Cscript%3E',
+			'yyy'	 => 'zzz%3Cscript%3E'
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+	}
+
+	public function testFetchGlobalFilterWithFlagAllValues()
+	{
+		$post		 = [
+			'foo'	 => '`bar<script>',
+			'bar'	 => '`baz<script>',
+			'xxx'	 => '`yyy<script>',
+			'yyy'	 => '`zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+			'xxx'	 => 'yyy%3Cscript%3E',
+			'yyy'	 => 'zzz%3Cscript%3E'
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+	}
+
+	public function testFetchGlobalReturnsSelectedKeys()
+	{
+		$post		 = [
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
+			'xxx'	 => 'yyy',
+			'yyy'	 => 'zzz'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected	 = [
+			'foo'	 => 'bar',
+			'bar'	 => 'baz',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+	}
+
+	public function testFetchGlobalFiltersSelectedValues()
+	{
+		$post		 = [
+			'foo'	 => 'bar<script>',
+			'bar'	 => 'baz<script>',
+			'xxx'	 => 'yyy<script>',
+			'yyy'	 => 'zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+	}
+
+	public function testFetchGlobalFilterWithFlagSelectedValues()
+	{
+		$post		 = [
+			'foo'	 => '`bar<script>',
+			'bar'	 => '`baz<script>',
+			'xxx'	 => '`yyy<script>',
+			'yyy'	 => '`zzz<script>'
+		];
+		$this->request->setGlobal('post', $post);
+		$expected	 = [
+			'foo'	 => 'bar%3Cscript%3E',
+			'bar'	 => 'baz%3Cscript%3E',
+		];
+
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+	}
+
+	/**
+	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/353
+	 */
+	public function testFetchGlobalReturnsArrayValues()
+	{
+		$post	 = [
+			'ANNOUNCEMENTS'	 => [
+				1	 => [
+					'DETAIL' => 'asdf'
+				],
+				2	 => [
+					'DETAIL' => 'sdfg'
+				]
+			],
+			'submit'		 => 'SAVE'
+		];
+		$this->request->setGlobal('post', $post);
+		$result	 = $this->request->fetchGlobal('post');
+
+		$this->assertEquals($post, $result);
+		$this->assertInternalType('array', $result['ANNOUNCEMENTS']);
+		$this->assertCount(2, $result['ANNOUNCEMENTS']);
+	}
+
+	public function testFetchGlobalWithArrayTop()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
+	}
+
+	public function testFetchGlobalWithArrayChildNumeric()
+	{
+		$post = [
+			'clients' => [
+				[
+					'address' => [
+						'zipcode' => 90210
+					],
+				],
+				[
+					'address' => [
+						'zipcode' => 60610
+					],
+				],
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
+	}
+
+	public function testFetchGlobalWithArrayChildElement()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				],
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+		$this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
+	}
+
+	public function testFetchGlobalWithKeylessArrayChildElement()
+	{
+		$post = [
+			'clients' => [
+				'address'	 => [
+					'zipcode' => 90210
+				],
+				'stuff'		 => [['a']]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
+	}
+
+	public function testFetchGlobalWithArrayLastElement()
+	{
+		$post = [
+			'clients' => [
+				'address' => [
+					'zipcode' => 90210
+				]
+			]
+		];
+		$this->request->setGlobal('post', $post);
+
+		$this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+	}
+
+	public function testFetchGlobalWithEmptyNotation()
+	{
+		$expected	 = [
+			[
+				'address' => [
+					'zipcode' => 90210
+				],
+			],
+			[
+				'address' => [
+					'zipcode' => 60610
+				],
+			],
+		];
+		$post		 = [
+			'clients' => $expected
+		];
+		$this->request->setGlobal('post', $post);
+
+//		echo var_dump($this->request->fetchGlobal('post', 'clients[][zipcode]'));
+		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function ipAddressChecks()
+	{
+		return [
+			'empty'			 => [false, ''],
+			'zero'			 => [false, 0],
+			'large_ipv4'	 => [false, '256.256.256.999', 'ipv4'],
+			'good_ipv4'		 => [true, '100.100.100.0', 'ipv4'],
+			'good_default'	 => [true, '100.100.100.0'],
+			'zeroed_ipv4'	 => [true, '0.0.0.0'],
+			'large_ipv6'	 => [false, 'h123:0000:0000:0000:0000:0000:0000:0000', 'ipv6'],
+			'good_ipv6'		 => [true, '2001:0db8:85a3:0000:0000:8a2e:0370:7334'],
+			'confused_ipv6'	 => [false, '255.255.255.255', 'ipv6'],
+		];
+	}
+
+	/**
+	 * @dataProvider ipAddressChecks
+	 */
+	public function testValidIPAddress($expected, $address, $type = null)
+	{
+		$this->assertEquals($expected, $this->request->isValidIP($address, $type));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testGetIPAddressDefault()
+	{
+		$this->assertEquals('0.0.0.0', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressNormal()
+	{
+		$expected				 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']	 = $expected;
+		$this->request			 = new Request(new App());
+		$this->assertEquals($expected, $this->request->getIPAddress());
+		// call a second time to exercise the initial conditional block in getIPAddress()
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxy()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.0.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyInvalid()
+	{
+		$expected						 = '123.456.23.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.0.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// spoofed address invalid
+		$this->assertEquals('10.0.1.200', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyNotWhitelisted()
+	{
+		$expected						 = '123.456.23.123';
+		$_SERVER['REMOTE_ADDR']			 = '10.10.1.200';
+		$config							 = new App();
+		$config->proxyIPs				 = '10.0.1.200,192.168.5.0/24';
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// spoofed address invalid
+		$this->assertEquals('10.10.1.200', $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxySubnet()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '192.168.5.21';
+		$config							 = new App();
+		$config->proxyIPs				 = ['192.168.5.0/24'];
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals($expected, $this->request->getIPAddress());
+	}
+
+	public function testGetIPAddressThruProxyOutofSubnet()
+	{
+		$expected						 = '123.123.123.123';
+		$_SERVER['REMOTE_ADDR']			 = '192.168.5.21';
+		$config							 = new App();
+		$config->proxyIPs				 = ['192.168.5.0/28'];
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+		$this->request					 = new Request($config);
+
+		// we should see the original forwarded address
+		$this->assertEquals('192.168.5.21', $this->request->getIPAddress());
+	}
+
+	//FIXME getIPAddress should have more testing, to 100% code coverage
+	
+	//--------------------------------------------------------------------
+
+	public function testMethodReturnsRightStuff()
+	{
+		// Defaults method to GET now.
+		$this->assertEquals('get', $this->request->getMethod());
+		$this->assertEquals('GET', $this->request->getMethod(true));
+	}
+
+}
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 102c1e276093..f4426ca0ea2c 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Services;
 use Config\App;
@@ -6,6 +8,7 @@
 
 class CURLRequestTest extends \CIUnitTestCase
 {
+
 	protected $request;
 
 	public function setUp()
@@ -13,14 +16,12 @@ public function setUp()
 		parent::setUp();
 
 		Services::reset();
-	    $this->request = $this->getRequest();
+		$this->request = $this->getRequest();
 	}
 
 	protected function getRequest(array $options = [])
 	{
-		$uri = isset($options['base_uri'])
-			? new URI($options['base_uri'])
-			: new URI();
+		$uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
 
 		return new MockCURLRequest(new App(), $uri, new Response(new \Config\App()), $options);
 	}
@@ -49,7 +50,7 @@ public function testGetRemembersBaseURI()
 	public function testGetRemembersBaseURIWithHelperMethod()
 	{
 		$request = Services::curlrequest([
-			'base_uri' => 'http://www.foo.com/api/v1/'
+					'base_uri' => 'http://www.foo.com/api/v1/'
 		]);
 
 		$uri = $this->getPrivateProperty($request, 'baseURI');
@@ -64,7 +65,7 @@ public function testSendReturnsResponse()
 		$output = "Howdy Stranger.";
 
 		$response = $this->request->setOutput($output)
-						->send('get', 'http://example.com');
+				->send('get', 'http://example.com');
 
 		$this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
 		$this->assertEquals($output, $response->getBody());
@@ -128,6 +129,59 @@ public function testOptionsSetsCorrectMethod()
 
 	//--------------------------------------------------------------------
 
+	public function testOptionsBaseURIOption()
+	{
+		$options = [
+			'base_uri' => 'http://www.foo.com/api/v1/',
+		];
+		$request = $this->getRequest($options);
+
+		$this->assertEquals('http://www.foo.com/api/v1/', $request->getBaseURI());
+	}
+
+	public function testOptionsBaseURIOverride()
+	{
+		$options = [
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'baseURI' => 'http://bogus/com',
+		];
+		$request = $this->getRequest($options);
+
+		$this->assertEquals('http://bogus/com', $request->getBaseURI());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testOptionsHeaders()
+	{
+		$options = [
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'headers' => ['fruit' => 'apple'],
+		];
+		$request = $this->getRequest([]);
+		$this->assertNull($request->getHeader('fruit'));
+
+		$request = $this->getRequest($options);
+		$this->assertEquals('apple', $request->getHeader('fruit')->getValue());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testOptionsDelay()
+	{
+		$options = [
+			'delay' => 2000,
+			'headers' => ['fruit' => 'apple'],
+		];
+		$request = $this->getRequest([]);
+		$this->assertEquals(0.0, $request->getDelay());
+
+		$request = $this->getRequest($options);
+		$this->assertEquals(2.0, $request->getDelay());
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testPatchSetsCorrectMethod()
 	{
 		$response = $this->request->patch('http://example.com');
@@ -290,8 +344,6 @@ public function testCertOption()
 		$this->assertEquals($file, $options[CURLOPT_SSLCERT]);
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testCertOptionWithPassword()
 	{
 		$file = __FILE__;
@@ -309,6 +361,47 @@ public function testCertOptionWithPassword()
 		$this->assertEquals('password', $options[CURLOPT_SSLCERTPASSWD]);
 	}
 
+	public function testMissingCertOption()
+	{
+		$file = 'something_obviously_bogus';
+		$this->expectException(Exceptions\HTTPException::class);
+
+		$response = $this->request->request('get', 'http://example.com', [
+			'cert' => $file
+		]);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testSSLVerification()
+	{
+		$file = __FILE__;
+
+		$response = $this->request->request('get', 'http://example.com', [
+			'verify' => 'yes',
+			'ssl_key' => $file
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_CAINFO, $options);
+		$this->assertEquals($file, $options[CURLOPT_CAINFO]);
+
+		$this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
+		$this->assertEquals(1, $options[CURLOPT_SSL_VERIFYPEER]);
+	}
+
+	public function testSSLWithBadKey()
+	{
+		$file = 'something_obviously_bogus';
+		$this->expectException(Exceptions\HTTPException::class);
+
+		$response = $this->request->request('get', 'http://example.com', [
+			'verify' => 'yes',
+			'ssl_key' => $file
+		]);
+	}
+
 	//--------------------------------------------------------------------
 
 	public function testDebugOption()
@@ -327,10 +420,42 @@ public function testDebugOption()
 
 	//--------------------------------------------------------------------
 
+	public function testDecodeContent()
+	{
+
+		$this->request->setHeader('Accept-Encoding', 'cobol');
+		$response = $this->request->request('get', 'http://example.com', [
+			'decode_content' => true,
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+		$this->assertEquals('cobol', $options[CURLOPT_ENCODING]);
+	}
+
+	public function testDecodeContentWithoutAccept()
+	{
+
+//		$this->request->setHeader('Accept-Encoding', 'cobol');
+		$response = $this->request->request('get', 'http://example.com', [
+			'decode_content' => true,
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+		$this->assertEquals('', $options[CURLOPT_ENCODING]);
+		$this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options);
+		$this->assertEquals('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testAllowRedirectsOptionFalse()
 	{
 		$response = $this->request->request('get', 'http://example.com', [
-				'allow_redirects' => false
+			'allow_redirects' => false
 		]);
 
 		$options = $this->request->curl_options;
@@ -342,12 +467,10 @@ public function testAllowRedirectsOptionFalse()
 		$this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testAllowRedirectsOptionTrue()
 	{
 		$response = $this->request->request('get', 'http://example.com', [
-				'allow_redirects' => true
+			'allow_redirects' => true
 		]);
 
 		$options = $this->request->curl_options;
@@ -358,15 +481,13 @@ public function testAllowRedirectsOptionTrue()
 		$this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
 		$this->assertEquals(5, $options[CURLOPT_MAXREDIRS]);
 		$this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
-		$this->assertEquals(CURLPROTO_HTTP|CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
+		$this->assertEquals(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
 	}
 
-	//--------------------------------------------------------------------
-
 	public function testAllowRedirectsOptionDefaults()
 	{
 		$response = $this->request->request('get', 'http://example.com', [
-				'allow_redirects' => true
+			'allow_redirects' => true
 		]);
 
 		$options = $this->request->curl_options;
@@ -378,5 +499,207 @@ public function testAllowRedirectsOptionDefaults()
 		$this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
 	}
 
+	public function testAllowRedirectsArray()
+	{
+		$response = $this->request->request('get', 'http://example.com', [
+			'allow_redirects' => ['max' => 2]
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+		$this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+		$this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+		$this->assertEquals(2, $options[CURLOPT_MAXREDIRS]);
+	}
+
 	//--------------------------------------------------------------------
+
+	public function testSendWithQuery()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'query' => ['name' => 'Henry'],
+		]);
+
+		$response = $request->get('products');
+
+		$options = $request->curl_options;
+
+		$this->assertEquals('http://www.foo.com/api/v1/products?name=Henry', $options[CURLOPT_URL]);
+	}
+
+	//--------------------------------------------------------------------
+	public function testSendWithDelay()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'delay' => 1000,
+		]);
+
+		$response = $request->get('products');
+
+		// we still need to check the code coverage to make sure this was done
+		$this->assertEquals(1.0, $request->getDelay());
+	}
+
+	//--------------------------------------------------------------------
+	public function testSendContinued()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'delay' => 1000,
+		]);
+
+		$request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
+		$response = $request->get('answer');
+		$this->assertEquals("Hi there", $response->getBody());
+	}
+
+	//--------------------------------------------------------------------
+	public function testSplitResponse()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'delay' => 1000,
+		]);
+
+		$request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
+		$response = $request->get('answer');
+		$this->assertEquals("Hi there", $response->getBody());
+	}
+
+	//--------------------------------------------------------------------
+	public function testApplyBody()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'delay' => 1000,
+		]);
+
+		$request->setBody("name=George");
+		$request->setOutput("Hi there");
+		$response = $request->post('answer');
+
+		$this->assertEquals("Hi there", $response->getBody());
+		$this->assertEquals("name=George", $request->curl_options[CURLOPT_POSTFIELDS]);
+	}
+
+	//--------------------------------------------------------------------
+	public function testResponseHeaders()
+	{
+		$request = $this->getRequest([
+			'base_uri' => 'http://www.foo.com/api/v1/',
+			'delay' => 1000,
+		]);
+
+		$request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
+		$response = $request->get('bogus');
+
+		$this->assertEquals("2.0", $response->getProtocolVersion());
+		$this->assertEquals(234, $response->getStatusCode());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testPostFormEncoded()
+	{
+		$params = [
+			'foo' => 'bar',
+			'baz' => ['hi', 'there']
+		];
+		$response = $this->request->request('POST', '/post', [
+			'form_params' => $params
+		]);
+
+		$this->assertEquals('post', $this->request->getMethod());
+
+		$options = $this->request->curl_options;
+
+		$expected = http_build_query($params);
+		$this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+		$this->assertEquals($expected, $options[CURLOPT_POSTFIELDS]);
+	}
+
+	public function testPostFormMultipart()
+	{
+		$params = [
+			'foo' => 'bar',
+			'baz' => ['hi', 'there'],
+			'afile' => new \CURLFile(__FILE__)
+		];
+		$response = $this->request->request('POST', '/post', [
+			'multipart' => $params
+		]);
+
+		$this->assertEquals('post', $this->request->getMethod());
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+		$this->assertEquals($params, $options[CURLOPT_POSTFIELDS]);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testJSONData()
+	{
+		$params = [
+			'foo' => 'bar',
+			'baz' => ['hi', 'there']
+		];
+		$response = $this->request->request('POST', '/post', [
+			'json' => $params
+		]);
+
+		$this->assertEquals('post', $this->request->getMethod());
+
+		$expected = json_encode($params);
+		$this->assertEquals($expected, $this->request->getBody());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testHTTPv1()
+	{
+		$response = $this->request->request('POST', '/post', [
+			'version' => 1.0
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+		$this->assertEquals(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
+	}
+
+	public function testHTTPv11()
+	{
+		$response = $this->request->request('POST', '/post', [
+			'version' => 1.1
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+		$this->assertEquals(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testCookieOption()
+	{
+		$holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';
+		$response = $this->request->request('POST', '/post', [
+			'cookie' => $holder
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options);
+		$this->assertEquals($holder, $options[CURLOPT_COOKIEJAR]);
+		$this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options);
+		$this->assertEquals($holder, $options[CURLOPT_COOKIEFILE]);
+	}
+
 }
diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
new file mode 100644
index 000000000000..70200e98613f
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -0,0 +1,47 @@
+****************
+CLIRequest Class
+****************
+
+If a request comes from a command line invocation, the request object is actually a
+``CLIRequest``. It behaves the same as a :doc:`conventional request </incoming/request>`
+but adds some accessor methods for convenience.
+
+====================
+Additional Accessors
+====================
+
+**getSegments()**
+
+Returns an array of the command line arguments deemed to be part of a path::
+
+    // command line: php index.php users 21 profile -foo bar
+    echo $request->getSegments();  // ['users', '21', 'profile']
+
+**getPath()**
+
+Returns the reconstructed path as a string::
+
+    // command line: php index.php users 21 profile -foo bar
+    echo $request->getPath();  // users/21/profile
+
+**getOptions()**
+
+Returns an array of the command line arguments deemed to be options::
+
+    // command line: php index.php users 21 profile -foo bar
+    echo $request->getOptions();  // ['foo' => 'bar']
+
+**getOption($which)**
+
+Returns the value of a specific command line argument deemed to be an option::
+
+    // command line: php index.php users 21 profile -foo bar
+    echo $request->getOption('foo');  // bar
+    echo $request->getOption('notthere'); // NULL
+
+**getOptionString()**
+
+Returns the reconstructed command line string for the options::
+
+    // command line: php index.php users 21 profile -foo bar
+    echo $request->getOptionPath();  // -foo bar
diff --git a/user_guide_src/source/cli/index.rst b/user_guide_src/source/cli/index.rst
index c702405e9586..8922826e51d8 100644
--- a/user_guide_src/source/cli/index.rst
+++ b/user_guide_src/source/cli/index.rst
@@ -10,3 +10,4 @@ CodeIgniter 4 can also be used with command line programs.
     cli
     cli_commands
     cli_library
+    cli_request
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index ab621542984c..0a9fa1e8af29 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -234,6 +234,15 @@ You can pass 0 to wait indefinitely::
 
 	$response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
 
+cookie
+======
+
+This specifies the filename that CURL should use to read cookie values from, and
+to save cookie values to. This is done using the CURL_COOKIEJAR and CURL_COOKIEFILE options.
+An example::
+
+	$response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
+
 debug
 =====
 
@@ -326,7 +335,7 @@ has been disabled. Any files that you want to send must be passed as instances o
 
 	$post_data = [
 		'foo'      => 'bar',
-		'userfile' => new CURLFile('/path/to/file.txt')
+		'userfile' => new \CURLFile('/path/to/file.txt')
 	];
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use