clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,947 Commits 494 Branches 1,367 Tags 803 MiB
f2825042b4
Commit Graph

565 Commits

Author SHA1 Message Date
Xinchen Hui
aa2369f85a Merge branch 'PHP-5.4' into PHP-5.5 2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa Fix typo in test 2013-06-17 13:22:20 +08:00
Xinchen Hui
6cd6349ff8 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165 Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server) 2013-06-16 22:55:59 +08:00
Andrey Hristov
7503a4b4a4 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-13 15:29:40 +01:00
Andrey Hristov
0777a18703 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2013-03-13 14:24:23 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Remi Collet
6e4cfa18f7 Really fix test pdo_mysql_class_constants.phpt 
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
	skip the test if no connection
	use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
 2012-12-12 16:53:18 +01:00
Remi Collet
784850211e Reduce case where this test will fails: 
- no connection AND no mysqli extension

So, will succeed when no configured connection, but mysqli available.
 2012-12-03 15:32:52 +01:00
Anatoliy Belsky
f85ae48f4f Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt 
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
 2012-11-14 21:18:16 +01:00
Johannes Schlüter
44b1a07d85 Allow setting SHA256 auth public key as option 2012-10-31 16:54:11 +01:00
Johannes Schlüter
d21d909072 Merge branch 'PHP-5.4' 2012-10-26 14:23:22 +02:00
Johannes Schlüter
4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/pdo_mysql/mysql_statement.c
 2012-10-26 14:22:31 +02:00
ULF WENDEL
5d4c691e51 Merge branch 'PHP-5.4' 
* PHP-5.4:
  This won't make the test pass but now its at least one that shows no unnecessary error messages...
 2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
ULF WENDEL
b8595e1d40 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix for bug #62820
 2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests 2012-10-23 14:58:16 +02:00
ULF WENDEL
ccf749e38d Merge branch 'PHP-5.4' 
* PHP-5.4:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4
 2012-09-29 12:21:55 +02:00
ULF WENDEL
13d4d8e2d0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
	NEWS
 2012-09-29 12:17:13 +02:00
Xinchen Hui
69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
Xinchen Hui
4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Johannes Schlüter
21cbe30be3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove extra ;
 2012-06-22 17:33:38 +02:00
Johannes Schlüter
5e23a047ac Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove extra ;
 2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43 Remove extra ; 2012-06-22 17:32:46 +02:00
andrey
cd9e4d1def Merge branch 'PHP-5.4' 2012-05-02 16:15:35 +02:00
andrey
67419499b2 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-02 15:57:08 +02:00
andrey
b42d000471 Fix for bug#61411 
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
 2012-05-02 15:55:22 +02:00
Johannes Schlüter
d2718cb9ff Merge branch 'PHP-5.4' 
* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
 2012-04-19 12:49:47 +02:00
Johannes Schlüter
0589b19abf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 12:47:47 +02:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Pierrick Charron
919085b822 Merge branch 'PHP-5.4' 2012-03-24 18:00:04 -04:00
Pierrick Charron
7f05a39fce Merge branch 'PHP-5.3' into PHP-5.4 2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93 Remove unused variable 2012-03-24 17:49:58 -04:00
Johannes Schlüter
abd5670566 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
f36cc4f7c8 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
d796ebb0b5 Apply test fix for bug #61288 pdo_mysql___construct_options_libmysql.phpt test fails 2012-03-06 01:43:49 +00:00
Johannes Schlüter
dc0070e323 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
048f1fa092 Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
46608a073c Fix bug #61194 PDO should export compression flag with myslqnd 2012-03-05 23:57:24 +00:00
Johannes Schlüter
b526e0e410 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Johannes Schlüter
5c896b344a Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Johannes Schlüter
f666285805 Fix Bug #61207 PDO::nextRowset() after a multi-statement query doesn't always work 2012-03-05 23:38:15 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Johannes Schlüter
6781f17575 - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Johannes Schlüter
539a0f3bd3 - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Johannes Schlüter
026445a0aa - Fix bug #60155 (pdo_mysql.default_socket ignored). 2011-11-02 15:45:53 +00:00
Andrey Hristov
10e4419231 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Andrey Hristov
efb68d9399 api_ext to reverse_api 2011-10-19 15:04:12 +00:00
Pierre Joye
e1ad60d3d5 - fix bug #55870, PDO ignores all SSL parameters when used with mysql native driver 2011-10-08 06:17:08 +00:00
Andrey Hristov
3cddf1d7b5 Fix bad cast which leads to crashes! 2011-10-05 18:51:15 +00:00
Andrey Hristov
303f8acd24 Fix bad cast which leads to crashes! 2011-10-05 18:51:15 +00:00
Johannes Schlüter
bb10815f7e - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2817c5f3e7 - Fix folding 2011-09-19 12:31:06 +00:00
Johannes Schlüter
2122879a7a - Fix folding 2011-09-19 12:31:06 +00:00
Christopher Jones
e77138f7ae Fix skipifs 2011-09-08 17:52:45 +00:00
Christopher Jones
d4f1085c18 Fix skipifs 2011-09-08 17:52:45 +00:00
Christopher Jones
8e23ee53bf Fix skipifs 2011-09-08 17:52:45 +00:00
Johannes Schlüter
70561e9a6d - Use myslqnd by default when MySQL extensions are activated but no path given 2011-09-07 13:33:56 +00:00
Johannes Schlüter
bea25b5e55 - Use myslqnd by default when MySQL extensions are activated but no path given 2011-09-07 13:33:56 +00:00
Ulf Wendel
e21ea5e7ce Fix SKIPIF 2011-09-06 13:57:03 +00:00
Ulf Wendel
f5e4b5f1c5 Fix SKIPIF 2011-09-06 13:57:03 +00:00
Ulf Wendel
fe89680010 Fix SKIPIF 2011-09-06 13:57:03 +00:00
Stanislav Malyshev
6280a6bdf9 fix redirect when test run from different places 2011-09-06 05:21:56 +00:00
Stanislav Malyshev
d465ee0565 fix redirect when test run from different places 2011-09-06 05:21:56 +00:00
Andrey Hristov
ab99790eca Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
cc697fa5bf Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Andrey Hristov
27a48f0b44 Fix for Bug #54158 MYSQLND + PDO MySQL requires #define MYSQL_OPT_LOCAL_INFILE 
and a bunch of other small preprocessor fixes
 2011-09-02 13:53:41 +00:00
