mirror of
https://github.com/php/php-src.git
synced 2024-09-21 09:57:23 +00:00
Fix #79561: dns_get_record() fails with DNS_ALL
Since Windows has its own definitions of the `PHP_DNS_*` macros, we have to use these when registering the PHP constants.
This commit is contained in:
parent
7c1316ec6a
commit
c40a494406
3
NEWS
3
NEWS
@ -10,6 +10,9 @@ PHP NEWS
|
|||||||
. Fixed bug #79528 (Different object of the same xml between 7.4.5 and
|
. Fixed bug #79528 (Different object of the same xml between 7.4.5 and
|
||||||
7.4.4). (cmb)
|
7.4.4). (cmb)
|
||||||
|
|
||||||
|
- Standard:
|
||||||
|
. Fixed bug #79561 (dns_get_record() fails with DNS_ALL). (cmb)
|
||||||
|
|
||||||
30 Apr 2020, PHP 7.3.18RC1
|
30 Apr 2020, PHP 7.3.18RC1
|
||||||
|
|
||||||
- Core:
|
- Core:
|
||||||
|
@ -1124,7 +1124,7 @@ PHP_FUNCTION(dns_get_mx)
|
|||||||
#endif /* HAVE_FULL_DNS_FUNCS */
|
#endif /* HAVE_FULL_DNS_FUNCS */
|
||||||
#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */
|
#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */
|
||||||
|
|
||||||
#if HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32)
|
#if HAVE_FULL_DNS_FUNCS && !defined(PHP_WIN32)
|
||||||
PHP_MINIT_FUNCTION(dns) {
|
PHP_MINIT_FUNCTION(dns) {
|
||||||
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
|
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
|
||||||
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);
|
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);
|
||||||
|
@ -501,3 +501,21 @@ PHP_FUNCTION(dns_get_record)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
PHP_MINIT_FUNCTION(dns) {
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_CNAME", PHP_DNS_CNAME, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_SOA", PHP_DNS_SOA, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_PTR", PHP_DNS_PTR, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_HINFO", PHP_DNS_HINFO, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_MX", PHP_DNS_MX, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_TXT", PHP_DNS_TXT, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_SRV", PHP_DNS_SRV, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_NAPTR", PHP_DNS_NAPTR, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_AAAA", PHP_DNS_AAAA, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_A6", PHP_DNS_A6, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_ANY", PHP_DNS_ANY, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("DNS_ALL", PHP_DNS_ALL, CONST_CS | CONST_PERSISTENT);
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user