diff options
author | Stanislav Malyshev <stas@php.net> | 2000-08-15 10:32:55 +0000 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2000-08-15 10:32:55 +0000 |
commit | 65bb194d65f4e96e8ac4f8e644aaa6c1c5ab9a57 (patch) | |
tree | 1b36924d04ee3dae1b6f698a5e8e1b1625d74d29 | |
parent | 08c6773691845bfca2bd3cab1c5576a16257e5c5 (diff) | |
download | php-git-65bb194d65f4e96e8ac4f8e644aaa6c1c5ab9a57.tar.gz |
Fix byteorder for il2long and long2ip (#6159)
@- Fix byte order for ip2long and long2ip (Stas)
-rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f2a9697d22..84be4cae4a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -802,7 +802,7 @@ PHP_FUNCTION(ip2long) convert_to_string_ex(str); - RETURN_LONG(inet_addr((*str)->value.str.val)); + RETURN_LONG(ntohl(inet_addr((*str)->value.str.val))); } /* }}} */ @@ -818,7 +818,7 @@ PHP_FUNCTION(long2ip) } convert_to_long_ex(num); - myaddr.s_addr = (unsigned long)(*num)->value.lval; + myaddr.s_addr = htonl((unsigned long)(*num)->value.lval); RETURN_STRING (inet_ntoa(myaddr), 1); } |