[pull] master from php:master#838
Merged
Merged
Conversation
In ASCII mode ftp_get() stripped every '\r' and emitted only a following '\n', dropping bare CR bytes not part of a CRLF sequence. Fold CRLF to LF but write a lone '\r' through unchanged, carrying a '\r' on the final byte of a read into the next read and flushing it at EOF, so the buffer boundary behaves the same as the in-buffer case. ftp_nb_get() already does this via the lastch carry in ftp_nb_continue_read().
When php_network_getaddresses() succeeds but no resolved address yields a usable peer name (for example bracketed IPv6 syntax over an IPv4-only host), netsnmp_session_init() returned without php_network_freeaddresses(), leaking the address list on every such call. Free it on that error path, matching the success path in the same function. Closes GH-22340
* PHP-8.4: Fix leak of resolved address list in netsnmp_session_init()
* PHP-8.5: Fix leak of resolved address list in netsnmp_session_init()
The Socket-object branch of from_zval_write_fd_array_aux() indexed the fd array with the 1-based loop counter (iarr[i]) instead of iarr[i - 1] like the resource branch, leaving slot 0 zeroed so a single Socket delivered fd 0 (stdin) to the receiver. Broken since the 8.0 resource-to-object conversion. Closes GH-22338
* PHP-8.4: Fix socket_sendmsg() sending wrong fd for Socket objects in SCM_RIGHTS
* PHP-8.5: Fix socket_sendmsg() sending wrong fd for Socket objects in SCM_RIGHTS
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )