0df38cdcb6
Merge branch 'master' into phpng
2014-05-26 17:32:53 +08:00
b5f90e5103
Save some unnecessary zval copying
2014-05-26 17:25:57 +08:00
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
b66728aabb
Removed useless initializations
2014-05-26 11:42:58 +04:00
cdacf4c90a
Merge branch 'PHP-5.6'
2014-05-26 15:40:57 +08:00
b0b0be176f
Merge branch 'PHP-5.5' into PHP-5.6
2014-05-26 15:40:50 +08:00
70699d7f68
Update NEWs and add a test
2014-05-26 15:40:26 +08:00
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
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 fdb2709fdb2709#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
9fa9da4831
Finished persistent PDO implement
2014-05-26 14:17:45 +08:00
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
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
19be8b676c
Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:10:59 +04:00
066c1d5451
This seems better
2014-05-26 12:05:21 +08:00
02fde346f8
Save one zval copy
2014-05-26 11:49:43 +08:00
922285ec55
Don't use cast (compiler friendly)
2014-05-26 11:05:04 +08:00
0ade00c844
Fix print_flat_hash for objects
2014-05-25 20:07:29 +02:00
bdeeddbb80
Fix parts of .gdbinit
2014-05-25 19:04:33 +02:00
43cf92edf6
Fix in_array (strict) with references
2014-05-25 18:19:00 +02:00
6714770d83
Fix ZTS build
2014-05-25 18:11:24 +02:00
bc357eaf3f
Fixed apply_func_args_t
2014-05-25 20:04:35 +08:00
0175d994c0
Fixed apply_func_arg_t, and it's better not using cast (compiler friendly)
2014-05-25 19:56:51 +08:00
c2082ece52
Fixed apply_func_t (they should be broken before)
2014-05-25 18:32:35 +08:00
5d7f82745f
Fix broken Junit output with --disable-cgi
2014-05-25 00:10:00 +02:00
2c8ce5ba17
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix broken Junit output with --disable-cgi
2014-05-25 00:08:56 +02:00
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
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
f9357b44f3
Fix broken Junit output with --disable-cgi
2014-05-25 00:07:52 +02:00
00e69ba164
typo
2014-05-24 21:45:07 +08:00
b87cff66b8
fci->retval is always set
2014-05-24 21:37:15 +08:00
60e01e5d64
Added folder mark and codes style
2014-05-24 21:35:36 +08:00
dc8a53d4ba
Merge branch 'PHP-5.6'
2014-05-24 21:11:26 +08:00
666197b8cc
Added folder mark
2014-05-24 21:11:13 +08:00
9b730bf4bf
Merge branch 'new-tests' of https://github.com/SammyK/php-src
2014-05-24 15:43:37 +08:00
4a773c0e58
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Further test fixes for the fdb2709fdb2709
2014-05-24 08:06:53 +02:00
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
bbdbb6f7eb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Further test fixes for the fdb2709fdb2709
2014-05-23 15:23:55 +00:00
80a2716b56
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Further test fixes for the fdb2709fdb2709
2014-05-23 15:23:15 +00:00
2260fca3dd
Further test fixes for the fdb2709 breakage.
2014-05-23 15:22:26 +00:00
6d9cc92238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix broken test caused by fdb2709
2014-05-23 15:14:00 +00:00
319611ffbd
Fix broken test caused by fdb2709.
2014-05-23 15:07:19 +00:00
8fbf4027e2
Remove incorrect EMPTY_SWITCH_DEFAULT_CASE() usage
2014-05-23 14:32:52 +02:00
c838f6c5b9
Remove UB in signed printing macro
...
Signed->unsigned conversion and unsigned negation are well-defined
(unlike signed negation for LONG_MIN.)
2014-05-23 13:15:08 +02:00
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
e2bbe95310
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
2014-05-23 05:51:13 +00:00
93a98202d0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix run-tests.php with Valgrind >= 3.10.0.
2014-05-22 22:43:39 +00:00
34900eb289
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix run-tests.php with Valgrind >= 3.10.0.
2014-05-22 22:37:57 +00:00
e5e6ba093f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix run-tests.php with Valgrind >= 3.10.0.
Conflicts:
run-tests.php
2014-05-22 22:37:47 +00:00
5d1bfd6fbf
Fix run-tests.php with Valgrind >= 3.10.0.
...
The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.
2014-05-22 22:37:08 +00:00
4778586896
Fix typo
2014-05-22 19:00:25 +02:00
Xinchen Hui