zero php_ares on alloc

[m6w6/ext-ares] / php_ares.c

diff --git a/php_ares.c b/php_ares.c
index 2ac6c35a3a979b6fa1af5d831ba84af2f2dc2aa0..252c152520646e544503e1ab319ccf313d40d023 100644 (file)
--- a/php_ares.c
+++ b/php_ares.c
@@ -553,11 +553,19 @@ 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;
+#ifdef PHP_ARES_CARES
                        options->strct.udp_port = (unsigned short) lval;
+#else
+                       options->strct.udp_port = htons((unsigned short) lval);
+#endif
                }
                if ((SUCCESS == zend_hash_find(ht, "tcp_port", sizeof("tcp_port"), (void *) &opt)) && is_numeric(opt, &lval)) {
                        options->flags |= ARES_OPT_TCP_PORT;
+#ifdef PHP_ARES_CARES
                        options->strct.tcp_port = (unsigned short) lval;
+#else
+                       options->strct.tcp_port = htons((unsigned short) lval);
+#endif
                }
                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));
@@ -1097,7 +1105,7 @@ static PHP_FUNCTION(ares_init)
                RETURN_FALSE;
        }
        
-       ares = emalloc(sizeof(php_ares));
+       ares = ecalloc(1, sizeof(php_ares));
        TSRMLS_SET_CTX(ares->tsrm_ls);
        zend_llist_init(&ares->queries, sizeof(php_ares_query *), (llist_dtor_func_t) php_ares_query_llist_dtor, 0);
        php_ares_options_ctor(&ares->options, opt_array ? Z_ARRVAL_P(opt_array) : NULL);