Skip to content

ext/sockets: socket_shutdown() having proper constants for mode. #18648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ext/sockets: socket_shutdown() having proper constants for mode. #18648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ext/sockets/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2434,6 +2434,11 @@ PHP_FUNCTION(socket_shutdown)
php_sock = Z_SOCKET_P(arg1);
ENSURE_SOCKET_VALID(php_sock);

if (how_shutdown < SHUT_RD || how_shutdown > SHUT_RDWR) {
zend_argument_value_error(2, "must be one of SHUT_RD, SHUT_WR or SHUT_RDWR");
RETURN_THROWS();
}
Comment on lines +2437 to +2440
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess those are guaranteed to be sequential by POSIX?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes


if (shutdown(php_sock->bsd_socket, how_shutdown) != 0) {
PHP_SOCKET_ERROR(php_sock, "Unable to shutdown socket", errno);
RETURN_FALSE;
Expand Down
19 changes: 19 additions & 0 deletions ext/sockets/sockets.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,6 +2030,25 @@
const UDP_SEGMENT = UNKNOWN;
#endif

#ifdef SHUT_RDWR
/**
* @var int
* @cvalue SHUT_RD
*/
const SHUT_RD = UNKNOWN;
/**
/**
* @var int
* @cvalue SHUT_WR
*/
const SHUT_WR = UNKNOWN;
/**
* @var int
* @cvalue SHUT_RDWR
*/
const SHUT_RDWR = UNKNOWN;
#endif

/**
* @strict-properties
* @not-serializable
Expand Down
11 changes: 10 additions & 1 deletion ext/sockets/sockets_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions ext/sockets/tests/socket_shutdown.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,29 @@ $port = 80;

$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
$socketConn = socket_connect($socket, $host, $port);
var_dump(socket_shutdown($socket,0));
var_dump(socket_shutdown($socket,SHUT_RD));
socket_close($socket);

$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
$socketConn = socket_connect($socket, $host, $port);
var_dump(socket_shutdown($socket,1));
var_dump(socket_shutdown($socket,SHUT_WR));
socket_close($socket);

$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
$socketConn = socket_connect($socket, $host, $port);
var_dump(socket_shutdown($socket,2));
var_dump(socket_shutdown($socket,SHUT_RDWR));
socket_close($socket);

$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
var_dump(socket_shutdown($socket,0));
var_dump(socket_shutdown($socket,SHUT_RD));

$socketConn = socket_connect($socket, $host, $port);
var_dump(socket_shutdown($socket,-1));

try {
socket_shutdown($socket,-1);
} catch (\ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}
socket_close($socket);
?>
--CLEAN--
Expand All @@ -54,5 +59,4 @@ bool(true)
Warning: socket_shutdown(): Unable to shutdown socket [%d]: %s in %s on line %d
bool(false)

Warning: socket_shutdown(): Unable to shutdown socket [%d]: Invalid argument in %s on line %d
bool(false)
must be one of SHUT_RD, SHUT_WR or SHUT_RDWR