clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,149 Commits 491 Branches 1,363 Tags 844 MiB
dd71f1f173
Commit Graph

1184 Commits

Author SHA1 Message Date
Andrey Hristov
dd71f1f173 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-07-08 20:27:14 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Johannes Schlüter
631bb27dca Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/acinclude.m4
 2013-07-03 16:58:20 +02:00
Johannes Schlüter
0265c2d961 Make sure result is initilized 
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
 2013-07-03 16:53:09 +02:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Andrey Hristov
9d2dda9058 Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C 2013-05-14 11:26:35 +02:00
Xinchen Hui
e60638faca Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:50:23 +08:00
Xinchen Hui
7b9eabaf51 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:50:02 +08:00
Xinchen Hui
15b554cd9b Also fixed bug #64726 in 5.3 2013-04-27 23:49:43 +08:00
Xinchen Hui
1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui
8f5a534b21 Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed) 2013-04-27 23:41:31 +08:00
Xinchen Hui
d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui
c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Andrey Hristov
64a2a8a753 relax the check 2013-02-22 13:50:04 +01:00
Andrey Hristov
1643d4ed56 Add some parameter checks 2013-02-22 13:17:46 +01:00
Andrey Hristov
a5b426eeff update test case 2013-02-08 18:28:22 +01:00
Andrey Hristov
43ecd8fe1b mysqli_savepoint()/mysqli_release_savepoint() 2013-02-08 18:09:50 +01:00
Andrey Hristov
0da369ae50 Add the constants needed for mysqli_commit(), _rollback() and 
begin_transaction()
 2013-02-08 17:05:25 +01:00
Andrey Hristov
afacdecd1f Add support for begin_transaction in libmysql mode. 
Add support for flags and name for commit/rollback in libmysql mode
 2013-02-07 18:45:49 +01:00
ULF WENDEL
f787e21ef5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  MySQL 5.6 EXPIRE PASSWORD flag tests
 2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6 MySQL 5.6 EXPIRE PASSWORD flag tests 2013-01-10 14:51:14 +01:00
Andrey Hristov
846e506a3d Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb Add mysqli support - constants and checking in mysqli_options() for the 
new constant for password expriration
 2013-01-09 19:14:48 +01:00
Andrey Hristov
cde53e7fcd fix different values of mysqli_stmt_affected_rows between libmysql 
and mysqlnd (in favor of libmysql) before execute and after prepare()
 2013-01-07 16:36:21 +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
Xinchen Hui
ea649a5aba Merge branch 'PHP-5.4' into PHP-5.5 2012-12-17 14:30:20 +08:00
Xinchen Hui
05deaf1706 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72 dos2unix & skip on connect fail 2012-12-17 14:29:13 +08:00
Rasmus Lerdorf
5aabf243bf Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:54:44 -08:00
Rasmus Lerdorf
77c4b84ac8 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8 Need connect.inc here 2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
3925683d46 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:42:50 -08:00
Rasmus Lerdorf
d845549257 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622 Fix broken test 
Need to use the configured connection parameters here. We can't assume
the test user has access.
 2012-12-13 16:41:56 -08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Remi Collet
c5d4ee9bed Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63361 Header not installed
 2012-11-25 07:48:44 +01:00
Remi Collet
8d2c44b59d Fixed Bug #63361 Header not installed 
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
 2012-11-25 07:46:02 +01:00
Andrey Hristov
967a1ebe51 add protection against core dumps if the underlying library returns 
0x0 for some reason
 2012-10-18 15:09:17 +02:00
ULF WENDEL
1fafc9b373 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Cover have_ssl=NO and have_ssl=DISABLED
 2012-09-29 18:56:30 +02:00
ULF WENDEL
7aa3d0ae65 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED
 2012-09-29 18:55:51 +02:00
ULF WENDEL
da541ff561 Cover have_ssl=NO and have_ssl=DISABLED 2012-09-29 18:54:54 +02:00
ULF WENDEL
917639d463 Updating expected output in anticipation of mysqlnd_auth.c path 2012-09-29 17:42:00 +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