diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-23 15:21:45 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-23 15:26:14 -0700 |
| commit | 1beb24bd6f5376a93c062218a73a5f1d5f04278a (patch) | |
| tree | 0ecea95641449b675d0d1a617c9de4049c7a5f84 | |
| parent | 7272e3e72232b4aa0374209b7779df440c9bdc33 (diff) | |
| parent | a0b4348abc09e00170a334c6f67ef399e8b36a1e (diff) | |
| download | php-git-1beb24bd6f5376a93c062218a73a5f1d5f04278a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Conflicts:
ext/sockets/sockets.c
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 15 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_option_bindtodevice.phpt | 40 |
3 files changed, 59 insertions, 0 deletions
@@ -16,6 +16,10 @@ PHP NEWS . Fixed Bug #65060 (imagecreatefrom... crashes with user streams). (Remi) . Fixed Bug #65084 (imagecreatefromjpeg fails with URL). (Remi) +- Sockets: + . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option). + (Damjan Cvetko) + 20 Jun 2013, PHP 5.5.0 - Core: diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 9b519b2288..10375ab850 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -679,6 +679,9 @@ static PHP_MINIT_FUNCTION(sockets) REGISTER_LONG_CONSTANT("SO_FAMILY", SO_FAMILY, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("SO_ERROR", SO_ERROR, CONST_CS | CONST_PERSISTENT); +#ifdef SO_BINDTODEVICE + REGISTER_LONG_CONSTANT("SO_BINDTODEVICE", SO_BINDTODEVICE, CONST_CS | CONST_PERSISTENT); +#endif REGISTER_LONG_CONSTANT("SOL_SOCKET", SOL_SOCKET, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("SOMAXCONN", SOMAXCONN, CONST_CS | CONST_PERSISTENT); #ifdef TCP_NODELAY @@ -2038,6 +2041,18 @@ PHP_FUNCTION(socket_set_option) #endif break; } +#ifdef SO_BINDTODEVICE + case SO_BINDTODEVICE: { + if (Z_TYPE_PP(arg4) == IS_STRING) { + opt_ptr = Z_STRVAL_PP(arg4); + optlen = Z_STRLEN_PP(arg4); + } else { + opt_ptr = ""; + optlen = 0; + } + break; + } +#endif default: default_case: diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt new file mode 100644 index 0000000000..05d718ce63 --- /dev/null +++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt @@ -0,0 +1,40 @@ +--TEST-- +Test if socket_set_option() works, option:SO_BINDTODEVICE +--DESCRIPTION-- +-Bind to loopback 'lo' device (should exist) +-Bind to unexisting device +--SKIPIF-- +<?php +if (!extension_loaded('sockets')) { + die('SKIP sockets extension not available.'); +} +if (!defined("SO_BINDTODEVICE")) { + die('SKIP SO_BINDTODEVICE not supported on this platform.'); +} +if (!function_exists("posix_getuid") || posix_getuid() != 0) { + die('SKIP SO_BINDTODEVICE requires root permissions.'); +} +?> +--FILE-- +<?php +$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); + +if (!$socket) { + die('Unable to create AF_INET socket [socket]'); +} +// wrong params +$retval_1 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "lo"); +var_dump($retval_1); +$retval_2 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "ethIDONOTEXIST"); +var_dump($retval_2); + +socket_close($socket); +?> + +--EXPECTF-- +bool(true) + +Warning: socket_set_option(): unable to set socket option [19]: No such device in %s on line %d +bool(false) +--CREDITS-- +Damjan Cvetko, foreach.org |