Merge branch 'PHP-7.4'

nikic · nikic · commit 7e8717349777 · 2020-08-10T21:53:26.000+02:00
* PHP-7.4:
  Check the correct list
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
@@ -1124,7 +1124,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
`@@ -1124,7 +1124,7 @@ PHP_FUNCTION(dns_get_mx)`
`1124`	`1124`	`}`
`1125`	`1125`	`}`
`1126`	`1126`	`php_dns_free_handle(handle);`
`1127`		`- RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(weight_list)) != 0);`
	`1127`	`+ RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(mx_list)) != 0);`
`1128`	`1128`	`}`
`1129`	`1129`	`/* }}} */`
`1130`	`1130`	`#endif /* HAVE_FULL_DNS_FUNCS */`