]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47e21eb cd8c9b0)
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Thu, 13 Oct 2016 06:26:15 +0000 (23:26 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 13 Oct 2016 06:26:15 +0000 (23:26 -0700)
commitff75665663045a96d6f182e24283e6bebb8537fa
treef6ae4861581e041a5e618da5f70079630077edf3tree | snapshot
parent47e21eb5177dae5a02fa397a79bd4bf0b778cd6ecommit | diff
parentcd8c9b06149dc7dc0415524f1d74880fd6f2d25ccommit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl
Zend/zend_alloc.c diff1 | diff2 | blob | history
Zend/zend_multiply.h diff1 | diff2 | blob | history
ext/openssl/openssl.c diff1 | diff2 | blob | history
ext/pcre/php_pcre.c diff1 | diff2 | blob | history
ext/spl/spl_iterators.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.