clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,560 Commits 494 Branches 1,367 Tags 788 MiB
0aa7163816
Commit Graph

93560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Zelenka
265ccef39b Rename private.key to private_rsa_1024.key in new openssl_seal test 2016-01-31 18:13:37 +00:00
Jakub Zelenka
d8d20151c3 Merge branch 'PHP-5.6' into PHP-7.0 2016-01-31 14:40:20 +00:00
Jakub Zelenka
ef356912b3 Rewrite OpenSSL SPKI tests to speed them up 
Also fix some CS issue and naming
 2016-01-31 14:28:13 +00:00
Jakub Zelenka
e93ab05489 Add private RSA keys with 2048 and 4096 bit long modulus 2016-01-31 13:57:00 +00:00
Jakub Zelenka
148d013323 Rename private.key to private_rsa_1024.key 2016-01-31 13:54:16 +00:00
Xinchen Hui
e062759401 Fixed bug #71485 (Return typehint on interanal func causes Fatal error when it throws exception). 2016-01-29 22:05:52 -08:00
Xinchen Hui
3dadd654cf Also WIN32 side 2016-01-29 20:38:50 -08:00
Xinchen Hui
01ff25970f Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2016-01-29 20:37:14 -08:00
Robin McCorkell
7806553fd3 Properly read any remaining data when closing FastCGI socket 2016-01-29 20:36:52 -08:00
Anatol Belski
b947aff98d yet one revert 2016-01-29 21:43:14 +01:00
Anatol Belski
ac22f71477 Revert "adjust test for 7.0" 
This reverts commit 7fdb019e66.
 2016-01-29 21:27:22 +01:00
Anatol Belski
6891e6abdf Revert "refix #69111 and one related test" 
This reverts commit 80f7b01258.

Conflicts:
	ext/session/mod_files.c
 2016-01-29 20:59:58 +01:00
Anatol Belski
3d90531d1e Revert "fix yet another leak" 
This reverts commit 39084ccc68.
 2016-01-29 20:58:00 +01:00
Anatol Belski
d1d3c0832e add XFAIL 2016-01-29 20:57:05 +01:00
Anatol Belski
ebcfe7618d Revert "refix #69111 and one related test" 
This reverts commit 80f7b01258.
 2016-01-29 20:50:14 +01:00
Anatol Belski
7f977c13dc Revert "fix tests" 
This reverts commit d964ccba40.
 2016-01-29 20:49:52 +01:00
Anatol Belski
57d9797b6f Revert "fix leak in 7.0" 
This reverts commit ee49df011c.
 2016-01-29 20:46:47 +01:00
Anatol Belski
6cc1c962f7 remove NEWS entry 2016-01-29 20:40:27 +01:00
Anatol Belski
16a99c6368 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add XFAIL
  Revert "fix leak in 5.6"
 2016-01-29 20:37:46 +01:00
Anatol Belski
b7dadfae87 add XFAIL 2016-01-29 20:36:11 +01:00
Anatol Belski
40b9f52c2c Revert "fix leak in 5.6" 
This reverts commit fa548e5ca9.
 2016-01-29 20:33:39 +01:00
Anatol Belski
80f7b01258 refix #69111 and one related test 
It is the least evil as the test just reduces the fail path. 5.6 seems
still broken in this regard, a backport should follow if travis is happy.
 2016-01-29 19:55:50 +01:00
Guillaume Outters
d01566fe2f opcache config.m4: Use = for comparison 
HAVE_OPCACHE_FILE_CACHE and HAVE_HUGE_CODE_PAGES where not
correctly set on old systems (e.g. FreeBSD 8), due to a PHPism in
config.m4.  Using the standard shell operator = instead of == makes
the configure script produce the correct output.
 2016-01-29 17:02:21 +01:00
Guillaume Outters
10b2172f01 phpdbg config.m4: make it detectable by old shells 
--enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator).
Replacing == with the historic = makes it pass.
 2016-01-29 17:01:04 +01:00
Anatol Belski
6ba7acee5c fix tests 2016-01-29 16:34:10 +01:00
Anatol Belski
d964ccba40 fix tests 2016-01-29 16:32:27 +01:00
Anatol Belski
39084ccc68 fix yet another leak 2016-01-29 16:03:33 +01:00
Derick Rethans
eae5914554 Merge branch 'PHP-5.6' into PHP-7.0 2016-01-29 15:34:47 +01:00
Derick Rethans
deba5275eb Added entry to NEWS 2016-01-29 15:34:36 +01:00
Derick Rethans
3523c0a45f Merge branch 'PHP-5.6' into PHP-7.0 2016-01-29 15:30:31 +01:00
Derick Rethans
1a86825688 Use the new timelib function for comparing times 2016-01-29 15:28:11 +01:00
Willem-Jan
2aeef4e539 Test + support for negative timestamps with microtime 2016-01-29 15:22:22 +01:00
Willem-Jan
1bbbc47e79 Also test against equality 2016-01-29 15:22:22 +01:00
Willem-Jan
5879721936 Compare agaist fraction when sse are equal 2016-01-29 15:22:22 +01:00
Willem-Jan
a0237259e9 Added test for comparing dates with microseconds 2016-01-29 15:22:22 +01:00
Derick Rethans
822ca45220 Merge in changes in timelib 2016.01 2016-01-29 15:21:55 +01:00
Anatol Belski
7421acfc90 fix wrong gc sequence 2016-01-29 15:20:44 +01:00
Anatol Belski
d2c752d7e9 fix wrong gc sequence 2016-01-29 15:18:59 +01:00
Anatol Belski
ee49df011c fix leak in 7.0 2016-01-29 14:48:05 +01:00
Anatol Belski
a0d7a66756 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leak in 5.6
 2016-01-29 13:59:28 +01:00
Anatol Belski
fa548e5ca9 fix leak in 5.6 2016-01-29 13:56:11 +01:00
Anatol Belski
b783d0b338 revert the API string as well 2016-01-29 13:24:09 +01:00
Anatol Belski
d9eea2c209 revert the API string as well 2016-01-29 12:52:41 +01:00
Anatol Belski
45f5ae8943 update NEWS 
Fix for #70720 is postphoned to 7.0.4
 2016-01-29 12:46:44 +01:00
Anatol Belski
dd3d10cef1 update NEWS 2016-01-29 12:42:46 +01:00
Anatol Belski
47af41b785 Revert "Fix #70720" 
This reverts commit ff7ed9021c.
 2016-01-29 12:41:43 +01:00
Anatol Belski
7fdb019e66 adjust test for 7.0 2016-01-29 12:29:41 +01:00
Anatol Belski
a068047f62 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #69111
 2016-01-29 12:29:05 +01:00
Anatol Belski
4b0feeb8fa add test for bug #69111 2016-01-29 12:27:35 +01:00
Anatol Belski
e92abf850e sync NEWS 2016-01-29 11:42:57 +01:00