public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch 'request_fulluri'

pull/1828/head
Jordi Boggiano 2013-04-25 17:03:23 +02:00
parent 028d95db63 c5bf4e7812
commit aaa4571989
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Composer/Command/DiagnoseCommand.php
View File

@ -56,6 +56,8 @@ EOT
if (!empty($opts['http']['proxy'])) {
$output->write('Checking HTTP proxy: ');
$this->outputResult($output, $this->checkHttpProxy());
$output->write('Checking HTTPS proxy fullrequest_uri: ');
$this->outputResult($output, $this->checkHttpsProxyFullUriRequestParam());
}
$composer = $this->getComposer(false);
@ -139,6 +141,37 @@ EOT
return true;
}
/**
* Due to various proxy servers configurations, some servers cant handle non-standard HTTP "http_proxy_request_fulluri" parameter,
* and will return error 500/501 (as not implemented), see discussion @ https://github.com/composer/composer/pull/1825.
* This method will test, if you need to disable this parameter via setting extra environment variable in your system.
* @return bool|string
*/
private function checkHttpsProxyFullUriRequestParam()
{
$protocol = 'https';
$resultMessage = true;
/* i've found no better file to test with so far :( */
$filePath = '://api.github.com/repos/Seldaek/jsonlint/zipball/1.0.0 ';
try
{
$rfcResult = $this->rfs->getContents('api.github.com', $protocol . $filePath, false);
}
catch (TransportException $e)
{
if (!extension_loaded('openssl'))
{
return "Sorry, but you need openssl extension installed for this check - please enable/recompile\n";
}
$this->rfs->getContents('api.github.com', $protocol . $filePath, false, array('http' => array('request_fulluri' => false)));
$resultMessage = "Seems there is a problem with your proxy server, try setting value of your environment variable \"http_proxy_request_fulluri\" to false, and run diagnostics again\n";
}
return $resultMessage;
}
private function checkGithubOauth($domain, $token)
{
$this->getIO()->setAuthentication($domain, $token, 'x-oauth-basic');

7
src/Composer/Util/StreamContextFactory.php
View File

@ -64,6 +64,13 @@ final class StreamContextFactory
$options['http']['proxy'] = $proxyURL;
$options['http']['request_fulluri'] = true;
if ( strtolower( getenv('http_proxy_request_fulluri') ) == 'false' ||
strtolower( getenv('HTTP_PROXY_REQUEST_FULLURI') ) == 'false'
)
{
$options['http']['request_fulluri'] = false;
}
if (isset($proxy['user'])) {
$auth = $proxy['user'];
if (isset($proxy['pass'])) {