clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,577 Commits 494 Branches 1,367 Tags 802 MiB
0a8777a515
Commit Graph

30797 Commits

Author SHA1 Message Date
Andrey Hristov
0a8777a515 Merge branch 'master' of ssh://git.php.net/php-src 2012-12-19 15:07:03 +01:00
Andrey Hristov
c780ddbb50 Merge branch 'PHP-5.4' 
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
 2012-12-19 15:05:47 +01:00
Remi Collet
f98a03b144 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix failing test on Linux build
 2012-12-19 10:25:16 +01:00
Remi Collet
828bb4d44d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix failing test on Linux build
 2012-12-19 10:25:05 +01:00
Remi Collet
3732fa95c5 fix failing test on Linux build 2012-12-19 10:23:57 +01:00
Andrey Hristov
1f7c46b579 be cautious about the result of strrchr 2012-12-18 16:21:05 +01:00
Xinchen Hui
73c9889663 Merge branch 'PHP-5.5' 2012-12-17 14:30:41 +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
Xinchen Hui
6f452126ac Merge branch 'PHP-5.5' 2012-12-17 12:58:38 +08:00
Xinchen Hui
ea5132866f Merge branch 'PHP-5.4' into PHP-5.5 2012-12-17 12:58:12 +08:00
Xinchen Hui
2f7f57a407 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-17 12:57:37 +08:00
Xinchen Hui
d2cc097049 Fix failed test 2012-12-17 12:56:55 +08:00
Rasmus Lerdorf
42f3344d85 Merge branch 'PHP-5.5' 2012-12-13 16:54:51 -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
c701aeba0b Merge branch 'PHP-5.5' 2012-12-13 16:43:04 -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
Rasmus Lerdorf
17b803d448 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 16:17:34 -08:00
Rasmus Lerdorf
8fbeb6e342 Merge branch 'PHP-5.4' 2012-12-13 16:16:45 -08:00
Rasmus Lerdorf
538d8338c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254 Fix broken test 
This was missing a %s for the path here
 2012-12-13 16:13:37 -08:00
Arpad Ray
c66e54d72e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix #63379 - Don't reset mod_user_is_open in destroy
 2012-12-14 00:03:08 +00:00
Arpad Ray
61bf1f4ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #63379 - Don't reset mod_user_is_open in destroy
 2012-12-13 23:59:34 +00:00
Arpad Ray
6566ea6173 Fix #63379 - Don't reset mod_user_is_open in destroy 
The parent handler is still open so the reset here was in error.
 2012-12-13 23:51:43 +00:00
Anatoliy Belsky
54a04d2553 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed mysqlnd compilation in debug mode on windows
 2012-12-13 15:06:15 +01:00
Anatoliy Belsky
bef54e5365 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows
 2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f Fixed mysqlnd compilation in debug mode on windows 2012-12-13 15:01:01 +01:00
Xinchen Hui
4d2593e1be Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 10:45:33 +08:00
Xinchen Hui
1f516510b7 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2 MFH 2012-12-13 10:44:14 +08:00
Xinchen Hui
3516b9857f Merge branch 'license_fix' of https://github.com/leight/php-src 2012-12-13 10:38:20 +08:00
Remi Collet
1f73ce3ed6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Really fix test pdo_mysql_class_constants.phpt
 2012-12-12 16:58:51 +01: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
Leigh
349baa3da4 Fixed license 
Looks like a find and replace gone wrong.
 2012-12-12 12:14:52 +00:00
Remi Collet
261995e02a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #63738 unpack: back result with Z format
 2012-12-11 16:34:51 +01:00
Remi Collet
4d8d5d83fc Fixed Bug #63738 unpack: back result with Z format 
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
 2012-12-11 16:30:08 +01:00
Adam Harvey
b10460dc4b Merge branch 'PHP-5.5' 2012-12-11 19:58:04 +08:00
Adam Harvey
8bb106d20c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
 2012-12-11 19:53:02 +08:00
Adam Harvey
2d1694d4eb Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers. 
Fixes bug #63737 (json_decode does not properly decode with options parameter).
 2012-12-11 19:51:30 +08:00
Adam Harvey
ac0fb01a21 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Deprecate ext/mysql.
 2012-12-10 22:26:17 +08:00
Adam Harvey
b7091aaf01 Deprecate ext/mysql. 
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
 2012-12-10 22:12:09 +08:00
Sebastian Bergmann
6fc2ecaaf2 Merge branch 'PHP-5.5' 2012-12-06 09:30:47 +01:00
Sebastian Bergmann
eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Sara Golemon
5ac35770f4 Add UConverter class (ICU's UConverter API) 
RFC at http://wiki.php.net/rfc/uconverter
 2012-12-05 15:07:36 -08:00
Dmitry Stogov
bc7857169a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use get_gc instead of hacks of get_properties
 2012-12-05 17:59:46 +04:00