diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /ext/sockets/multicast.c | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/sockets/multicast.c')
| -rw-r--r-- | ext/sockets/multicast.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index dc3151a137..ec8e16ce45 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -282,6 +282,7 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock, case IP_MULTICAST_LOOP: convert_to_boolean_ex(arg4); + ipv4_mcast_ttl_lback = (unsigned char) (Z_TYPE_PP(arg4) == IS_TRUE); goto ipv4_loop_ttl; case IP_MULTICAST_TTL: @@ -291,8 +292,8 @@ int php_do_setsockopt_ip_mcast(php_socket *php_sock, "Expected a value between 0 and 255"); return FAILURE; } -ipv4_loop_ttl: ipv4_mcast_ttl_lback = (unsigned char) Z_LVAL_PP(arg4); +ipv4_loop_ttl: opt_ptr = &ipv4_mcast_ttl_lback; optlen = sizeof(ipv4_mcast_ttl_lback); goto dosockopt; @@ -347,6 +348,7 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock, case IPV6_MULTICAST_LOOP: convert_to_boolean_ex(arg4); + ov = (int) Z_TYPE_PP(arg4) == IS_TRUE; goto ipv6_loop_hops; case IPV6_MULTICAST_HOPS: convert_to_long_ex(arg4); @@ -355,8 +357,8 @@ int php_do_setsockopt_ipv6_mcast(php_socket *php_sock, "Expected a value between -1 and 255"); return FAILURE; } -ipv6_loop_hops: ov = (int) Z_LVAL_PP(arg4); +ipv6_loop_hops: opt_ptr = &ov; optlen = sizeof(ov); goto dosockopt; |