From: Pierre Joye <pajoye@php.net>
Date: Wed, 7 Jan 2009 01:35:36 +0000 (+0000)
Subject: - sanity check if we got an A as well (valid too but not desired)
X-Git-Tag: php-5.3.0beta1~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7063014da274af4b1cfee19615e90db1a1d9954;p=php

- sanity check if we got an A as well (valid too but not desired)
---

diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index 289f20d399..07bd362cf2 100644
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -71,6 +71,10 @@ PHP_FUNCTION(dns_get_mx) /* {{{ */
 	for (pRec = pResult; pRec; pRec = pRec->pNext) {
 		DNS_SRV_DATA *srv = &pRec->Data.Srv;
 
+		if (pRec->wType != DNS_TYPE_MX) {
+			continue;
+		}
+
 		add_next_index_string(mx_list, pRec->Data.MX.pNameExchange, 1);
 		if (weight_list) {
 			add_next_index_long(weight_list, srv->wPriority);
@@ -296,7 +300,7 @@ PHP_FUNCTION(dns_get_record)
 	int addtl_recs = 0;
 	IN_ADDR ipaddr;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz!z!", &hostname, &hostname_len, &type_param, &authns, &addtl) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lzz", &hostname, &hostname_len, &type_param, &authns, &addtl) == FAILURE) {
 		return;
 	}