[Process][2.3] Merge #8924 commits in 2.3 #8955

Closed
wants to merge 7 commits into
from

2 participants

@romainneutron
Symfony member
Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT

This is the merge of the commits of #8924 as requested by @fabpot

@romainneutron
Symfony member

Of course, Process test suite passes on windows ;)

@fabpot
Symfony member

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.

@fabpot
Symfony member

Nevermind, I will try to use what you've done here.

@fabpot fabpot added a commit that referenced this pull request Sep 7, 2013
@fabpot fabpot Merge branch '2.2' into 2.3 (closes #8955)
* 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
3689849
@fabpot fabpot closed this Sep 7, 2013
@hackzilla hackzilla pushed a commit that referenced this pull request Dec 10, 2014
@fabpot fabpot Merge branch '2.2' into 2.3 (closes #8955)
* 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
d9a6b4b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment