diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_fe.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_class_mysqli_interface.phpt | 1 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt | 51 |
4 files changed, 58 insertions, 2 deletions
@@ -3,7 +3,6 @@ ?? ??? 2010, PHP 5.3.4 - Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED. (Kalle) - - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe) - Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values). (Felipe) @@ -17,8 +16,10 @@ empty). (Felipe) - Fixed bug #52436 (Compile error if systems do not have stdint.h) (Sriram Natarajan) +- Fixed bug #52433 (Call to undefined method mysqli::poll() - must be static). + (Andrey) - Fixed bug #52302 (mysqli_fetch_all does not work with MYSQLI_USE_RESULT). - (Andrey). + (Andrey) - Fixed bug #51610 (Using oci_connect causes PHP to take a long time to exit). Requires Oracle bug fix 9891199 for this patch to have an effect. (Oracle Corp.) diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index d7c9bef46e..207cc81903 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -505,6 +505,9 @@ const zend_function_entry mysqli_link_methods[] = { PHP_FALIAS(next_result, mysqli_next_result, arginfo_mysqli_no_params) PHP_FALIAS(options, mysqli_options, arginfo_class_mysqli_options) PHP_FALIAS(ping, mysqli_ping, arginfo_mysqli_no_params) +#if defined(MYSQLI_USE_MYSQLND) + ZEND_FENTRY(poll, ZEND_FN(mysqli_poll), arginfo_mysqli_poll, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) +#endif PHP_FALIAS(prepare, mysqli_prepare, arginfo_class_mysqli_query) PHP_FALIAS(query, mysqli_query, arginfo_class_mysqli_query) PHP_FALIAS(real_connect, mysqli_real_connect, arginfo_class_mysqli_real_connect) diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index c94b39ddac..b503d3e56f 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -63,6 +63,7 @@ require_once('skipifconnectfailure.inc'); /* $expected_methods['get_client_stats'] = true; */ $expected_methods['get_connection_stats'] = true; $expected_methods['reap_async_query'] = true; + $expected_methods['poll'] = true; } else { // libmysql only if (function_exists('mysqli_ssl_set')) diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index 910ede93c6..652aee29e1 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -619,6 +619,57 @@ Modifiers: 256 Number of Parameters: 0 Number of Required Parameters: 0 +Inspecting method 'poll' +isFinal: no +isAbstract: no +isPublic: yes +isPrivate: no +isProtected: no +isStatic: yes +isConstructor: no +isDestructor: no +isInternal: yes +isUserDefined: no +returnsReference: no +Modifiers: 257 +Number of Parameters: 5 +Number of Required Parameters: 4 + +Inspecting parameter 'read' of method 'poll' +isArray: yes +allowsNull: yes +isPassedByReference: yes +isOptional: no +isDefaultValueAvailable: no + +Inspecting parameter 'write' of method 'poll' +isArray: yes +allowsNull: yes +isPassedByReference: yes +isOptional: no +isDefaultValueAvailable: no + +Inspecting parameter 'error' of method 'poll' +isArray: yes +allowsNull: yes +isPassedByReference: yes +isOptional: no +isDefaultValueAvailable: no + +Inspecting parameter 'sec' of method 'poll' +isArray: no +allowsNull: no +isPassedByReference: no +isOptional: no +isDefaultValueAvailable: no + +Inspecting parameter 'usec' of method 'poll' +isArray: no +allowsNull: no +isPassedByReference: no +isOptional: yes +isDefaultValueAvailable: no + Inspecting method 'prepare' isFinal: no isAbstract: no |