Skip to content

Commit

Permalink
Merge branch 'PHP-7.0' into PHP-7.1
Browse files Browse the repository at this point in the history 
* PHP-7.0:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
  • Loading branch information
@weltling @krakjoe
weltling authored and krakjoe committed Oct 24, 2017
1 parent 5c81d85 commit 5c0455b
Show file tree
Hide file tree
Showing 5 changed files with 1,066 additions and 925 deletions.

0 comments on commit 5c0455b

Please sign in to comment.