This repository has been archived by the owner on Dec 16, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 502
Improvements & fixes for Socket::shutdown() PR #864
Merged
sirsnyder
merged 7 commits into
krakjoe:socket_shutdown
from
pmmp:socket-shutdown-fixes
Jan 13, 2019
Merged
Improvements & fixes for Socket::shutdown() PR #864
sirsnyder
merged 7 commits into
krakjoe:socket_shutdown
from
pmmp:socket-shutdown-fixes
Jan 13, 2019
Conversation
This file contains 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
b8229a5
to
f2cc3e7
Compare
tpunt
reviewed
May 5, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other than the couple of comments I left, this looks good to me.
classes/socket.h
Outdated
@@ -414,9 +414,14 @@ PHP_METHOD(Socket, strerror) { | |||
#ifdef HAVE_SHUTDOWN | |||
/* {{{ proto bool Socket::shutdown(int how) */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This prototype becomes outdated with this change.
classes/socket.h
Outdated
} | ||
|
||
if (how_shutdown != SHUT_RD && how_shutdown != SHUT_WR && how_shutdown != SHUT_RDWR) { | ||
zend_throw_exception(spl_ce_InvalidArgumentException, "Invalid shutdown type", 0); | ||
RETURN_FALSE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since an exception is being thrown, we can change RETURN_FALSE
to simply be a return;
, since the return value won't be usable after an exception has been thrown.
updated, thanks! |
Many thanks @dktapps ! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
@sirsnyder this one's for you - some suggested alterations of my own for #845