Fix wrong file handler for response write #1049
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
…en switching between PIPE_WAIT and PIPE_NO_WAIT. Indicate logged values are hex not decimal.
…c prefix, but do report the full path to logs.
derickr
reviewed
Dec 1, 2025
src/base/ctrl_socket.c
Outdated
| SetNamedPipeHandleState(XG_BASE(control_socket_h), &lpMode, NULL, NULL); | ||
| lpMode = PIPE_TYPE_BYTE | PIPE_WAIT; | ||
| if (!SetNamedPipeHandleState(XG_BASE(control_socket_h), &lpMode, NULL, NULL)) { | ||
| xdebug_log_ex(XLOG_CHAN_CONFIG, XLOG_WARN, "CTRL-RECV", "Can't set NP handle state to 0x%x: 0x%x", lpMode, GetLastError()); |
Contributor
There was a problem hiding this comment.
Why is this a warning, and not an error?
Contributor
Author
There was a problem hiding this comment.
Same as below. Changed.
src/base/ctrl_socket.c
Outdated
| SetNamedPipeHandleState(XG_BASE(control_socket_h), &lpMode, NULL, NULL); | ||
| lpMode = PIPE_TYPE_BYTE | PIPE_NOWAIT; | ||
| if (!SetNamedPipeHandleState(XG_BASE(control_socket_h), &lpMode, NULL, NULL)) { | ||
| xdebug_log_ex(XLOG_CHAN_CONFIG, XLOG_WARN, "CTRL-RECV", "Can't (post)set NP handle state to 0x%x: 0x%x", lpMode, GetLastError()); |
Contributor
There was a problem hiding this comment.
Ditto: Why is this a warning, and not an error?
Contributor
Author
There was a problem hiding this comment.
This should never happen, and if it does, things might still work. But I changed to XLOG_ERR.
src/base/ctrl_socket.c
Outdated
| } | ||
|
|
||
| xdebug_log_ex(XLOG_CHAN_CONFIG, XLOG_INFO, "CTRL-OK", "Control socket set up successfully: '%s'", XG_BASE(control_socket_path)); | ||
| xdebug_log_ex(XLOG_CHAN_CONFIG, XLOG_INFO, "CTRL-OK", "Control socket set up successfully: '\\\\.\\pipe\\%s'", XG_BASE(control_socket_path)); |
Contributor
There was a problem hiding this comment.
If you xdfree(name) after this, you don't have to re-introduce the \\\\.\\pipe\\ part, and you can just use name instead. But you also will have to free it before the return; in line 495/504.
Contributor
Author
There was a problem hiding this comment.
Your code, your preferences. Changed.
derickr
added a commit
that referenced
this pull request
Dec 1, 2025
* pr/1049: Reorder xdfree(name) and removing trailing whitespace Tweak comments to use /* .. */ style Reuse created \\.\pipe name Change log level for failing SetNamedPipeHandleState Store the control_socket_path internally without the platform specific prefix, but do report the full path to logs. Fix wrong usage of SetNamedPipeHandleState and log possible errors when switching between PIPE_WAIT and PIPE_NO_WAIT. Indicate logged values are hex not decimal. Fix wrong file handler for response write
Contributor
|
I've merged this after a rebase and a few tweaks (I prefer use the Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.