diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-30 06:55:43 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-30 06:55:58 +0000 |
| commit | 1a72d3225cfe03edcfcab49070bd7a6806b7958d (patch) | |
| tree | b93186289773d38ddcdd42a3c59a1639b185e364 | |
| parent | 2c317bea2c400c44cb05f206be6ad85ff74a99be (diff) | |
| parent | 63c0ecc44564fbb3469d53646a5403388689ceea (diff) | |
| download | php-git-1a72d3225cfe03edcfcab49070bd7a6806b7958d.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/interbase/interbase.c | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -47,6 +47,9 @@ PHP NEWS . Fixed bug #75317 (UConverter::setDestinationEncoding changes source instead of destination). (andrewnester) +- interbase: + . Fixed bug #75453 (Incorrect reflection for ibase_[p]connect). (villfa) + - JSON: . Fixed bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key). (Jakub Zelenka) diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 8986a4d32b..b282279353 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -53,7 +53,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 0) ZEND_ARG_INFO(0, database) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) @@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1) ZEND_ARG_INFO(0, role) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 0) ZEND_ARG_INFO(0, database) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) @@ -1030,7 +1030,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* } /* }}} */ -/* {{{ proto resource ibase_connect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]) +/* {{{ proto resource ibase_connect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]]) Open a connection to an InterBase database */ PHP_FUNCTION(ibase_connect) { @@ -1038,7 +1038,7 @@ PHP_FUNCTION(ibase_connect) } /* }}} */ -/* {{{ proto resource ibase_pconnect(string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]) +/* {{{ proto resource ibase_pconnect([string database [, string username [, string password [, string charset [, int buffers [, int dialect [, string role]]]]]]]) Open a persistent connection to an InterBase database */ PHP_FUNCTION(ibase_pconnect) { |