Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 81e31eff0bc5 · 2020-08-10T21:53:20.000+02:00
* PHP-7.3:
  Check the correct list
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
@@ -1135,7 +1135,7 @@ PHP_FUNCTION(dns_get_mx)
 		}
 	}
 	php_dns_free_handle(handle);
-	RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(weight_list)) != 0);
+	RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(mx_list)) != 0);
 }
 /* }}} */
 #endif /* HAVE_FULL_DNS_FUNCS */

Original file line number	Diff line number	Diff line change
`@@ -1135,7 +1135,7 @@ PHP_FUNCTION(dns_get_mx)`
`1135`	`1135`	`}`
`1136`	`1136`	`}`
`1137`	`1137`	`php_dns_free_handle(handle);`
`1138`		`- RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(weight_list)) != 0);`
	`1138`	`+ RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(mx_list)) != 0);`
`1139`	`1139`	`}`
`1140`	`1140`	`/* }}} */`
`1141`	`1141`	`#endif /* HAVE_FULL_DNS_FUNCS */`