Skip to content

Commit bbcd448

Browse files
kocsismatekocsismate
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Declare ext/standard constants in stubs - part 5
2 parents 257d16e + 6f2f228 commit bbcd448

File tree

6 files changed

+154
-71
lines changed

6 files changed

+154
-71
lines changed

‎ext/standard/basic_functions.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
359359
php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
360360
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
361361

362-
#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
363-
# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
364-
BASIC_MINIT_SUBMODULE(dns)
365-
# endif
366-
#endif
367-
368362
BASIC_MINIT_SUBMODULE(hrtime)
369363

370364
return SUCCESS;

‎ext/standard/basic_functions.stub.php

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,88 @@
343343
*/
344344
const PHP_ROUND_HALF_ODD = UNKNOWN;
345345

346+
/* dns.c */
347+
348+
#if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS)))
349+
/**
350+
* @var int
351+
* @cvalue PHP_DNS_A
352+
*/
353+
const DNS_A = UNKNOWN;
354+
/**
355+
* @var int
356+
* @cvalue PHP_DNS_NS
357+
*/
358+
const DNS_NS = UNKNOWN;
359+
/**
360+
* @var int
361+
* @cvalue PHP_DNS_CNAME
362+
*/
363+
const DNS_CNAME = UNKNOWN;
364+
/**
365+
* @var int
366+
* @cvalue PHP_DNS_SOA
367+
*/
368+
const DNS_SOA = UNKNOWN;
369+
/**
370+
* @var int
371+
* @cvalue PHP_DNS_PTR
372+
*/
373+
const DNS_PTR = UNKNOWN;
374+
/**
375+
* @var int
376+
* @cvalue PHP_DNS_HINFO
377+
*/
378+
const DNS_HINFO = UNKNOWN;
379+
#if (!defined(PHP_WIN32))
380+
/**
381+
* @var int
382+
* @cvalue PHP_DNS_CAA
383+
*/
384+
const DNS_CAA = UNKNOWN;
385+
#endif
386+
/**
387+
* @var int
388+
* @cvalue PHP_DNS_MX
389+
*/
390+
const DNS_MX = UNKNOWN;
391+
/**
392+
* @var int
393+
* @cvalue PHP_DNS_TXT
394+
*/
395+
const DNS_TXT = UNKNOWN;
396+
/**
397+
* @var int
398+
* @cvalue PHP_DNS_SRV
399+
*/
400+
const DNS_SRV = UNKNOWN;
401+
/**
402+
* @var int
403+
* @cvalue PHP_DNS_NAPTR
404+
*/
405+
const DNS_NAPTR = UNKNOWN;
406+
/**
407+
* @var int
408+
* @cvalue PHP_DNS_AAAA
409+
*/
410+
const DNS_AAAA = UNKNOWN;
411+
/**
412+
* @var int
413+
* @cvalue PHP_DNS_A6
414+
*/
415+
const DNS_A6 = UNKNOWN;
416+
/**
417+
* @var int
418+
* @cvalue PHP_DNS_ANY
419+
*/
420+
const DNS_ANY = UNKNOWN;
421+
/**
422+
* @var int
423+
* @cvalue PHP_DNS_ALL
424+
*/
425+
const DNS_ALL = UNKNOWN;
426+
#endif
427+
346428
/* syslog.c */
347429

348430
/* error levels */

‎ext/standard/basic_functions_arginfo.h

Lines changed: 46 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/standard/dns.c

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -316,26 +316,6 @@ static zend_string *php_gethostbyname(char *name)
316316
}
317317
/* }}} */
318318

319-
#if defined(HAVE_FULL_DNS_FUNCS) || defined(PHP_WIN32)
320-
# define PHP_DNS_NUM_TYPES 13 /* Number of DNS Types Supported by PHP currently */
321-
322-
# define PHP_DNS_A 0x00000001
323-
# define PHP_DNS_NS 0x00000002
324-
# define PHP_DNS_CNAME 0x00000010
325-
# define PHP_DNS_SOA 0x00000020
326-
# define PHP_DNS_PTR 0x00000800
327-
# define PHP_DNS_HINFO 0x00001000
328-
# define PHP_DNS_CAA 0x00002000
329-
# define PHP_DNS_MX 0x00004000
330-
# define PHP_DNS_TXT 0x00008000
331-
# define PHP_DNS_A6 0x01000000
332-
# define PHP_DNS_SRV 0x02000000
333-
# define PHP_DNS_NAPTR 0x04000000
334-
# define PHP_DNS_AAAA 0x08000000
335-
# define PHP_DNS_ANY 0x10000000
336-
# define PHP_DNS_ALL (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_CAA|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
337-
#endif /* HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) */
338-
339319
/* Note: These functions are defined in ext/standard/dns_win32.c for Windows! */
340320
#if !defined(PHP_WIN32) && defined(HAVE_DNS_SEARCH_FUNC)
341321

