clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,372 Commits 491 Branches 1,363 Tags 846 MiB
9ad748edfb
Commit Graph

71372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
c9265b1acd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix skipifs
 2012-08-14 14:13:03 -07:00
Christopher Jones
3e0b33ed62 Merge branch 'skipif1' into PHP-5.3 
* skipif1:
  Fix skipifs
 2012-08-14 14:12:27 -07:00
Christopher Jones
6524a530df Fix skipifs 
Skipifs were referencing an unset variable
 2012-08-14 14:10:20 -07:00
Christopher Jones
0b5fd34e1c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Small test tidy up
 2012-08-14 11:45:45 -07:00
Christopher Jones
2b934dfdf9 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Small test tidy up
 2012-08-14 11:45:24 -07:00
Christopher Jones
8c3bf96022 Small test tidy up 
Make some test changes so the tests can be run with the CLI webserver
 2012-08-14 11:41:36 -07:00
Xinchen Hui
d43a6cda42 Merge branch 'PHP-5.4' 2012-08-15 01:26:33 +08:00
Xinchen Hui
1a527397cc better fix & this test pass now 2012-08-15 01:25:31 +08:00
Xinchen Hui
cd4e5d20d9 Merge branch 'PHP-5.4' 2012-08-15 01:08:48 +08:00
Xinchen Hui
6bafbb9abf Merge branch 'PHP-5.3' into PHP-5.4 2012-08-15 01:08:19 +08:00
Xinchen Hui
8848778a59 Merge fix e7535e06e6 to 5.3 
thanks for reeze.xia@gmail.com notice this
 2012-08-15 01:06:10 +08:00
Reeze Xia
80044a0879 Fix intl tests failed because of missing skipif section 2012-08-15 01:03:56 +08:00
Xinchen Hui
e936f49b20 Merge branch 'PHP-5.4' 2012-08-15 00:47:45 +08:00
Xinchen Hui
3ba07c2ca3 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-15 00:47:08 +08:00
Xinchen Hui
bec5e10155 update NEWS 2012-08-15 00:46:56 +08:00
Xinchen Hui
a5a409ebff Fixed bug (segfault due to retval is not initialized) 2012-08-15 00:44:47 +08:00
Xinchen Hui
9e2530bfe4 Merge branch 'PHP-5.4' 2012-08-15 00:32:42 +08:00
Xinchen Hui
9be55beb91 Attempt to fix segfault due to retval is not initialized 2012-08-15 00:31:57 +08:00
Xinchen Hui
8c02ad7d15 Merge branch 'PHP-5.4' 2012-08-15 00:26:09 +08:00
Xinchen Hui
b2fe342d04 improve the fix 2012-08-15 00:25:06 +08:00
Xinchen Hui
d3ad2d72ba Merge branch 'PHP-5.4' 2012-08-15 00:16:05 +08:00
Xinchen Hui
da3660a4c4 Fixed bug (segfault due to PS(mod_user_implemented) not be reseted when closing handler call exit) 2012-08-15 00:15:34 +08:00
Nikita Popov
bb5417bfe0 Merge branch 'PHP-5.4' 2012-08-14 17:38:27 +02:00
Nikita Popov
49e91151c0 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 17:37:10 +02:00
Nikita Popov
e1c610fb44 Fix exif test failure 
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
 2012-08-14 17:33:38 +02:00
Xinchen Hui
154fe7486d typo 2012-08-14 14:17:27 +08:00
Xinchen Hui
f82be0550b add test for alone try block, and update test scripts summary 2012-08-14 14:08:38 +08:00
Xinchen Hui
dacd918dc7 Merge branch 'PHP-5.4' 2012-08-14 14:03:56 +08:00
Xinchen Hui
8091256948 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 14:03:05 +08:00
Xinchen Hui
da14cdd6f3 Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3 2012-08-14 13:58:15 +08:00
Xinchen Hui
c64f4e736c Add functions declarations, use tabs 2012-08-14 08:59:40 +08:00
Nikita Popov
5bf4c5f82c Merge branch 'PHP-5.4' 2012-08-13 22:06:43 +02:00
Nikita Popov
f19351b503 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-13 22:06:18 +02:00
Nikita Popov
7aed239050 Ask for less random data in mcrypt_create_iv 
Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
 2012-08-13 22:01:19 +02:00
Nikita Popov
9bc1af1e58 Rename mcrypt_cbf -> mcrypt_cfb 
Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
 2012-08-13 22:01:03 +02:00
Nikita Popov
7066be50c0 Merge remote-tracking branch 'reeze/fix-phpcredits-bc' 2012-08-13 21:23:06 +02:00
Nikita Popov
544f5ad35b Fix mcrypt_ecb tests after deprecation 2012-08-13 20:30:53 +02:00
Anatoliy Belsky
baea290b6c fix windows build 2012-08-13 19:44:45 +02:00
Nikita Popov
f3192ea6e4 Fix 64bit JSON test 2012-08-13 18:43:03 +02:00
Xinchen Hui
80d5ae3cea Implemented 'finally' keywords for php 
RFC: https://wiki.php.net/rfc/finally
FR: https://bugs.php.net/bug.php?id=32100
and I have got some improvment ideas(performance), will implemented
later. thanks
 2012-08-13 21:48:39 +08:00
Xinchen Hui
e51acee43d Merge branch 'PHP-5.4' 2012-08-13 11:04:05 +08:00
Xinchen Hui
212cfb95d1 more test script for #62328 2012-08-13 11:03:35 +08:00
Xinchen Hui
253760bb6b Merge branch 'PHP-5.4' 2012-08-12 21:00:01 +08:00
Xinchen Hui
be818e7ea7 Update NEWS 2012-08-12 20:59:33 +08:00
Xinchen Hui
dda0565b53 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45 Fixed bug #62763 (register_shutdown_function and extending class) 2012-08-12 20:58:09 +08:00
Xinchen Hui
9787e7af44 Merge branch 'PHP-5.4' 2012-08-12 12:02:17 +08:00
Xinchen Hui
75f6c8d42c Revert "zend_make_printable_zval choses cast_object over __toString" 
This reverts commit a5dfd41494.
 2012-08-12 12:02:06 +08:00
Xinchen Hui
32c1c5a19f Revert "Test for bug 62328" 
This reverts commit 222ab9da1a.
 2012-08-12 12:02:02 +08:00
Xinchen Hui
786670f536 Update NEWS 2012-08-12 12:00:16 +08:00