Commit Graph

93483 Commits

Author SHA1 Message Date
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
Anatol Belski
87a671bba0 reset ext/session to the state of 7.0.2 2016-01-29 11:41:45 +01:00
Anatol Belski
9475243310 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2016-01-29 11:28:38 +01:00
Anatol Belski
efb667e683 update NEWS 2016-01-29 11:27:44 +01:00
Anatol Belski
cb6d045d11 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  refix bug #69111, crash in 5.6 only
2016-01-29 11:25:32 +01:00
Anatol Belski
25108babdb refix bug #69111, crash in 5.6 only 2016-01-29 11:24:19 +01:00
Remi Collet
83947f4282 NEWS 2016-01-29 10:24:40 +01:00
Remi Collet
c0802af52c Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
2016-01-29 10:24:15 +01:00
Remi Collet
a81cb64a96 NEWS 2016-01-29 10:23:42 +01:00
Remi Collet
07d2dcdf09 Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
Only needed with Apache version < 2.4.12 (ex RHEL-7)
2016-01-29 10:20:42 +01:00
Anatol Belski
9599acdef6 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2016-01-29 08:43:13 +01:00
Anatol Belski
d77b28507c update NEWS 2016-01-29 08:42:54 +01:00
Anatol Belski
8ee1ae9748 update NEWS 2016-01-29 08:41:25 +01:00
Anatol Belski
b858224b88 reset ext/session to the state of 7.0.2 2016-01-29 08:37:27 +01:00
Anatol Belski
74e51b3513 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  reset the ext/session to the state of 5.6.17
2016-01-29 08:37:05 +01:00
Anatol Belski
ae6e139c77 reset the ext/session to the state of 5.6.17 2016-01-29 08:33:09 +01:00
Anatol Belski
fc53d7408b update NEWS 2016-01-28 13:58:48 +01:00
Anatol Belski
a1c675e3f2 update NEWS 2016-01-28 13:57:44 +01:00
Anatol Belski
686a17893a add missing headers for SIZE_MAX 2016-01-28 13:46:34 +01:00
Anatol Belski
f4d7bbf4ac backport the escapeshell* functions hardening branch 2016-01-28 13:45:43 +01:00
Anatol Belski
828364e59c add tests 2016-01-28 13:27:26 +01:00
Julien Pauli
df78eacc2f Fixed NEWS file entry 2016-01-28 12:47:53 +01:00
Anatol Belski
89ccd8ad56 Merge branch 'escapeshell_hardened_70' into PHP-7.0.3
* escapeshell_hardened_70:
  extend _SC_ARG_MAX usage onto platforms where it's available
  Fixed bug #71039 exec functions ignore length but look for NULL termination
  Follow up on bug #71270
2016-01-28 12:08:49 +01:00
Anatol Belski
a9048d101f extend _SC_ARG_MAX usage onto platforms where it's available 2016-01-28 12:06:33 +01:00
Dmitry Stogov
6039d2d914 Fixed bug #71474 (Crash because of VM stack corruption on Magento2). 2016-01-28 11:41:15 +03:00
Stanislav Malyshev
88bd7cb418 Use safe alloc functions when calculations are made on sizes.
Fixes bug #71449, bug #71450
2016-01-26 22:33:51 -08:00
Stanislav Malyshev
f379142d66 Fix bug #71459 - Integer overflow in iptcembed() 2016-01-26 17:30:50 -08:00
Stanislav Malyshev
54c210d2ea Fix bug #71459 - Integer overflow in iptcembed() 2016-01-26 17:26:52 -08:00