Bug #66471 [Csd]: #if changes to comment out PHP-5.6 functionality for 5.5 and earlier builds

Edit report at https://bugs.php.net/bug.php?id=66471&edit=1 ID: 66471 Updated by: dmitry@php.net Reported by: Terry at ellisons dot org dot uk Summary: #if changes to comment out PHP-5.6 functionality for 5.5 and earlier builds Status: Closed Type: Bug Package: opcache Operating System: N/A PHP Version: master-Git-2014-01-12 (Git) Assigned To: dmitry Block user comment: N Private report: N New Comment: you might be right Previous Comments: ------------------------------------------------------------------------ [2014-01-13 13:56:49] Terry at ellisons dot org dot uk Sorry the orig_interned_empty_string is a residue of my #66442 (now closed) in which I did basically did the same fix as you for interned_empty_string. I agree that you don't have orig_interned_empty_string, but this in itself is a bug, IMO. The reason for the orig_interned_strings_XXXX variables is that you overwrite the GC(interned_strings) context with OPcache's own SHM interned_strings pool during accel_startup. This is then DTORed during accel_shutdown, leaving the GC(interned_strings) context invalid. OPcache should not make implicit assumptions about how the Zend engine uses its own interned_string pool after OPcache shutdown, hence it restores (most) of this context. The exception which is not restored to as-is at accel_startup is GC(interned_empty_string) which is why you need this copy as per my patch at #66442. I am not sure why the #if condition is wrong. Perhaps you could explain. 5.5 and earlier uses "TSRM/tsrm_virtual_cwd.h" 5.6 uses "zend_virtual_cwd.h". It's location is a function of the PHP engine version only, and nothing to do with the OPcache version. ------------------------------------------------------------------------ [2014-01-13 13:30:10] ab@php.net Automatic comment on behalf of dmitry@zend.com Revision: http://git.php.net/?p=php-src.git;a=commit;h=ca550248f18c842c22f3db880b8ea66c553da343 Log: Fixed bug #66471 (Keep backward compatibility) ------------------------------------------------------------------------ [2014-01-13 11:36:55] dmitry@php.net Automatic comment on behalf of dmitry@zend.com Revision: http://git.php.net/?p=php-src.git;a=commit;h=ca550248f18c842c22f3db880b8ea66c553da343 Log: Fixed bug #66471 (Keep backward compatibility) ------------------------------------------------------------------------ [2014-01-13 11:36:24] dmitry@php.net Automatic comment on behalf of dmitry@zend.com Revision: http://git.php.net/?p=php-src.git;a=commit;h=ca550248f18c842c22f3db880b8ea66c553da343 Log: Fixed bug #66471 (Keep backward compatibility) ------------------------------------------------------------------------ [2014-01-13 10:07:30] dmitry@php.net Terry, The patch you proposes is not for PHP-5.6. We don't have orig_interned_empty_string there (and never had it). The #if condition for zend_virtual_cwd.h selection is wrong. Anyway, I understood you idea and it may have sense. ------------------------------------------------------------------------ The remainder of the comments for this report are too long. To view the rest of the comments, please view the bug report online at https://bugs.php.net/bug.php?id=66471 -- Edit this bug report at https://bugs.php.net/bug.php?id=66471&edit=1