Merge branch '4.1'

* 4.1:
  fix merge

Author: nicolas-grekas

Tests/ClientTest.php

@@ -380,15 +380,13 @@ public function testSubmitForm()
             'password' => 'new password',
         ), 'PUT', array(
             'HTTP_USER_AGENT' => 'Symfony User Agent',
-            'HTTPS' => true,
         ));
 
-        $this->assertEquals('https://www.example.com/foo', $client->getRequest()->getUri(), '->submitForm() submit forms');
+        $this->assertEquals('http://www.example.com/foo', $client->getRequest()->getUri(), '->submitForm() submit forms');
         $this->assertEquals('PUT', $client->getRequest()->getMethod(), '->submitForm() allows to change the method');
         $this->assertEquals('new username', $client->getRequest()->getParameters()['username'], '->submitForm() allows to override the form values');
         $this->assertEquals('new password', $client->getRequest()->getParameters()['password'], '->submitForm() allows to override the form values');
         $this->assertEquals('Symfony User Agent', $client->getRequest()->getServer()['HTTP_USER_AGENT'], '->submitForm() allows to change the $_SERVER parameters');
-        $this->assertTrue($client->getRequest()->getServer()['HTTPS'], '->submitForm() allows to change the $_SERVER parameters');
     }
 
     public function testSubmitFormNotFound()