[HttpClient] Fix Copy as curl with base uri #46665
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $url = self::mergeQueryString($trace['url'], $trace['options']['query'] ?? [], true); | ||
| $url = implode('', self::resolveUrl( | ||
| self::parseUrl($trace['url'], $trace['options']['query'] ?? []), | ||
| isset($trace['options']['base_uri']) ? self::parseUrl($trace['options']['base_uri']) : null |
There was a problem hiding this comment.
I think we should parse $debug instead because options won't always contain the base_uri, when default options are used.
There was a problem hiding this comment.
@nicolas-grekas The problem is that $debug doesn't contain information about which protocol was used in the request, we would still need to get that from $trace['uri'] or $trace['options']['base_uri'] if the former is relative. I'll look into it some more just to be sure I didn't miss anything.
There was a problem hiding this comment.
@nicolas-grekas Done
b5c272e to
84fc01e
Compare
84fc01e to
12e40a0
Compare
nicolas-grekas
approved these changes
Jun 19, 2022
|
Thank you @HypeMC. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes Copy as curl when
base_uriis used.