[Process] Fix pipes handling #18066
[Process] Fix pipes handling #18066
Conversation
nicolas-grekas
commented
Mar 8, 2016
| Q | A |
|---|---|
| Branch | 2.7 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #18015 |
| License | MIT |
| Doc PR | - |
|
Status: needs work |
cdf46af to
dc1e6b1
Compare
|
GREEN! |
| if (is_resource($input)) { | ||
| $this->input = $input; | ||
| } elseif (is_string($input)) { | ||
| $this->inputBuffer = $input; |
There was a problem hiding this comment.
If the string already fits in memory, there is no gain in putting it in a php://temp stream
| } | ||
| // Remove extra null chars returned by fread | ||
| if ('' !== $data) { | ||
| $read[$type] = rtrim($data, "\x00"); |
There was a problem hiding this comment.
@romainneutron I can't reproduce trailing nul chars so I removed this. Can you?
There was a problem hiding this comment.
This may happen e.g. if you decrypt a string using mcrypt_decrypt.
|
Amazing work @nicolas-grekas. I almost got mad when trying to fix this build failure. The change itself looks good but I am not too familiar with how the different systems handle processes. |
| $w = array($this->pipes[0]); | ||
|
|
||
| // let's have a look if something changed in streams | ||
| if (false === $n = @stream_select($r, $w, $e, 0, 0)) { |
There was a problem hiding this comment.
no need to wait here as this is done in readAndWrite
|
Thank you @nicolas-grekas. |
This PR was merged into the 2.7 branch. Discussion ---------- [Process] Fix pipes handling | Q | A | ------------- | --- | Branch | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18015 | License | MIT | Doc PR | - Commits ------- 3ab6c39 [Process] Fix pipes handling