svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_fe.c branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt trunk/ext/mysqli/mysqli_fe.c
trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
| From: | Andrey Hristov | Date: | Fri, 13 Aug 2010 09:18:06 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqli/mysqli_fe.c branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt trunk/ext/mysqli/mysqli_fe.c trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63279@lists.php.net to get a copy of this message | ||
andrey Fri, 13 Aug 2010 09:18:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302177
Log:
Fix for bug #52433 Call to undefined method mysqli::poll()
Bug: http://bugs.php.net/52433 (Assigned) Call to undefined
method mysqli::poll()
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
U php/php-src/trunk/ext/mysqli/mysqli_fe.c
U php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2010-08-13 07:51:41 UTC (rev 302176)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-08-13 09:18:06 UTC (rev 302177)
@@ -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.)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-08-13 07:51:41 UTC (rev 302176)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_fe.c 2010-08-13 09:18:06 UTC (rev 302177)
@@ -505,6 +505,9 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt 2010-08-13
07:51:41 UTC (rev 302176)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt 2010-08-13
09:18:06 UTC (rev 302177)
@@ -63,6 +63,7 @@
/* $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'))
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt 2010-08-13
07:51:41 UTC (rev 302176)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt 2010-08-13
09:18:06 UTC (rev 302177)
@@ -619,6 +619,57 @@
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
Modified: php/php-src/trunk/ext/mysqli/mysqli_fe.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_fe.c 2010-08-13 07:51:41 UTC (rev 302176)
+++ php/php-src/trunk/ext/mysqli/mysqli_fe.c 2010-08-13 09:18:06 UTC (rev 302177)
@@ -496,6 +496,9 @@
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)
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt 2010-08-13 07:51:41 UTC
(rev 302176)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt 2010-08-13 09:18:06 UTC
(rev 302177)
@@ -61,6 +61,7 @@
/* $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'))
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt 2010-08-13 07:51:41 UTC
(rev 302176)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt 2010-08-13 09:18:06 UTC
(rev 302177)
@@ -603,6 +603,57 @@
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