1
0
mirror of https://github.com/php/php-src.git synced 2026-04-17 21:11:02 +02:00
Commit Graph

827 Commits

Author SHA1 Message Date
Anatol Belski
67b99b698f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Parametrize the expected value to avoid platform false positives
2017-10-24 18:38:23 +02:00
Anatol Belski
e19bf29b53 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Parametrize the expected value to avoid platform false positives
2017-10-24 18:36:56 +02:00
Anatol Belski
45ac5edbd9 Parametrize the expected value to avoid platform false positives 2017-10-24 18:33:21 +02:00
Anatol Belski
4d31ee9043 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
2017-10-24 13:44:03 +02:00
Anatol Belski
5efbcd1882 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
2017-10-24 13:38:48 +02:00
Anatol Belski
a7815e63bd Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian() 2017-10-24 11:28:17 +02:00
Anatol Belski
d8881f4eb4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix array access on undeclared properties in DateInterval
2017-10-09 15:38:21 +02:00
Anatol Belski
f48abfa902 Fix array access on undeclared properties in DateInterval 2017-10-09 15:35:38 +02:00
Derick Rethans
7121b8d0a2 Do the revert properly, and put back fraction support in 7.1 2017-08-16 15:59:56 +01:00
Derick Rethans
547f9fd389 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-16 15:20:45 +01:00
Derick Rethans
60a6feed07 Revert "Upgrade timelib to 2017.05beta7"
This reverts commit bdd56f3107.
2017-08-16 15:19:18 +01:00
Derick Rethans
584db6f38f Merged PHP-7.0 by hand due to conflicts. 2017-08-15 15:06:18 +01:00
Derick Rethans
bdd56f3107 Upgrade timelib to 2017.05beta7 2017-08-15 14:10:23 +01:00
Anatol Belski
1fdc518971 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #75002 Null Pointer Dereference in timelib_time_clone
2017-08-02 16:41:48 +02:00
Derick Rethans
b112d09013 Fixed bug #75002 Null Pointer Dereference in timelib_time_clone 2017-08-02 16:40:48 +02:00
Joe Watkins
ccd0ff3ac4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74852 (property_exists returns true on unknown DateInterval property)
2017-07-10 06:53:59 +01:00
jhdxr
5cf54f6073 Fixed bug #74852 (property_exists returns true on unknown DateInterval property) 2017-07-10 06:53:22 +01:00
Stanislav Malyshev
0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
2017-07-04 21:18:10 -07:00
Stanislav Malyshev
f76a6cd023 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix tests
2017-07-04 21:05:06 -07:00
Stanislav Malyshev
e46d589624 Fix tests 2017-07-04 20:12:57 -07:00
Remi Collet
c39a10bc6e relax this test again (still encounter erratic failure) 2017-06-06 17:20:33 +02:00
andrewnester
48598a2302 Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval 2017-06-01 08:07:11 +01:00
Derick Rethans
fc87715950 Added a test case for (docs) bug #74652 2017-05-25 10:57:09 -04:00
Joe Watkins
aa0a2e8c58 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Avoid exact floating point comparison
2017-04-20 06:42:44 +01:00
Steve Walk
9b7f13cb1b Avoid exact floating point comparison 2017-04-20 06:42:20 +01:00
Joe Watkins
bc3c9a06e0 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74080 Add datetime constant for RFC7231
2017-04-17 08:09:24 +01:00
Craig Duncan
618d97962a Fixed bug #74080 Add datetime constant for RFC7231 2017-04-17 08:08:54 +01:00
Remi Collet
cec720857a relax more this test 2017-03-29 07:38:40 +02:00
Remi Collet
d11211fb53 relax test failing in fast computer 2017-03-29 07:01:14 +02:00
Derick Rethans
727b21c839 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-27 18:01:30 +01:00
Derick Rethans
1f8fc0fb56 Forgot to update the output in the test too 2017-03-27 18:01:22 +01:00
Derick Rethans
f326cfc513 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-27 11:28:35 +01:00
Derick Rethans
eb5d4bcd4f Fixed test for #33415 due to data fixes. 2017-03-27 11:28:16 +01:00
Derick Rethans
ee49d4b4be Added a test case to make sure microseconds work. 2017-03-24 11:39:32 +00:00
Nikita Popov
6635639b75 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 16:45:28 +01:00
mcq8
b224e74267 Fixed bug #72096 Swatch time value incorrect for dates before 1970 2017-03-09 16:44:02 +01:00
Derick Rethans
a7ff583e7e Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6 Fixed tests after tzdb removed abbreviations 2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f Make sure we anchor this test to February 2017-03-02 11:27:44 +00:00
Nikita Popov
bc1807dbe2 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2 Fix bug73858.phpt to work in months without 31 days
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
2017-03-02 12:13:06 +01:00
Derick Rethans
d28df113d5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 20:19:02 +00:00
Derick Rethans
f0519f4837 Upgrade timelib to 2017.01
This fixes:

- Fixed bug #72719 (Relative datetime format ignores weekday on sundays only).
- Fixed bug #73294 (DateTime wrong when date string is negative).
- Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with UTC
  offset).
- Fixed bug #73858 (first/last day of' flag is not being reset).
- Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
  if $date is a Sunday).
- Fixed bug #74057 (wrong day when using "this week" in strtotime).
2017-02-12 20:17:01 +00:00
Joe Watkins
d11bed5909 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add test ini_set with invalid time zone
2017-01-16 04:13:26 +00:00
Niklas Keller
cc9893eb44 Add test ini_set with invalid time zone
Wasn't covered before according to gcov.php.net.
2017-01-16 04:13:01 +00:00
Nikita Popov
8467c5c9bf Fix year dependent test 2017-01-01 12:15:52 +01:00
Dmitry Stogov
c8dc23e9ba Fixed test 2016-11-17 13:43:45 +03:00
Joe Watkins
77efe76bf7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  news entry for #1787
  move declaration of vars to top
  add test for #69587
  fix bug #69587 DateInterval properties and isset
2016-11-13 05:34:11 +00:00
jhdxr
9ad2083773 add test for #69587 2016-11-13 05:32:24 +00:00
Joe Watkins
d1910f66e5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  added a test for date_interval_format function
  Merge branch 'pull-request/2198'
2016-11-12 09:59:24 +00:00