diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php
index 22533579c..3a17960ac 100644
--- a/src/Composer/Command/DiagnoseCommand.php
+++ b/src/Composer/Command/DiagnoseCommand.php
@@ -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');
diff --git a/src/Composer/Util/StreamContextFactory.php b/src/Composer/Util/StreamContextFactory.php
index 907447067..11f3ea283 100644
--- a/src/Composer/Util/StreamContextFactory.php
+++ b/src/Composer/Util/StreamContextFactory.php
@@ -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'])) {