diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-04 23:00:27 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-04 23:00:56 +0200 |
| commit | ed6bf0bc69d9bc241207f28679b4c4ddb057e9ff (patch) | |
| tree | 22c492146bf8ec0d8f14a1ab3649f06698431dbe | |
| parent | 21a9ad910bc1a890ca4bddc4d4239c2e17d4c6a6 (diff) | |
| parent | c40a494406aa3606be964b24d224ec4eb0c936e8 (diff) | |
| download | php-git-ed6bf0bc69d9bc241207f28679b4c4ddb057e9ff.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79561: dns_get_record() fails with DNS_ALL
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/standard/dns.c | 2 | ||||
| -rw-r--r-- | ext/standard/dns_win32.c | 18 |
3 files changed, 22 insertions, 1 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #79528 (Different object of the same xml between 7.4.5 and 7.4.4). (cmb) +- Standard: + . Fixed bug #79561 (dns_get_record() fails with DNS_ALL). (cmb) + ?? ??? ????, PHP 7.4.6 - Core: diff --git a/ext/standard/dns.c b/ext/standard/dns.c index d461a39c34..9c0faf3cb2 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -1145,7 +1145,7 @@ PHP_FUNCTION(dns_get_mx) #endif /* HAVE_FULL_DNS_FUNCS */ #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) { REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT); diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index 9f4b1e768b..b5eb1e0621 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -510,3 +510,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; +} |