Merge pull request #2401 from cs278/fix-url-sanitisation

Fix URL sanitisation regexp being too greedy
2013-11-06 14:12:45 -08:00 · 2013-11-06 14:12:45 -08:00 · 65d516e427
parent d1c166eb26 d348dd44cd
commit 65d516e427
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Downloader/GitDownloader.php
+++ b/src/Composer/Downloader/GitDownloader.php
@ -384,7 +384,7 @@ class GitDownloader extends VcsDownloader

    protected function sanitizeUrl($message)
    {
-        return preg_replace('{://(.+?):.+?@}', '://$1:***@', $message);
+        return preg_replace('{://([^@]+?):.+?@}', '://$1:***@', $message);
    }

    protected function setPushUrl(PackageInterface $package, $path)