]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 522dbc0 ff75665)
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Thu, 13 Oct 2016 06:26:35 +0000 (23:26 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 13 Oct 2016 06:26:35 +0000 (23:26 -0700)
* PHP-7.1:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.