]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)
commitf16a4bc203c9b4c70d9868ed8aa633e5a499c43f
tree33a2828db32e75c21b26065481d7f2af3dff8413
parent61e1f79585dd610b0390be4792ef3e98906644af
parentb5fbde9c5bbfc7acc01f0db40b8b5c8d8d8f6c20
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
ext/opcache/zend_persist_calc.c