Ulf Wendel
6e3708cc59 Hopefully, this is an even better way to check for InnoDB support as of MySQL 5.6.1 2011-09-02 11:06:51 +00:00
Ulf Wendel
56a2ff3b00 Hopefully, this is an even better way to check for InnoDB support as of MySQL 5.6.1 2011-09-02 11:06:51 +00:00
Ulf Wendel
864f8106be Hopefully, this is an even better way to check for InnoDB support as of MySQL 5.6.1 2011-09-02 11:06:51 +00:00
Johannes Schlüter
f90bead78a - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter
4eff96b99b - Fix TSRM build 2011-09-01 12:04:54 +00:00
Johannes Schlüter
7d25510b1b - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter
39b0be5126 - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd 2011-08-31 20:30:08 +00:00
Johannes Schlüter
c25f0424c8 - Update PDO_mysql error mapping 2011-08-31 15:46:07 +00:00
Johannes Schlüter
878708994d - Update PDO_mysql error mapping 2011-08-31 15:46:07 +00:00
Johannes Schlüter
35597286d6 - Update PDO_mysql error mapping 2011-08-31 15:46:07 +00:00
Johannes Schlüter
262cc2f37a - Be less restrictive on the SQL state, some server versions might fool us 2011-08-31 15:25:18 +00:00
Johannes Schlüter
b3c3d35b9f - Be less restrictive on the SQL state, some server versions might fool us 2011-08-31 15:25:18 +00:00
Johannes Schlüter
dd8f68ecb0 - Be less restrictive on the SQL state, some server versions might fool us 2011-08-31 15:25:18 +00:00
Rasmus Lerdorf
595f2e71ec Since we are creating this csv file locally this should obviously 
be a a LOCAL infile here for this to work reliably. For robustness
this should probably have a check for the local-infile server 
setting as well.
 2011-08-31 07:43:58 +00:00
Rasmus Lerdorf
dd4e07b9b4 Since we are creating this csv file locally this should obviously 
be a a LOCAL infile here for this to work reliably. For robustness
this should probably have a check for the local-infile server 
setting as well.
 2011-08-31 07:43:58 +00:00
Rasmus Lerdorf
8b4ac6bb8f Fix test. I have no idea why the test author didn't expect to get back 
latin2 when the test is setting it to latin2 here. Both PHP and MySQL
are doing the right thing here.
 2011-08-31 07:19:20 +00:00
Rasmus Lerdorf
76976d0702 Fix test. I have no idea why the test author didn't expect to get back 
latin2 when the test is setting it to latin2 here. Both PHP and MySQL
are doing the right thing here.
 2011-08-31 07:19:20 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
9480eace41 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Ulf Wendel
61b2568310 Would be nice if tests get updated whenever a feature is added by the person adding the feature... 2011-07-26 09:33:01 +00:00
Ulf Wendel
63ebb30730 Would be nice if tests get updated whenever a feature is added by the person adding the feature... 2011-07-26 09:33:01 +00:00
Ulf Wendel
48d47da8af Would be nice if tests get updated whenever a feature is added by the person adding the feature... 2011-07-26 09:33:01 +00:00
Ulf Wendel
ac9708ccf2 Fix mysqlnd detection 2011-07-26 09:30:49 +00:00
Ulf Wendel
ff58394fd6 Fix mysqlnd detection 2011-07-26 09:30:49 +00:00
Ulf Wendel
41c94d26a4 Fix mysqlnd detection 2011-07-26 09:30:49 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
087a134b50 - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Felipe Pena
e1a5443f97 - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Felipe Pena
b86161982b - Fixed bug #54929 (Parse error with single quote in sql comment) 2011-06-04 22:54:40 +00:00
Johannes Schlüter
3e17b49008 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Johannes Schlüter
a90b7da435 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Johannes Schlüter
0179c5a0e6 - Fix Bug #53782 (foreach throws irrelevant exception) 2011-05-16 15:37:39 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work 
in autoconf2.13 and we still support that version
in this branch
 2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
