Commit Graph

45980 Commits

Author SHA1 Message Date
Andrey Hristov
528e66fbf5 Fix for bug#48909 Segmentation fault in mysqli_stmt_execute 2009-09-18 14:32:01 +00:00
Andrey Hristov
b30dfcd475 Fix for bug#48754 mysql_close() crash php when no handle specified 2009-09-18 10:46:51 +00:00
Andrey Hristov
4ac04d8936 Afix not included by the fix committed by Ulf.
pemalloc and then efree - too bad!
Sorry for committing in two passes, my big tree is already patched
with compressed.
2009-09-17 15:13:36 +00:00
Ulf Wendel
4bb9113812 better coverage for mysqli_info 2009-09-17 07:11:25 +00:00
Sriram Natarajan
13d4fcede9 - Fixed bug #49572 (use of C++ style comments causes build failure) 2009-09-17 02:45:25 +00:00
Felipe Pena
55b77fa017 - Fixed ZTS build 2009-09-16 18:01:10 +00:00
Sebastian Bergmann
8a9e2f5849 Merge ReflectionMethod::setAccessible() to PHP 5.3.2, approved by Johannes. 2009-09-16 17:24:46 +00:00
Ulf Wendel
1b5f0f63b4 Fix (by Andrey) and test for bug #49442 . Don't use efree() for memory allocated with malloc()... If a connection gets created by mysqli_init(), mysqlnd makes it 'persistent'. 'Persistent' means that mysqlnd uses malloc(). mysqlnd does use malloc() instead of ealloc() because it is unknown if the connection will become a true persistent connection in the sense of ext/mysqli. It is unknown if the user wants a persistent connection or not until the user calls mysqli_real_connect(). To avoid tricky conversions mysqlnd uses malloc(), which sets a private persistent flag in the mysqlnd structures. A precondition for the crash to happen was that the private persistent flag is set. The flag is also set when creating a real persistent connection (in the sense of ext/mysqli) and so the bug can happen with mysql_init()/mysqli_real_connect() and mysql_connect('p:<host>', ...). Therefore we test both cases. Note the (tricky?) difference between the implementation detail'mysqlnd private persistent flag = use malloc()' and persistent connections from a user perspective. Although mysqlnd will always set its private persistent flag and use malloc() for connections created with mysqli_init() it is still up to the user to decide in mysqli_real_connect() if the connection shall become a (true) persistent connection or not. 2009-09-16 17:03:44 +00:00
Ulf Wendel
8e42cbfeac Fix and tests for bug #49511 . mysqlnd and the MySQL Client Library (libmysql) use different networking APIs. mysqlnd does use PHP streams whereas libmysql uses its own wrapper of the operating level network calls. PHP sets by default a read timeout of 60s for streams - php.ini, default_socket_timeout. This default applies to all streams that set no other timeout value. mysqlnd has not set any other value and therefore it connections of long running queries can have been cut off after default_socket_timeout seconds resulting in a 2006 - MySQL Server has gone away error message. The MySQL Client Library sets a default timeout of 365 * 24 * 3600 seconds (1year) and waits for other timeouts to happen, e.g. TCP/IP timeouts. mysqlnd now uses the same very long timeout. The value is configurable through a new php.ini setting: mysqlnd.net_read_timeout. mysqlnd.net_read_timeout gets used by any extension (ext/mysql, ext/mysqli, PDO_MySQL) that uses mysqlnd. mysqlnd tells PHP Streams to use mysqlnd.net_read_timeout. Please note that there may be subtle differences between MYSQL_OPT_READ_TIMEOUT from the MySQL Client Library and PHP Streams. E.g. MYSQL_OPT_READ_TIMEOUT is documented to work only for TCP/IP connections and, prior to MySQL 5.1.2, only for Windows. PHP streams may not have this limitation. Please check the streams documentation, if in doubt. 2009-09-16 15:00:54 +00:00
Patrick Allaert
56732c9f51 Minor change to improve code coverage 2009-09-16 12:35:54 +00:00
andy wharmby
1690a26b60 Fix SKIPIF sections 2009-09-15 21:44:08 +00:00
Rasmus Lerdorf
5e0e9419e2 Fix for bug #49558 for 5.2 and HEAD as well. 2009-09-15 20:34:54 +00:00
Ilia Alshanetsky
69e0e2fe90 Upgraded bundled sqlite to version 3.6.18. 2009-09-15 16:54:11 +00:00
Pierre Joye
a22276faa7 - #49253, add support for libcurl's CERTINFO option 2009-09-15 15:47:06 +00:00
Moriyoshi Koizumi
01ecb86a3c - WS fix (spaces to tabs) 2009-09-15 00:09:13 +00:00
Pierre Joye
56d4d95f2d - Fix #48746, improve fix to support all possible cases (see latest comment in the report) 2009-09-14 18:46:56 +00:00
Ilia Alshanetsky
d3ae759391 Fixed certificate validation inside php_openssl_apply_verification_policy 2009-09-14 12:50:30 +00:00
Moriyoshi Koizumi
aa59726268 - Looks like bug #48697 has already been fixed in RC1. 2009-09-14 04:11:29 +00:00
Felipe Pena
127427a51c - Fixed warnings (Kalle) 2009-09-13 14:42:36 +00:00
Ilia Alshanetsky
6fa2d1171a Fixed test 2009-09-13 13:14:11 +00:00
andy wharmby
829e4529fb Add missing SKIPIF 2009-09-11 21:57:04 +00:00
Moriyoshi Koizumi
afe681c301 - Fix bug #49536 (mb_detect_encoding() returns incorrect results when strict_mode is turned on.)
(patch by komura, thanks!)
2009-09-11 21:26:18 +00:00
Ulf Wendel
30a6d1b851 Fix for bug #49357 (MySQLi extension fails to recognize POINT (spatial) colums).
Do yourself a favour and use mysqlnd. mysqlnd has no isuses here.

If you insist on using the MySQL Client Library (libmysql) I strongly recommend to use mysqli_stmt_store_result() when fetching geometry data using prepared statements. When streaming data, which is the default for prepared statements, ext/mysqli will have to make a guess on the size of the result buffer it needs. The guess is based on a length reported by the MySQL CLient Library (libmysql). The MySQL Client Library reports 4GB (!) for a POINT - a conservative and safe guess. Consequently, ext/mysqli will try to allocate 4GB of RAM. The true (maximum) size of the column is not available before buffering the result on the client using mysqli_stmt_store_result(). If you call mysqli_stmt_store_result(), the result buffers will not get bigger than needed. However, store_result()/buffering is usually not what you want when you ask for prepared statements.
2009-09-11 13:38:47 +00:00
Ulf Wendel
a69c198790 Stepping back to PHP 5.2.x and earlier logic of allocating even huge pieces of memory for large BLOB types to avoid data truncation. This fixes the test failure of 005.phpt when using MySQL Client
Library (libmysql). The test does pass with mysqlnd because mysqlnd does not have any issues here.
2009-09-11 12:28:47 +00:00
Ulf Wendel
9af451ff49 Fixing a crash which must have existed since PHP 5.0. At least the crash can be reproduced with PHP 5.0.6. The crash happens only when using the MySQL Client Library (libmysql) - it does not happen
when using mysqlnd.
2009-09-11 12:16:56 +00:00
Moriyoshi Koizumi
384c7bce5a - Fix bug #49528 (UTF-16 strings prefixed by BOM wrongly converted). 2009-09-11 08:22:19 +00:00
Jani Taskinen
6d132cf814 - Simplified a bit and fixed possible memory corruption and definate leak. 2009-09-10 16:19:42 +00:00
Jani Taskinen
8974c5e051 - Fix skips 2009-09-10 15:05:49 +00:00
Jani Taskinen
04e3e09f9c - Fix build for !win32 systems.. 2009-09-10 13:19:43 +00:00
Sebastian Bergmann
24f4a4a9f9 Use getThis() correctly. 2009-09-10 05:15:24 +00:00
Sebastian Bergmann
46ce6802e5 Add ReflectionMethod::setAccessible() for invoking non-public methods through the Reflection API. 2009-09-10 05:04:53 +00:00
Ilia Alshanetsky
0a54e5b768 Fixed test 2009-09-10 02:15:08 +00:00
Felipe Pena
4198e8f727 - Possible fix for bug #49344 on Windows (pdo_mssql fails to connect,throws PDOException SQLSTATE[] (null) (severity 0)) 2009-09-10 01:20:42 +00:00
Ulf Wendel
667c597512 Andrey fixed the bug but the test was somewhat borked. Fixing test. 2009-09-09 18:31:00 +00:00
Ulf Wendel
59a52247e7 Some extra test coverage for http://bugs.php.net/bug.php?id=48754 . 2009-09-09 17:16:24 +00:00
Ulf Wendel
86481c0ac0 Tests for http://bugs.php.net/bug.php?id=49357 (libmysql only) . The simple fix suggested in the bug system is not good enough, therefore no fix yet. 2009-09-09 17:10:29 +00:00
Ulf Wendel
5254c6f372 Next attempt to fix http://bugs.php.net/bug.php?id=48745. Patch by Andrey. 2009-09-09 17:03:03 +00:00
Derick Rethans
5b709c4718 - Updated to version 2009.13 (2009m) 2009-09-08 14:03:53 +00:00
Kalle Sommer Nielsen
70e4995479 This shouldn't have been in the commit 2009-09-08 01:53:46 +00:00
Kalle Sommer Nielsen
e834d1a1f4 Experimental build support for VC10
- Contains newly introduced compiler warning fixes
 - configure now picks up VC10
2009-09-08 01:50:40 +00:00
Kalle Sommer Nielsen
1d39d37fad Fixed ext/sockets build 2009-09-08 01:45:25 +00:00
Kalle Sommer Nielsen
b2f1a3e865 Fixed ext/interbase build 2009-09-08 01:44:37 +00:00
Ilia Alshanetsky
f05407e227 Fixed tests 2009-09-07 14:18:46 +00:00
Ilia Alshanetsky
df377868bd Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). 2009-09-07 02:35:25 +00:00
Felipe Pena
ba50aa6572 - Fixed bug #49483 (preg_replace 'subject' parameter listed as optional) 2009-09-06 17:41:34 +00:00
Pierre Joye
558e7133c4 - revert last commit, breaks the build and needs test case(s) 2009-09-06 15:56:58 +00:00
Moriyoshi Koizumi
797249daf4 - Fix leaks. 2009-09-06 14:43:09 +00:00
Pierre Joye
82fb676913 - don't hide previous declaration 2009-09-05 21:16:05 +00:00
Pierre Joye
9ec72d0415 - don't hide early declaration 2009-09-05 19:00:05 +00:00
Felipe Pena
792ae864ee - Drop unused var 2009-09-05 18:21:10 +00:00