Jordi Boggiano
d3f1c664d4
Avoid formatting output from external processes, fixes #8524
2020-01-13 13:30:46 +01:00
Ondrej Mirtes
7d4d4622ab
ProcessExecutor - do not format output from executed processes
2020-01-13 13:20:04 +01:00
johnstevenson
00da9b125d
Tidy and fix tests
2019-11-30 15:45:54 +00:00
johnstevenson
74ba9decdf
Rewrite NoProxyPattern to include IPv6
...
This includes two breaking changes:
- the hostname is not resolved in the case of an IP address.
- a hostname with a trailing period (FQDN) is not matched.
This brings the basic implementation in line with curl behaviour, with
the addition of full IP address and range matching (curl does not
differentiate between IP addresses host names).
The NO_PROXY environment variable can be set to either a comma-separated
list of host names that should not use a proxy, or single asterisk `*`
to match all hosts.
- Port numbers can be included by prefixing the port with a colon `:`.
- IP addresses can be used, but must be enclosed in square brackets
`[...]` if they include a port number.
- IP address ranges can specified in CIDR notation, separating the IP
address and prefix-length with a forward slash `/`.
2019-11-29 20:39:08 +00:00
Jordi Boggiano
88b051c96b
Merge branch 'master' into 2.0
...
Update deps
2019-11-23 12:27:41 +01:00
Stephan Vock
b847115617
Git: fix authentication handling for private GitHub repositories
2019-11-23 12:02:06 +01:00
Jordi Boggiano
bc2a1d762a
Merge branch 'master' into 2.0
2019-10-30 08:54:44 +01:00
johnstevenson
8d9b822413
Add messages to junction tests to see failures
2019-10-21 11:09:17 +02:00
Jordi Boggiano
6c4357a7ed
Merge branch 'master' into 2.0
2019-07-31 17:50:01 +02:00
Jordi Boggiano
26a3e12c96
Merge pull request #7994 from aschempp/feature/zip-util
...
Extract the ZIP utility functions from ArtifactRepository
2019-07-30 11:36:10 +02:00
Gabriel Caruso
6c8ddd4d57
Remove unused private properties
2019-07-24 02:53:53 +02:00
Nils Adermann
d2fa1e1319
Merge branch 'master' into 2.0
...
* master: (48 commits)
SVN: hide passwords for debug output
Free $solver asap
fixes #8179
[minor] Fixed a typo in the CHANGELOG.md.
Update deps
Update changelog
Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET" Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"
Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151
Fix display of HHVM warning appearing when HHVM is not in use, fixes #8138
Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes #8155
Use possessive quantifiers
Update xdebug-handler to 1.3.3
fixes #8159
Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
flag should come before script name
use full command name, not abbreviated/alias
modify text
Document the alternatives to disable the default script timeout
Anchor pattern
Fix URL resolution for Composer repositories
...
2019-06-27 14:08:00 +02:00
Stephan Vock
8da046e4e9
SVN: hide passwords for debug output
2019-06-23 18:59:36 +01:00
Andreas Schempp
0e2215dc6c
Added full unit test coverage
2019-03-04 11:08:59 +01:00
Jordi Boggiano
64384f8b15
Fix tests
2019-01-14 17:29:24 +01:00
Jordi Boggiano
fd11cf3618
Port/extract most behavior of RemoteFilesystem to CurlDownloader
2019-01-14 17:29:23 +01:00
Jordi Boggiano
1cd9f4f9db
Disable request_fulluri by default for HTTPS connections
2019-01-14 17:29:23 +01:00
Jordi Boggiano
713bc4de1d
Minor fixes and updated the rest of the code/tests to use HttpDownloader
2019-01-14 17:29:23 +01:00
Gabriel Caruso
2a13bb2649
Fixes from PHPStan ( #7687 )
...
* fix docblocks
* remove redundant conditional
* fix wrong variable name
* fix wrong namespaces
* add missing private members
* remove unused/redundant arguments
* move testcase class
* exclude TestCase.php
* Tweak RuleWatchGraph type hints
* Tweak doc comment
2018-11-12 15:23:32 +01:00
Jordi Boggiano
bf125295df
Fix escaping of URLs in Perforce and Subversion drivers
2018-08-25 18:48:56 +02:00
Jordi Boggiano
ff59bbdab0
CS fixer
2018-07-24 14:32:52 +02:00
Jordi Boggiano
38866ba310
Merge remote-tracking branch 'johnstevenson/external-xdebug'
2018-04-13 15:38:27 +02:00
Jordi Boggiano
bfa01285c2
Merge branch '1.6'
2018-04-12 10:25:03 +02:00
Jordi Boggiano
066351c5b9
Remove use of deprecated getMock method
2018-04-12 10:24:56 +02:00
johnstevenson
ed97c2116c
Use external XdebugHandler library
2018-03-08 19:20:16 +00:00
Jordi Boggiano
ea9b7ecbb0
Merge pull request #6982 from carusogabriel/phpstan
...
Fixes from PHPStan level 0
2018-01-22 14:50:43 +01:00
Martin Hujer
bbee0d7c6c
Validation warns if script description for nonexistent script is present
...
Fixes #7010
2018-01-17 19:15:06 +01:00
Gabriel Caruso
3d262bd637
Fixes from PHPStan level 0
...
More fixes from PHPStan level 0
2018-01-14 11:44:15 -02:00
Tomas Klinkenberg
60106edd32
Added a test to confirm issue #6994 .
...
Added a encapsulated group to the replacement parameter of the `preg_replace` for GitLab in `\Composer\Util\Url::updateDistReference()`. This fixes #6994 .
2018-01-09 17:57:22 +01:00
Jordi Boggiano
e6114b2ca7
Fix support for replacing dist refs in gitlab URLs and add support for gitlab/github enterprise too
2018-01-05 15:20:30 +01:00
Jordi Boggiano
c8aea719b1
CS fixes
2017-12-18 16:02:48 +01:00
Gabriel Caruso
885da4c8ef
Refactoring tests
2017-12-03 02:41:58 -02:00
Gabriel Caruso
afc9a7643e
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
2017-11-30 13:44:43 -02:00
Gabriel Caruso
a4b220273e
Refactoring Tests ( #6849 )
2017-11-30 15:58:10 +01:00
Jordi Boggiano
eab826b00b
Merge branch '1.5'
2017-11-29 16:37:49 +01:00
Jordi Boggiano
45cd26b2df
Fix test and actually check that we get hasAuthentication called for different domains
2017-11-29 16:37:00 +01:00
Jordi Boggiano
0b3bc4ccb9
Merge branch '1.5'
2017-11-28 18:09:36 +01:00
johnstevenson
b0922b95af
Report multiple inis in php.ini specific messages
...
Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
2017-11-28 18:09:08 +01:00
croensch
6da92e98ac
also support NO_PROXY
...
since WINDOWS can only have one case and that is usually upperase
2017-10-12 16:35:05 +02:00
Vladimir Reznichenko
c8615358cb
SCA with PHP Inspections (EA Extended)
2017-09-11 19:40:43 +02:00
Christian Ramelow
f178c340e9
Fixed tests.
2017-09-01 20:47:13 +02:00
Christian Ramelow
39d8104897
Introduces a new method `copy()`.
...
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
2017-08-31 20:19:43 +02:00
Martin Hasoň
88ec172bd8
Fix CS
2017-05-19 15:14:47 +02:00
Jordi Boggiano
122e422682
CS fixes
2017-03-08 15:16:44 +01:00
Stefan Grootscholten
512750a20e
Add more tests to cover the new functionality.
2017-01-22 14:35:37 +01:00
Stefan Grootscholten
a4af559ca8
Store access-token for re-use
...
Store the Bitbucket access-token (and the expiration time) so it can be re-used within the time it is valid.
The Bitbucket::requestToken and Bitbucket::getToken now only return the access-token and not all other parameters it receives from the Bitbucket API.
2017-01-22 14:35:37 +01:00
Jordi Boggiano
e9d04f2b2d
Merge branch '1.2'
2016-12-06 17:04:39 +01:00
Dries Vints
2ab7df5566
Do not add newlines to output
2016-12-06 16:53:46 +01:00
johnstevenson
379fb70ad9
Use random name for tmp ini and delete after use
...
Thanks to Patrick Rose for reporting this issue.
2016-11-20 10:59:05 +00:00
Jordi Boggiano
43903a3979
Merge branch '1.2'
2016-11-06 17:38:53 +01:00
Fabien Potencier
103624d4ed
Remove usage of echo when executing Composer script
2016-11-05 22:10:39 -07:00
Jordi Boggiano
183398fe5e
Merge pull request #5717 from berlinger-rarents/fix/5584_anon_redirect_bitbucket
...
prevent (prompt for) bitbucket auth when it redirected
2016-10-10 14:11:24 +02:00
Roel Arents
d338a95174
use seldaek's bitbucket repo for unit tests instead of 3rd party
2016-09-29 17:29:09 +02:00
berlinger-rarents
8845ea467a
try bitbucket downloads first time without auth
...
also add tests for #5584
2016-09-28 19:08:24 +02:00
Rob Bast
b4fd19aae4
add test exposing the problem
2016-09-27 14:45:19 +02:00
Jordi Boggiano
ff7daf0bd4
Fix handling of paths on windows when cwd is root of drive, fixes #5554
2016-09-12 16:56:04 +02:00
Stefan Grootscholten
9b00713a67
Update unit test for Bitbucket util
2016-07-02 17:03:01 +02:00
Jordi Boggiano
39c2c8c30a
Add test for password escaping
2016-06-21 11:01:09 +01:00
Stefan Grootscholten
2d52531365
Add unit tests for the Bitbucket class.
2016-06-11 17:33:58 +02:00
Jordi Boggiano
73d9a4717d
Update list of ciphers /cc @cs278
2016-06-11 11:19:58 +01:00
Hiraku NAKANO
8501bb71e2
Drop dependency on http://www.example.com
2016-05-08 17:36:10 +01:00
Jordi Boggiano
d8c94c2640
Merge remote-tracking branch 'curry684/home-expansion'
2016-04-22 20:37:05 +01:00
Niels Keurentjes
c9534d48c1
Made env variable parsing in path replacements generic across platforms and replaced old config.php implementation.
2016-04-13 02:02:50 +02:00
Niels Keurentjes
f5422a441d
Fixed Windows path separators and updated docs.
2016-04-12 23:51:28 +02:00
Niels Keurentjes
7e71b2bfbc
Added support for expanding environment variables in paths, and tilde expansion on Windows.
2016-04-12 23:07:58 +02:00
Jordi Boggiano
4f0f8779cb
Add filesystem tests for the static shortest path, refs #5174
2016-04-11 19:36:39 +01:00
Paul Wenke
9059d70ba0
Corrected username / access token parameters for $this->io->setAuthentication when read from git config. Grant type is now only set when requesting an access token. Removed bitbucket-domains and bitbucket-protocols from config. Fixed bitbucket typo in JsonConfigSource. Removed unecessary comments. Changed visibility of Composer/Util/Bitbucket properties to private. Added https to bitbucket url. Removed unused $note variable.
2016-03-20 15:56:58 -04:00
Paul.Wenke
b4d9d0fd0d
Added BitbucketTest class. Added is_array and is_object check to http content before calling http_build_query.
2016-03-13 21:33:13 -04:00
Rob Bast
a245c4618b
php-cs-fixer
2016-02-25 11:04:44 +01:00
Rob Bast
dc2f201152
add trailing / and updated diagnose command
2016-02-24 20:54:01 +01:00
Rob Bast
4d975c49aa
fix mocks
2016-02-24 20:30:10 +01:00
Niels Keurentjes
582e4796a3
Merge branch 'master' of https://github.com/composer/composer into pull-4690
2016-02-05 11:24:30 +01:00
Niels Keurentjes
0dab63e050
Unified all Windows tests throughout the code.
2016-02-03 22:39:16 +01:00
Niels Keurentjes
f2a2b18367
Added Platform utility and unit test for it.
2016-02-03 22:25:43 +01:00
Niels Keurentjes
b71c67239d
Made NTFS junction detection more reliable and added unit tests for the junction functions.
2016-02-02 23:44:01 +01:00
Jordi Boggiano
1818b95149
CS fixes
2016-01-26 13:07:18 +00:00
Jordi Boggiano
783e0aec8a
Merge remote-tracking branch 'alcohol/unique-test-directories'
2016-01-26 12:35:29 +00:00
Rob Bast
adf3b956d0
try to use unique test directories
...
any tests that use the filesystem should have their own unique directory, as we run our test suite in parallel and
cleanup of tests (removing directories) should not interfere with currently running tests
2016-01-26 09:41:21 +01:00
Niels Keurentjes
2c3e7cf5f2
Unit tests fail in a nasty way if ErrorHandler test is run before the Silencer and it's not silencing itself.
2016-01-25 23:51:11 +01:00
Niels Keurentjes
76c1645a0e
Merge remote-tracking branch 'upstream/master' into issue-4203
2016-01-25 23:38:13 +01:00
Niels Keurentjes
18cd4f966b
Added silencer utility to more gracefully handle error suppression without hiding errors or worse. Fixes #4203 , #4683
2016-01-25 23:37:54 +01:00
Chris Smith
304c268c3b
Tidy up and general improvement of sAN handling code
...
* Move OpenSSL functions into a new TlsHelper class
* Add error when sAN certificate cannot be verified due to
CVE-2013-6420
* Throw exception if PHP >= 5.6 manages to use fallback code
* Add support for wildcards in CN/sAN
* Add tests for cert name validation
* Check for backported security fix for CVE-2013-6420 using
testcase from PHP tests.
* Whitelist some disto PHP versions that have the CVE-2013-6420
fix backported.
2016-01-24 19:02:50 +00:00
Jordi Boggiano
fb848d2e07
Code cleanups
2016-01-16 16:50:28 +00:00
Jordi Boggiano
5d015defb8
Merge remote-tracking branch 'origin/master' into tls-config
2016-01-10 16:10:22 +00:00
Alexander Loutsenko
fa5de786ff
clean garbage dirs in tmp after composer tests #4694
2015-12-14 17:52:37 +03:00
Jordi Boggiano
fbab2bfa17
Move user agent definition to StreamContextFactory so it is available in all contexts
2015-11-23 15:12:33 +00:00
Jordi Boggiano
020c126c27
Fix CS
2015-11-21 21:51:43 +00:00
Jérôme Tamarelle
4255db9e31
Allows SSH urls for gitlab and detect the scheme
...
SSH urls uses HTTPS to request the API
2015-11-14 16:05:05 +01:00
Jérôme Tamarelle
ac68a721f4
Merge remote-tracking branch 'composer/master' into gitlab
...
Conflicts:
doc/04-schema.md
src/Composer/Util/RemoteFilesystem.php
2015-11-14 14:13:39 +01:00
Jerome TAMARELLE
6ccc562c0f
Add tests on GitLab class (copied from GitHubTest)
2015-11-13 18:50:50 +01:00
Jeroen Seegers
279b5f0156
Drop irrelevant properties from composer_commit-ref.json
2015-10-27 14:20:45 +01:00
Jeroen Seegers
f3dc31839f
Refactor commit-ref validation
...
The require and require-dev arrays have been merged into one and no
longer user private methods/properties to collect warnings.
2015-10-27 13:59:29 +01:00
Jeroen Seegers
476c6f279b
Add fixture for composer.json with commit-ref
2015-10-27 13:50:41 +01:00
Jeroen Seegers
73e73c90fb
Generate a warning when a commit reference is used
...
Closes #4485
2015-10-23 21:38:11 +02:00
Rob Bast
b523fc0b7b
ran fixers
2015-10-13 11:35:51 +02:00
Jordi Boggiano
ce08582671
Fix CS
2015-09-28 10:53:24 +01:00
Jordi Boggiano
06feb19b2c
Merge pull request #4169 from remicollet/patch-1
...
Set this test as slow
2015-08-02 12:10:47 +01:00
Rob Bast
5ae9e7fe22
remove spdx files, introduce external library
2015-07-16 11:42:12 +02:00
Rob Bast
4019f7bb44
Revert "apply a regex solution instead of tokenizer"
...
This reverts commit 33a7305e22c8d4e2ce38586855fd3d4b7b2af3dd.
2015-07-03 12:22:16 +02:00
Rob Bast
b5d286e27b
apply a regex solution instead of tokenizer
2015-07-03 12:22:16 +02:00
Rob Bast
e4118385a0
updated spdx related files
2015-07-03 12:22:16 +02:00
Jordi Boggiano
6a64041055
CS fixes
2015-06-30 15:38:32 +01:00
Remi Collet
c350bceeea
Set this test as slow
2015-06-21 07:46:08 +02:00
gmsantosxl
84c9c30b63
Remove extra '/' when findShortestPath $from is a directory
2015-06-03 16:48:01 -03:00
Jordi Boggiano
52d290f5f2
trim token just in case and update tests
2015-05-07 00:37:08 +01:00
Possum
29ca21f30e
PHP version checks tweaking
2015-05-05 20:18:24 +02:00
Adrian Dragus
7834dacb88
Forgot to remove the actual calls
2015-04-21 01:26:09 +01:00
Adrian Dragus
96ff1c5014
Use PHPUnit pre-conditions
...
See https://phpunit.de/manual/current/en/incomplete-and-skipped-tests.html#incomplete-and-skipped-tests.requires.tables.api
2015-04-21 01:15:28 +01:00
Jordi Boggiano
46924cf5f5
Merge pull request #3854 from hakre/fix/symlink-missing
...
Prevent fatal error on missing symlink() function in tests
2015-04-15 02:43:13 +01:00
jakoch
74a077dd3d
updated spdx-license handling to include metadata
...
issue https://github.com/composer/composer/issues/3744
summary of changes
- replaced bin script "fetch-spdx-identifiers" by "update-spdx-licenses"
- "update-spdx-licenses" uses "Composer/Util/SpdxLicensesUpdater" to update "spdx-licenses.json" file with license identifier, fullname and osi-approved-status
- dropped "spdx-identifiers.json" (identifiers only)
- dropped "SpdxLicenseIdentifier", it's just "SpdxLicense" now
- modified "ShowCommand" to output the license with metadata and removed some unused method arguments (cleanup)
2015-03-29 22:46:38 +02:00
hakre
03b634d114
Prevent fatal error on missing symlink() function in tests
...
The testsuite didn't run through for me because the php symlink() function
was missing.
It is only available on Windows Visa/Server 2008 or higher.
This commit fixes the issue by checking if the method exists, and if not,
marks the test as skipped because of a non-matching precondition.
2015-03-19 14:42:13 +01:00
Rob Bast
3d329622d7
overwrite -> overwriteError
2015-02-25 11:00:35 +01:00
Rob Bast
cb336a5416
Implement writeError throughout Composer
2015-02-25 11:00:35 +01:00
Jordi Boggiano
0b4a9235f4
CS fixes
2015-02-24 14:22:54 +00:00
Rob Bast
a34335a9bb
github deprecation changes
...
- added some tests
- minor bug fixes discovered during testing
- resolved two deprecations (rate limit api and authorizations api)
- added some more comments to make the flow more understandable
2015-02-11 10:18:47 +01:00
Padraic Brady
19e24c5804
Merge branch 'master' into tls-config
...
Conflicts:
.travis.yml
doc/03-cli.md
src/Composer/Command/ConfigCommand.php
src/Composer/Command/CreateProjectCommand.php
src/Composer/Command/DiagnoseCommand.php
src/Composer/Command/InstallCommand.php
src/Composer/Command/RequireCommand.php
src/Composer/Command/SelfUpdateCommand.php
src/Composer/Command/ShowCommand.php
src/Composer/Command/UpdateCommand.php
src/Composer/Config.php
src/Composer/Downloader/FileDownloader.php
src/Composer/Factory.php
src/Composer/Repository/ComposerRepository.php
src/Composer/Repository/PearRepository.php
src/Composer/Repository/Vcs/VcsDriver.php
src/Composer/Util/GitHub.php
src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
Jordi Boggiano
da881c118b
Fix failures
2014-12-12 13:15:34 +00:00
Jordi Boggiano
8dad846613
Add SNI settings for SSL URLs that are proxied, fixes #3204
2014-12-12 12:25:21 +00:00
Jordi Boggiano
7b13507dd4
Fix typo in test
2014-12-11 21:52:29 +00:00
Jordi Boggiano
4a6503fe36
Add suppor for https_proxy, fixes #3204
2014-12-11 17:42:55 +00:00
Jordi Boggiano
94926218e8
CS fixes
2014-10-17 18:57:27 +01:00
Jordi Boggiano
6e4a21d700
Merge remote-tracking branch 'hakre/patch-2'
2014-10-07 14:10:29 +01:00
Jordi Boggiano
923191a489
Merge remote-tracking branch 'hakre/patch-1'
2014-10-07 13:45:32 +01:00
Bastian Hofmann
204fc207fa
Moved config option to not save subversion credentials to repository configuration, added documentation.
2014-09-16 15:16:55 +02:00
Bastian Hofmann
0d0ed59e5c
Codestyle fix
2014-09-15 13:21:33 +02:00
Bastian Hofmann
b132e4eae0
Added cacheCredentials config flag for saved SVN credentials to control the --no-auth-cache flag
...
Example config:
{
"http-basic": {
"svn.example.com": {
"username": "user",
"password": "password",
"cacheCredentials": false
}
}
}
2014-09-11 11:48:24 +02:00
hakre
343d0b5af2
added test removing directory with trailing slash that is symlinked
...
#3144
#3157
2014-07-28 23:49:44 +02:00
hakre
ed507dec9f
added test unlinking directory
...
#3157
2014-07-28 23:36:04 +02:00
Jordi Boggiano
ac497feaba
CS fixes
2014-06-10 16:13:12 +02:00
Jordi Boggiano
08e34858d6
Fix code to use hostname only, refs #3026
2014-06-05 11:14:29 +02:00
Benjamin Grandfond
a21b0f82db
Allow SVN to connect with credentials provided with the auth.json file
2014-05-30 17:14:43 +02:00
Jordi Boggiano
b437c1cc05
Support github auth directly in the RemoteFilesystem class
2014-04-11 14:29:17 +02:00
Clark Stuth
a12c4e2a17
Removed getWindowsFlag and setWindowsFlag methods from Perforce object.
2014-03-25 08:30:44 -05:00
Clark Stuth
2651cbc5fe
Fixing perforce dev-master stored reference bug.
2014-03-21 13:51:18 -05:00
Clark Stuth
8fc1961463
Fixing delete client workspace bug.
2014-03-21 13:51:18 -05:00
Clark Stuth
c11105dd60
Fixing bug not cleaning up workspaces.
2014-03-21 13:51:18 -05:00
Clark Stuth
24dd42267f
almost all unit tests passing after IOInterface dependency refactor. no longer passing IOInterface into any Perforce methods
2014-03-21 13:51:18 -05:00
Clark Stuth
0f7b078d6c
added new dependency to Perforce object, updating some tests.
2014-03-21 13:51:18 -05:00
Pádraic Brady
bf01a55e53
Patch RFS test to set private fileUrl property and pass
2014-02-28 18:46:49 +00:00
Pádraic Brady
81b86acc53
Merge branch 'master' of github.com:composer/composer into tls-config
...
Conflicts:
src/Composer/Util/RemoteFilesystem.php
2014-02-27 17:56:32 +00:00
Jordi Boggiano
5067d76dbc
Adjust test suite
2014-02-26 16:01:31 +01:00
Pádraic Brady
2648064e5a
Some typos/corrections
2014-02-23 14:15:24 +00:00
Pádraic Brady
1e1e713329
Added test for RemoteFilesystem TLS options setup
2014-02-23 13:33:29 +00:00
ptarjan
09c0d971d3
don't require the error message have the first line of HTTP output in it
2013-11-19 14:35:24 -08:00
Jordi Boggiano
e2671b6510
Add test and fix patch for #2304 , refs #2341
2013-10-19 13:38:30 +02:00
Jordi Boggiano
08243ce2e3
Fix handling of urlencoded user and password in proxy urls, fixes #2339
2013-10-18 11:35:57 +02:00
Jordi Boggiano
f8be812a49
Merge remote-tracking branch 'origin/master'
2013-10-16 10:57:18 +02:00
Nils Adermann
565f86f30d
Fix stream context option test to really only verify content-type is last
2013-10-14 17:53:02 -07:00
Nils Adermann
42dd2f2ee8
Check only part of the error message as it's different in hhvm
2013-10-14 15:57:19 -07:00
Fabian Grutschus
20854a50b4
Removed unnecessary test and just check for return code
2013-10-14 18:04:09 +02:00