]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Wed, 25 Sep 2013 12:40:56 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 25 Sep 2013 12:40:56 +0000 (05:40 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.
  Fixed issue #135 (segfault in interned strings if initial memory is too low)


Trivial merge