Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Invalidate path even if the file was deleted
  • Loading branch information
Mikhail Galanin authored and iluuu1994 committed Oct 3, 2023
commit 736a42030e843ceccefdec2b9df1cae7fec9cafc
9 changes: 7 additions & 2 deletions ext/opcache/ZendAccelerator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,7 @@ int zend_accel_invalidate(zend_string *filename, bool force)
{
zend_string *realpath;
zend_persistent_script *persistent_script;
zend_bool file_found = true;

if (!ZCG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) {
return FAILURE;
Expand All @@ -1330,7 +1331,10 @@ int zend_accel_invalidate(zend_string *filename, bool force)
realpath = accelerator_orig_zend_resolve_path(filename);

if (!realpath) {
return FAILURE;
//file could have been deleted, but we still need to invalidate it.
//so instead of failing, just use the provided filename for the lookup
realpath = zend_string_copy(filename);
file_found = false;
}

if (ZCG(accel_directives).file_cache) {
Expand Down Expand Up @@ -1366,12 +1370,13 @@ int zend_accel_invalidate(zend_string *filename, bool force)

file_handle.opened_path = NULL;
zend_destroy_file_handle(&file_handle);
file_found = true;
}

accelerator_shm_read_unlock();
zend_string_release_ex(realpath, 0);

return SUCCESS;
return file_found ? SUCCESS : FAILURE;
}

static zend_string* accel_new_interned_key(zend_string *key)
Expand Down
26 changes: 26 additions & 0 deletions ext/opcache/tests/opcache_invalidate_deleted_file.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
opcache_invalidate() should invalidate deleted file
--EXTENSIONS--
opcache
--INI--
opcache.enable_cli=1
opcache.validate_timestamps=0
--FILE--
<?php

$file = __DIR__ . DIRECTORY_SEPARATOR . pathinfo(__FILE__, PATHINFO_FILENAME) . '.inc';
file_put_contents($file, <<<PHP
<?php
return 42;
PHP);
var_dump(include $file);
unlink($file);
var_dump(include $file);
opcache_invalidate($file);
var_dump(@(include $file));

?>
--EXPECT--
int(42)
int(42)
bool(false)