diff options
| author | Reeze Xia <reeze@php.net> | 2015-02-28 16:43:41 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-02-28 16:43:41 +0800 |
| commit | 968a9f48071bcc099b4e978fc99fd09b6f69d172 (patch) | |
| tree | 92a73465a923a147258a7b25d80ef5924fde4362 | |
| parent | ed102533116d7771bf2f8fd5d0e4f345b38b1da5 (diff) | |
| parent | 1b240ff9e3b865b14bea191b3a4394064b43e2a3 (diff) | |
| download | php-git-968a9f48071bcc099b4e978fc99fd09b6f69d172.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ffdea3d090..9472d51153 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -85,6 +85,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) @@ -94,6 +95,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 1f027eae4d..26f72098bf 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1419,6 +1419,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, secure) + ZEND_ARG_INFO(0, httponly) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1) @@ -1428,6 +1429,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, domain) ZEND_ARG_INFO(0, secure) + ZEND_ARG_INFO(0, httponly) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0) |