@@ -1161,24 +1141,3 @@ PHP_FUNCTION(dns_get_mx)
11611141
/* }}} */
11621142
#endif /* HAVE_FULL_DNS_FUNCS */
11631143
#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */
1164-
1165-
#if defined(HAVE_FULL_DNS_FUNCS) && !defined(PHP_WIN32)
1166-
PHP_MINIT_FUNCTION(dns) {
1167-
REGISTER_LONG_CONSTANT("DNS_A", PHP_DNS_A, CONST_CS | CONST_PERSISTENT);
1168-
REGISTER_LONG_CONSTANT("DNS_NS", PHP_DNS_NS, CONST_CS | CONST_PERSISTENT);
1169-
REGISTER_LONG_CONSTANT("DNS_CNAME", PHP_DNS_CNAME, CONST_CS | CONST_PERSISTENT);
1170-
REGISTER_LONG_CONSTANT("DNS_SOA", PHP_DNS_SOA, CONST_CS | CONST_PERSISTENT);
1171-
REGISTER_LONG_CONSTANT("DNS_PTR", PHP_DNS_PTR, CONST_CS | CONST_PERSISTENT);
1172-
REGISTER_LONG_CONSTANT("DNS_HINFO", PHP_DNS_HINFO, CONST_CS | CONST_PERSISTENT);
1173-
REGISTER_LONG_CONSTANT("DNS_CAA", PHP_DNS_CAA, CONST_CS | CONST_PERSISTENT);
1174-
REGISTER_LONG_CONSTANT("DNS_MX", PHP_DNS_MX, CONST_CS | CONST_PERSISTENT);
1175-
REGISTER_LONG_CONSTANT("DNS_TXT", PHP_DNS_TXT, CONST_CS | CONST_PERSISTENT);
1176-
REGISTER_LONG_CONSTANT("DNS_SRV", PHP_DNS_SRV, CONST_CS | CONST_PERSISTENT);
1177-
REGISTER_LONG_CONSTANT("DNS_NAPTR", PHP_DNS_NAPTR, CONST_CS | CONST_PERSISTENT);
1178-
REGISTER_LONG_CONSTANT("DNS_AAAA", PHP_DNS_AAAA, CONST_CS | CONST_PERSISTENT);
1179-
REGISTER_LONG_CONSTANT("DNS_A6", PHP_DNS_A6, CONST_CS | CONST_PERSISTENT);
1180-
REGISTER_LONG_CONSTANT("DNS_ANY", PHP_DNS_ANY, CONST_CS | CONST_PERSISTENT);
1181-
REGISTER_LONG_CONSTANT("DNS_ALL", PHP_DNS_ALL, CONST_CS | CONST_PERSISTENT);
1182-
return SUCCESS;
1183-
}
1184-
#endif /* HAVE_FULL_DNS_FUNCS */

‎ext/standard/dns_win32.c

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

‎ext/standard/php_dns.h

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,32 @@
5656
#define HAVE_FULL_DNS_FUNCS 1
5757
#endif
5858

59-
#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
60-
# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
61-
PHP_MINIT_FUNCTION(dns);
62-
# endif
63-
#endif /* defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC */
59+
#if defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS))
60+
#define PHP_DNS_A 0x00000001
61+
#define PHP_DNS_NS 0x00000002
62+
#define PHP_DNS_CNAME 0x00000010
63+
#define PHP_DNS_SOA 0x00000020
64+
#define PHP_DNS_PTR 0x00000800
65+
#define PHP_DNS_HINFO 0x00001000
66+
#if !defined(PHP_WIN32)
67+
# define PHP_DNS_CAA 0x00002000
68+
#endif
69+
#define PHP_DNS_MX 0x00004000
70+
#define PHP_DNS_TXT 0x00008000
71+
#define PHP_DNS_A6 0x01000000
72+
#define PHP_DNS_SRV 0x02000000
73+
#define PHP_DNS_NAPTR 0x04000000
74+
#define PHP_DNS_AAAA 0x08000000
75+
#define PHP_DNS_ANY 0x10000000
76+
77+
#if defined(PHP_WIN32)
78+
# define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP currently */
79+
# define PHP_DNS_ALL (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
80+
#else
81+
# define PHP_DNS_NUM_TYPES 13 /* Number of DNS Types Supported by PHP currently */
82+
# define PHP_DNS_ALL (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_CAA|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
83+
#endif
84+
#endif
6485

6586
#ifndef INT16SZ
6687
#define INT16SZ 2

0 commit comments

Comments
 (0)