[Process][2.3] Merge #8924 commits in 2.3 #8955
Closed
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
Conflicts: src/Symfony/Component/Process/Process.php
|
Of course, Process test suite passes on windows ;) |
This was referenced Sep 7, 2013
|
Unfortunately, that won't work as you've merged your PR instead of merging the uptodate 2.2 branch. What you need to do is to merge the Symfony 2.2 branch into the 2.3 one and resolve the conflict there. Sorry for the hassle. |
|
Nevermind, I will try to use what you've done here. |
fabpot
added a commit
that referenced
this pull request
Sep 7, 2013
* 2.2: [HttpFoundation] removed extra parenthesis [Process][2.2] Fix Process component on windows [HttpFoundation] improve perf of previous merge (refs #8882) Request->getPort() should prefer HTTP_HOST over SERVER_PORT Fixing broken http auth digest in some circumstances (php-fpm + apache). fixed typo Conflicts: src/Symfony/Component/Process/Process.php
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.
This is the merge of the commits of #8924 as requested by @fabpot