clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,287 Commits 491 Branches 1,363 Tags 846 MiB
9dd66e4d53
Commit Graph

35063 Commits

Author SHA1 Message Date
Dmitry Stogov
9dd66e4d53 Merge branch 'master' into phpng 
* master:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/date/php_date.c
 2014-05-26 10:52:43 +04:00
Dmitry Stogov
347b430a03 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:36 +04:00
Dmitry Stogov
24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:10 +04:00
Dmitry Stogov
19be8b676c Fixed issue #183 (TMP_VAR is not only used once) 2014-05-26 10:10:59 +04:00
Xinchen Hui
922285ec55 Don't use cast (compiler friendly) 2014-05-26 11:05:04 +08:00
Nikita Popov
43cf92edf6 Fix in_array (strict) with references 2014-05-25 18:19:00 +02:00
Xinchen Hui
9b730bf4bf Merge branch 'new-tests' of https://github.com/SammyK/php-src 2014-05-24 15:43:37 +08:00
Dmitry Stogov
9eb89dddb1 Use optimized zend_array_dup() function. convert zend_hash_num_elements() and zend_hash_next_free_element() into macros. 2014-05-23 20:37:53 +04:00
Adam Harvey
bbdbb6f7eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
 2014-05-23 15:23:55 +00:00
Adam Harvey
80a2716b56 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
 2014-05-23 15:23:15 +00:00
Adam Harvey
2260fca3dd Further test fixes for the fdb2709 breakage. 2014-05-23 15:22:26 +00:00
Adam Harvey
6d9cc92238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
 2014-05-23 15:14:00 +00:00
Adam Harvey
319611ffbd Fix broken test caused by fdb2709. 2014-05-23 15:07:19 +00:00
Nikita Popov
8fbf4027e2 Remove incorrect EMPTY_SWITCH_DEFAULT_CASE() usage 2014-05-23 14:32:52 +02:00
Nikita Popov
1d8c499b51 Optimize int to string conversion 
Probably platform depedentant, but for me snprintf is terribly
slow.

The code for the long printing is taken from the smart string
API.
 2014-05-23 13:10:50 +02:00
Sammy Kaye Powers
e2bbe95310 Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() 2014-05-23 05:51:13 +00:00
Christopher Jones
94d092dea3 Make a start on phpng compat 2014-05-21 16:43:44 -07:00
Adam Harvey
16a44b993f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:06:30 -05:00
Adam Harvey
549331a925 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:05:08 -05:00
Adam Harvey
d39377924c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:03:24 -05:00
Adam Harvey
fdb2709dd2 Add microseconds to the serialised form of DateTime objects. 
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
 2014-05-21 14:55:52 -05:00
Matteo Beccati
bb7638adbb Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improved test for bug #62479
 2014-05-21 18:59:31 +02:00
Matteo Beccati
b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improved test for bug #62479
 2014-05-21 18:59:14 +02:00
Matteo Beccati
69d4a0b8d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved test for bug #62479
 2014-05-21 18:59:02 +02:00
Matteo Beccati
00a22d4d06 Improved test for bug #62479 2014-05-21 18:58:14 +02:00
Xinchen Hui
f9c3d09f1c Fixed tests but introduce segfaults (behavior same as trunk) 2014-05-21 23:11:02 +08:00
Xinchen Hui
ad1ef9b629 Refactored ext/pdo_firebird (didn't do test) 2014-05-21 15:52:36 +08:00
Xinchen Hui
96617874bd Fixed persistent dba handling 2014-05-21 12:22:59 +08:00
Xinchen Hui
6d12d3bae1 Refactored ext/dba (tests passes, but segfaults need to be fixed) 2014-05-21 11:40:19 +08:00
Andrey Hristov
5d4f9dfff4 Second set of changes to mysqlnd for phpng. 
A bit problematic is that the streams seem not to be completely ported.
Also there are some hacks in the streams about EG(regular_list) and EG(persistent_list)
and these need to be carefully checked. The test suite should catch them, however.
 2014-05-20 21:50:15 +03:00
Andrey Hristov
5d57e17a15 First set of phpng changes for mysqlnd 2014-05-20 19:57:11 +03:00
Andrey Hristov
2312af04a7 Defensive check 2014-05-20 16:41:14 +03:00
Andrey Hristov
759f1009ad Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-20 14:51:16 +03:00
Andrey Hristov
90cad3de2f Add one more check to skip getting into code that will do nothing 2014-05-20 14:50:50 +03:00
Dmitry Stogov
01ef592fba Reverted last commit 2014-05-20 13:55:15 +04:00
Dmitry Stogov
cf4d43e45b Fixed wrong test (see https://bugs.php.net/bug.php?id=67307) 2014-05-20 13:47:10 +04:00
Dmitry Stogov
b5af9e8599 More accurate mysql_close() 2014-05-20 13:19:21 +04:00
Xinchen Hui
b36afe8dd3 Refactoring ext/snmp 2014-05-20 17:02:29 +08:00
Xinchen Hui
f2028491aa Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 
Conflicts:
	ext/pdo_pgsql/tests/common.phpt
 2014-05-20 15:50:41 +08:00
Xinchen Hui
4d299b5092 Revert changes to configs by accident 2014-05-20 11:31:39 +08:00
Xinchen Hui
9c98c1f888 Refactored ext/ldap 2014-05-20 11:29:37 +08:00
Xinchen Hui
e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Dmitry Stogov
0a68835bd4 Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  remove mysqlnd_bt.c as it a long dead code
 2014-05-19 22:21:14 +04:00
Dmitry Stogov
b38bb265d4 Fixed test. The warning actually indicate a problem in master that we didn't repeat in phpng. 2014-05-19 22:20:02 +04:00
Andrey Hristov
e6e5d3535d remove mysqlnd_bt.c as it a long dead code 2014-05-19 20:32:41 +03:00
Dmitry Stogov
78e4f03c22 Fixed incorrect efree() 2014-05-19 16:19:01 +04:00
Dmitry Stogov
a21e6d6ed9 Fixed double free 2014-05-19 13:11:20 +04:00
Dmitry Stogov
35f23d9ee7 Fixed incorrect Z_LVAL() usage 2014-05-19 12:51:48 +04:00
Dmitry Stogov
8506618850 Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  Fixed memleak (3 tests fails now)
  Fixed resources apply_dtor
  It's a zend_array not Hashtable (fixed segfault)
  Fixed segfault
  Refactoring ext/pgsql (incompleted, only compilable)
 2014-05-19 11:53:06 +04:00
Dmitry Stogov
4e521c92ec Prevent crash in case of SQL error 2014-05-19 11:52:33 +04:00