Skip to content

Fix wrong argument number in fsockopen/pfsockopen timeout error #23338

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

Open
lacatoire wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −1
Open

Fix wrong argument number in fsockopen/pfsockopen timeout error #23338

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
2 changes: 1 addition & 1 deletion ext/standard/fsock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
efree(hashkey);
}

zend_argument_value_error(6, "must be -1 or between 0 and " ZEND_ULONG_FMT, ((double) PHP_TIMEOUT_ULL_MAX / 1000000.0));
zend_argument_value_error(5, "must be -1 or between 0 and " ZEND_ULONG_FMT, ((double) PHP_TIMEOUT_ULL_MAX / 1000000.0));
RETURN_THROWS();
} else {
#ifndef PHP_WIN32
Expand Down
19 changes: 19 additions & 0 deletions ext/standard/tests/network/fsockopen_timeout_out_of_range.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
fsockopen() and pfsockopen(): ValueError for $timeout reports correct argument number and name
--FILE--
<?php
try {
fsockopen('localhost', 80, $errno, $errstr, -2.0);
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}

try {
pfsockopen('localhost', 80, $errno, $errstr, -2.0);
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECTF--
fsockopen(): Argument #5 ($timeout) must be -1 or between 0 and %s
pfsockopen(): Argument #5 ($timeout) must be -1 or between 0 and %s
Loading