X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-ares;a=blobdiff_plain;f=php_ares.c;h=2ac6c35a3a979b6fa1af5d831ba84af2f2dc2aa0;hp=680c4d9c8cf9cead446a1bb4155f7e7fc8679e48;hb=009456e5f325f392be5db8fefe7c64210f466969;hpb=9aea024d8b1de196394cf6b5dc868628d92154b4 diff --git a/php_ares.c b/php_ares.c index 680c4d9..2ac6c35 100644 --- a/php_ares.c +++ b/php_ares.c @@ -553,11 +553,11 @@ local php_ares_options *php_ares_options_ctor(php_ares_options *options, HashTab } if ((SUCCESS == zend_hash_find(ht, "udp_port", sizeof("udp_port"), (void *) &opt)) && is_numeric(opt, &lval)) { options->flags |= ARES_OPT_UDP_PORT; - options->strct.udp_port = htons((unsigned short) lval); + options->strct.udp_port = (unsigned short) lval; } if ((SUCCESS == zend_hash_find(ht, "tcp_port", sizeof("tcp_port"), (void *) &opt)) && is_numeric(opt, &lval)) { options->flags |= ARES_OPT_TCP_PORT; - options->strct.tcp_port = htons((unsigned short) lval); + options->strct.tcp_port = (unsigned short) lval; } if ((SUCCESS == zend_hash_find(ht, "servers", sizeof("servers"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_ARRAY) && (i = zend_hash_num_elements(Z_ARRVAL_PP(opt)))) { options->strct.servers = ecalloc(i, sizeof(struct in_addr)); @@ -1829,6 +1829,9 @@ static PHP_MINIT_FUNCTION(ares) REGISTER_LONG_CONSTANT("ARES_FLAG_NOSEARCH", ARES_FLAG_NOSEARCH, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ARES_FLAG_NOALIASES", ARES_FLAG_NOALIASES, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("ARES_FLAG_NOCHECKRESP", ARES_FLAG_NOCHECKRESP, CONST_PERSISTENT|CONST_CS); +#ifdef ARES_FLAG_EDNS + REGISTER_LONG_CONSTANT("ARES_FLAG_EDNS", ARES_FLAG_EDNS, CONST_PERSISTENT|CONST_CS); +#endif /* * Address Family Constants