08792f6f9b Cache the pdo include path 2011-05-15 05:03:29 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Johannes Schlüter
410a781063 - Fix bug #54644 (wrong pathes in php_pdo_mysql_int.h) 2011-05-09 11:34:17 +00:00
Johannes Schlüter
4a8eeb7afb - Fix bug #54644 (wrong pathes in php_pdo_mysql_int.h) 2011-05-09 11:34:17 +00:00
Rob Richards
1b6dd18082 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +00:00
Rob Richards
944a2b0c80 Implement FR #48587 (MySQL PDO driver doesn't support SSL connections) 2011-04-15 14:24:40 +00:00
Kalle Sommer Nielsen
ba4fbb05ae Remove this void comment (c/p mistake) 2011-01-17 09:59:07 +00:00
Kalle Sommer Nielsen
dc8da85778 Remove this void comment (c/p mistake) 2011-01-17 09:59:07 +00:00
Kalle Sommer Nielsen
504b6f695e MFT: Implemented FR #47802 (Support for setting character sets in DSN strings) 2011-01-17 09:54:22 +00:00
Johannes Schlüter
fc49f76caa - Fix #53551 (PDOStatement execute segfaults for pdo_mysql driver) 2011-01-14 14:57:57 +00:00
Johannes Schlüter
22b42afaee - Fix #53551 (PDOStatement execute segfaults for pdo_mysql driver) 2011-01-14 14:57:57 +00:00
Kalle Sommer Nielsen
ee62a1a747 Added test case for #47802 and fixed macro name after the move to mysql_options() 2011-01-07 17:18:30 +00:00
Kalle Sommer Nielsen
1351c2e2c6 Update to use mysql_options() instead of mysql_set_character_set() (As suggested by Andrey) 2011-01-07 14:58:23 +00:00
Kalle Sommer Nielsen
e4c36b054c Implemented FR #47802, support for character sets in DSN strings for PDO_MYSQL 2011-01-07 14:39:56 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Andrey Hristov
fe719c5e42 profiling in trace mode 2010-10-22 15:46:26 +00:00
Andrey Hristov
924bb78167 profiling in trace mode 2010-10-22 15:46:26 +00:00
Ulf Wendel
bd73903efb Fix test: third parameter can be false. 2010-10-05 14:41:08 +00:00
Ulf Wendel
8c319bf942 Fix test: third parameter can be false. 2010-10-05 14:41:08 +00:00
Kalle Sommer Nielsen
33c99f9a44 Fixed constness compiler warning in pdo_mysql 2010-10-05 09:58:15 +00:00
Kalle Sommer Nielsen
d6efd2fef4 Fixed constness compiler warning in pdo_mysql 2010-10-05 09:58:15 +00:00
Ulf Wendel
8236f62ce2 Test update for sql_mode = ANSI 2010-09-22 15:16:07 +00:00
Ulf Wendel
841c151b64 Test update for sql_mode = ANSI 2010-09-22 15:16:07 +00:00
Ulf Wendel
c30edd027f Dont be strict on error messages, they can vary by server version 2010-09-20 09:04:48 +00:00
Ulf Wendel
70d231bf13 Dont be strict on error messages, they can vary by server version 2010-09-20 09:04:48 +00:00
Ulf Wendel
d27642fece PHP has changed (undefined) behaviour from 5.3.2 to 5.3.3: ->{} = , which seems to have been never an officially supported syntax and have never been a valid property name, is no longer allowed and PHP bails. 2010-08-31 14:43:02 +00:00
Ulf Wendel
d3670280f0 PHP has changed (undefined) behaviour from 5.3.2 to 5.3.3: ->{} = , which seems to have been never an officially supported syntax and have never been a valid property name, is no longer allowed and PHP bails. 2010-08-31 14:43:02 +00:00
Ulf Wendel
d0e7e5aa2a If you add functions to the PDO core, take care not to break other PDO drivers tests, document the function and provide a function test for the PDO core to check your default/fallback implementation. 2010-08-30 09:20:48 +00:00
Ulf Wendel
b12d435b14 If you add functions to the PDO core, take care not to break other PDO drivers tests, document the function and provide a function test for the PDO core to check your default/fallback implementation. 2010-08-30 09:20:48 +00:00
Johannes Schlüter
eaad585a2e - Drop (broken) support for libmysql 3.23 and 4.0 from pdo_mysql, see bug #51259 2010-08-05 13:29:44 +00:00
Ulf Wendel
0ab82cecc2 Fixing test - see also gcov results 2010-05-31 13:28:15 +00:00
Ulf Wendel
aa9915ce5d Fixing test - see also gcov results 2010-05-31 13:28:15 +00:00
Ulf Wendel
2613069cd4 Improve EXPECTF to work with other than default schemata 2010-05-31 10:52:14 +00:00