Skip to content

Declare ext/standard constants in stubs - part 5 #9466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Declare ext/standard constants in stubs - part 5 #9466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bffc3a3
Declare ext/standard constants in stubs - part 5
kocsismate Sep 2, 2022
e51b475
Fix ifdef
kocsismate Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);

#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
BASIC_MINIT_SUBMODULE(dns)
# endif
#endif

BASIC_MINIT_SUBMODULE(hrtime)

return SUCCESS;
Expand Down
82 changes: 82 additions & 0 deletions ext/standard/basic_functions.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,88 @@
*/
const PHP_ROUND_HALF_ODD = UNKNOWN;

/* dns.c */

#if (defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS)))
/**
* @var int
* @cvalue PHP_DNS_A
*/
const DNS_A = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_NS
*/
const DNS_NS = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_CNAME
*/
const DNS_CNAME = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_SOA
*/
const DNS_SOA = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_PTR
*/
const DNS_PTR = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_HINFO
*/
const DNS_HINFO = UNKNOWN;
#if (!defined(PHP_WIN32))
/**
* @var int
* @cvalue PHP_DNS_CAA
*/
const DNS_CAA = UNKNOWN;
#endif
/**
* @var int
* @cvalue PHP_DNS_MX
*/
const DNS_MX = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_TXT
*/
const DNS_TXT = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_SRV
*/
const DNS_SRV = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_NAPTR
*/
const DNS_NAPTR = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_AAAA
*/
const DNS_AAAA = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_A6
*/
const DNS_A6 = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_ANY
*/
const DNS_ANY = UNKNOWN;
/**
* @var int
* @cvalue PHP_DNS_ALL
*/
const DNS_ALL = UNKNOWN;
#endif

/* syslog.c */

/* error levels */
Expand Down
47 changes: 46 additions & 1 deletion ext/standard/basic_functions_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 0 additions & 41 deletions ext/standard/dns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,26 +316,6 @@ static zend_string *php_gethostbyname(char *name)
}
/* }}} */

#if defined(HAVE_FULL_DNS_FUNCS) || defined(PHP_WIN32)
# define PHP_DNS_NUM_TYPES 13 /* Number of DNS Types Supported by PHP currently */

# define PHP_DNS_A 0x00000001
# define PHP_DNS_NS 0x00000002
# define PHP_DNS_CNAME 0x00000010
# define PHP_DNS_SOA 0x00000020
# define PHP_DNS_PTR 0x00000800
# define PHP_DNS_HINFO 0x00001000
# define PHP_DNS_CAA 0x00002000
# define PHP_DNS_MX 0x00004000
# define PHP_DNS_TXT 0x00008000
# define PHP_DNS_A6 0x01000000
# define PHP_DNS_SRV 0x02000000
# define PHP_DNS_NAPTR 0x04000000
# define PHP_DNS_AAAA 0x08000000
# define PHP_DNS_ANY 0x10000000
# 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)
#endif /* HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) */

/* Note: These functions are defined in ext/standard/dns_win32.c for Windows! */
#if !defined(PHP_WIN32) && defined(HAVE_DNS_SEARCH_FUNC)

Expand Down Expand Up @@ -1161,24 +1141,3 @@ PHP_FUNCTION(dns_get_mx)
/* }}} */
#endif /* HAVE_FULL_DNS_FUNCS */
#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */

#if defined(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);
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_CAA", PHP_DNS_CAA, 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;
}
#endif /* HAVE_FULL_DNS_FUNCS */
18 changes: 0 additions & 18 deletions ext/standard/dns_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,21 +506,3 @@ 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;
}
31 changes: 26 additions & 5 deletions ext/standard/php_dns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,32 @@
#define HAVE_FULL_DNS_FUNCS 1
#endif

#if defined(PHP_WIN32) || defined(HAVE_DNS_SEARCH_FUNC)
# if defined(PHP_WIN32) || defined(HAVE_FULL_DNS_FUNCS)
PHP_MINIT_FUNCTION(dns);
# endif
#endif /* defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC */
#if defined(PHP_WIN32) || (defined(HAVE_DNS_SEARCH_FUNC) && defined(HAVE_FULL_DNS_FUNCS))
#define PHP_DNS_A 0x00000001
#define PHP_DNS_NS 0x00000002
#define PHP_DNS_CNAME 0x00000010
#define PHP_DNS_SOA 0x00000020
#define PHP_DNS_PTR 0x00000800
#define PHP_DNS_HINFO 0x00001000
#if !defined(PHP_WIN32)
# define PHP_DNS_CAA 0x00002000
#endif
#define PHP_DNS_MX 0x00004000
#define PHP_DNS_TXT 0x00008000
#define PHP_DNS_A6 0x01000000
#define PHP_DNS_SRV 0x02000000
#define PHP_DNS_NAPTR 0x04000000
#define PHP_DNS_AAAA 0x08000000
#define PHP_DNS_ANY 0x10000000

#if defined(PHP_WIN32)
# define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP currently */
# 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)
#else
# define PHP_DNS_NUM_TYPES 13 /* Number of DNS Types Supported by PHP currently */
# 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)
#endif
#endif

#ifndef INT16SZ
#define INT16SZ 2
Expand Down