1
0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Commit Graph

81313 Commits

Author SHA1 Message Date
Dmitry Stogov
066ea2204e Avoid in-place modification 2014-05-28 10:15:15 +04:00
Dmitry Stogov
cf603fb960 Reference counter in phpng may have a bit different meaning and must not be the same 2014-05-28 02:16:21 +04:00
Dmitry Stogov
6c4b30eb07 Use new zend_hash API 2014-05-28 02:13:45 +04:00
Dmitry Stogov
2dce4cb06c Avoid in-place conversion 2014-05-28 01:29:37 +04:00
Dmitry Stogov
864aa7746f Fixed refcounting 2014-05-28 01:28:38 +04:00
Matteo Beccati
5270563167 Escape non-printable characters in the junit XML output
XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
2014-05-27 12:04:52 +02:00
Xinchen Hui
4c9f6caf39 Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-05-27 17:48:47 +08:00
Xinchen Hui
1966116791 retval's initializing is already taken by zend_call_function 2014-05-27 17:48:34 +08:00
Matteo Beccati
1b08c885ba Fixed broken XML junit output due to escaping of CDATA sections
I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792
2014-05-27 11:08:03 +02:00
Xinchen Hui
3a1f79d51d Fixed bug #47407 2014-05-27 11:48:25 +08:00
Dmitry Stogov
e34a6e9211 Use new zend_hash API 2014-05-27 00:38:58 +04:00
Dmitry Stogov
05d0df4706 Use new zend_hash API 2014-05-26 21:29:35 +04:00
Nikita Popov
4ee14c6f8d Fix ** operator with references 2014-05-26 18:17:55 +02:00
Nikita Popov
ff72c7bfd7 Add test for previous commit 2014-05-26 18:13:16 +02:00
Nikita Popov
ec7b5e0b19 Fix incdec of ref object properties
This fixes a number of infinite loops in the Symfony testsuite. It
took an obscene amount of time to track this down :/
2014-05-26 18:00:15 +02:00
Dmitry Stogov
40256e0f9c Use specialized functions instead of macros 2014-05-26 17:16:16 +04:00
Dmitry Stogov
22f6cf91d5 Optimize func_get_args() to build packed array 2014-05-26 17:15:52 +04:00
Xinchen Hui
0df38cdcb6 Merge branch 'master' into phpng 2014-05-26 17:32:53 +08:00
Xinchen Hui
b5f90e5103 Save some unnecessary zval copying 2014-05-26 17:25:57 +08:00
Xinchen Hui
bd4b9837e9 Improve call_user_function performance
params are all zval * now, and retval will be initialized in
zend_call_function.

maybe we can make call_user_function as a macro proxy to
call_user_function_ex later.
2014-05-26 17:16:22 +08:00
Dmitry Stogov
b66728aabb Removed useless initializations 2014-05-26 11:42:58 +04:00
Xinchen Hui
cdacf4c90a Merge branch 'PHP-5.6' 2014-05-26 15:40:57 +08:00
Xinchen Hui
b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Xinchen Hui
70699d7f68 Update NEWs and add a test 2014-05-26 15:40:26 +08:00
Dmitry Stogov
79a3e44a0c Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  Finished persistent PDO implement
2014-05-26 10:53:14 +04:00
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
Xinchen Hui
9fa9da4831 Finished persistent PDO implement 2014-05-26 14:17:45 +08: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
066c1d5451 This seems better 2014-05-26 12:05:21 +08:00
Xinchen Hui
02fde346f8 Save one zval copy 2014-05-26 11:49:43 +08:00
Xinchen Hui
922285ec55 Don't use cast (compiler friendly) 2014-05-26 11:05:04 +08:00
Nikita Popov
0ade00c844 Fix print_flat_hash for objects 2014-05-25 20:07:29 +02:00
Nikita Popov
bdeeddbb80 Fix parts of .gdbinit 2014-05-25 19:04:33 +02:00
Nikita Popov
43cf92edf6 Fix in_array (strict) with references 2014-05-25 18:19:00 +02:00
Nikita Popov
6714770d83 Fix ZTS build 2014-05-25 18:11:24 +02:00
Xinchen Hui
bc357eaf3f Fixed apply_func_args_t 2014-05-25 20:04:35 +08:00
Xinchen Hui
0175d994c0 Fixed apply_func_arg_t, and it's better not using cast (compiler friendly) 2014-05-25 19:56:51 +08:00
Xinchen Hui
c2082ece52 Fixed apply_func_t (they should be broken before) 2014-05-25 18:32:35 +08:00
Matteo Beccati
5d7f82745f Fix broken Junit output with --disable-cgi 2014-05-25 00:10:00 +02:00
Matteo Beccati
2c8ce5ba17 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:56 +02:00
Matteo Beccati
370256ad4b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:41 +02:00
Matteo Beccati
980c63651c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:32 +02:00
Matteo Beccati
f9357b44f3 Fix broken Junit output with --disable-cgi 2014-05-25 00:07:52 +02:00
Xinchen Hui
00e69ba164 typo 2014-05-24 21:45:07 +08:00
Xinchen Hui
b87cff66b8 fci->retval is always set 2014-05-24 21:37:15 +08:00
Xinchen Hui
60e01e5d64 Added folder mark and codes style 2014-05-24 21:35:36 +08:00
Xinchen Hui
dc8a53d4ba Merge branch 'PHP-5.6' 2014-05-24 21:11:26 +08:00
Xinchen Hui
666197b8cc Added folder mark 2014-05-24 21:11:13 +08:00