Skip to content

Commit c40a494

Browse files
committed
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.
1 parent 7c1316e commit c40a494

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ PHP NEWS
1010
. Fixed bug #79528 (Different object of the same xml between 7.4.5 and
1111
7.4.4). (cmb)
1212

13+
- Standard:
14+
. Fixed bug #79561 (dns_get_record() fails with DNS_ALL). (cmb)
15+
1316
30 Apr 2020, PHP 7.3.18RC1
1417

1518
- Core:

ext/standard/dns.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ PHP_FUNCTION(dns_get_mx)
11241124
#endif /* HAVE_FULL_DNS_FUNCS */
11251125
#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */
11261126

1127-
#if HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32)
1127+
#if HAVE_FULL_DNS_FUNCS && !defined(PHP_WIN32)
11281128
PHP_MINIT_FUNCTION(dns) {
11291129
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
11301130
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);

ext/standard/dns_win32.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,3 +501,21 @@ PHP_FUNCTION(dns_get_record)
501501
}
502502
}
503503
/* }}} */
504+
505+
PHP_MINIT_FUNCTION(dns) {
506+
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
507+
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);
508+
REGISTER_LONG_CONSTANT("DNS_CNAME", PHP_DNS_CNAME, CONST_CS | CONST_PERSISTENT);
509+
REGISTER_LONG_CONSTANT("DNS_SOA", PHP_DNS_SOA, CONST_CS | CONST_PERSISTENT);
510+
REGISTER_LONG_CONSTANT("DNS_PTR", PHP_DNS_PTR, CONST_CS | CONST_PERSISTENT);
511+
REGISTER_LONG_CONSTANT("DNS_HINFO", PHP_DNS_HINFO, CONST_CS | CONST_PERSISTENT);
512+
REGISTER_LONG_CONSTANT("DNS_MX", PHP_DNS_MX, CONST_CS | CONST_PERSISTENT);
513+
REGISTER_LONG_CONSTANT("DNS_TXT", PHP_DNS_TXT, CONST_CS | CONST_PERSISTENT);
514+
REGISTER_LONG_CONSTANT("DNS_SRV", PHP_DNS_SRV, CONST_CS | CONST_PERSISTENT);
515+
REGISTER_LONG_CONSTANT("DNS_NAPTR", PHP_DNS_NAPTR, CONST_CS | CONST_PERSISTENT);
516+
REGISTER_LONG_CONSTANT("DNS_AAAA", PHP_DNS_AAAA, CONST_CS | CONST_PERSISTENT);
517+
REGISTER_LONG_CONSTANT("DNS_A6", PHP_DNS_A6, CONST_CS | CONST_PERSISTENT);
518+
REGISTER_LONG_CONSTANT("DNS_ANY", PHP_DNS_ANY, CONST_CS | CONST_PERSISTENT);
519+
REGISTER_LONG_CONSTANT("DNS_ALL", PHP_DNS_ALL, CONST_CS | CONST_PERSISTENT);
520+
return SUCCESS;
521+
}

0 commit comments

Comments
 (0)