com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/z end_persist_calc.c
| From: | Dmitry Stogov | Date: | Thu, 09 Jan 2014 09:49:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/z end_persist_calc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75559@lists.php.net to get a copy of this message | ||
Commit: f16a4bc203c9b4c70d9868ed8aa633e5a499c43f
Author: Dmitry Stogov <dmitry@zend.com> Thu, 9 Jan 2014 13:49:54 +0400
Parents: 61e1f79585dd610b0390be4792ef3e98906644af b5fbde9c5bbfc7acc01f0db40b8b5c8d8d8f6c20
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f16a4bc203c9b4c70d9868ed8aa633e5a499c43f
Log:
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)
Changed paths:
MM ext/opcache/zend_persist_calc.c
Diff: