mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-24 17:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
72,786 Commits 503 Branches 1,387 Tags 845 MiB
5bf7b08efd
Commit Graph

1161 Commits

Author SHA1 Message Date
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
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
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
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
ULF WENDEL
4969c7d50a Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  sapi/litespeed/lsapi_main.c: Fix bug #63228
  fix test
  constify
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
 2012-09-29 09:56:55 +02:00
Andrey Hristov
6fbcf69375 fix test 2012-10-12 10:35:45 +02:00
Xinchen Hui
4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Andrey Hristov
06dfb96bf5 add a check for libmysql 2012-10-03 14:14:59 +02:00
ULF WENDEL
a2098ca9eb SHA256 authentication tests 2012-09-29 09:47:23 +02:00
andrey
263b37bee1 change public key setting to PERDIR and finish code that allows 
to set the key file programatically per mysqli_options()
 2012-09-25 18:26:02 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd 
Automatic switchover to SSL with plain-text password is not part of this
 2012-09-25 14:04:36 +02:00
Xinchen Hui
5f9023ca38 Correct PHP version 2012-09-05 23:41:42 +08:00
Xinchen Hui
2af7a76822 Merge branch 'PHP-5.4' 2012-08-22 13:52:04 +08:00
Xinchen Hui
4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui
e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Nikita Popov
294e7c295f Annother attempt at fixing the mysqli_fetch_field tests 
Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.
 2012-08-17 19:47:59 +02:00
Nikita Popov
8cccc5c37d Revert "Try to fix mysqli_field tests" 
This reverts commit 018395efaf.

This change didn't really make sense in hindsight. Looking for some other
fix.
 2012-08-16 21:56:48 +02:00
Nikita Popov
018395efaf Try to fix mysqli_field tests 
Those tests seem to fail when people have a different default collation, so
try to fix by specifying utf8_general_ci explicitely.
 2012-08-15 14:50:24 +02: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