cvs: php4 /ext/standard basic_functions.c
| From: | Stanislav Malyshev | Date: | Tue, 15 Aug 2000 10:32:55 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1185@lists.php.net to get a copy of this message | ||
stas Tue Aug 15 03:32:55 2000 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
Fix byteorder for il2long and long2ip (#6159)
@- Fix byte order for ip2long and long2ip (Stas)
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.236 php4/ext/standard/basic_functions.c:1.237
--- php4/ext/standard/basic_functions.c:1.236 Mon Aug 14 01:37:28 2000
+++ php4/ext/standard/basic_functions.c Tue Aug 15 03:32:55 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.236 2000/08/14 08:37:28 david Exp $ */
+/* $Id: basic_functions.c,v 1.237 2000/08/15 10:32:55 stas Exp $ */
#include "php.h"
#include "php_main.h"
@@ -802,7 +802,7 @@
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 @@
}
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);
}