diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-13 14:10:53 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-13 14:10:53 -0700 |
| commit | d52dbd569fd0f68ec2c79a96f1a3466c71ef549e (patch) | |
| tree | 229c4412dc163d13a880f2650c1499ea02065e31 /ext/opcache/ZendAccelerator.c | |
| parent | e5678c9b95a68c28f40c43217e299eb22780a526 (diff) | |
| parent | 9eaffd34c123ae5782054cd32bf6caa50ff2b7d2 (diff) | |
| download | php-git-d52dbd569fd0f68ec2c79a96f1a3466c71ef549e.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Adam Harvey (3) and others
# Via Adam Harvey (2) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
fix broken sha2 configure tests
Fixed minor bug in test.
Move NEWS entries to correct version
Fix bug #64782: SplFileObject constructor make $context optional
Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
Fix bug #65548: Comparison for DateTimeImmutable doesn't work
Tinker with the wording of the short_open_tag description.
Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
Handle CLI server request headers case insensitively.
ensure that the defined interpolation method is used by the generic scaling functions
Fixed issue #128 (opcache_invalidate segmentation fault)
5.4.21 now
Diffstat (limited to 'ext/opcache/ZendAccelerator.c')
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index b5474c0507..827f047cd4 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1062,6 +1062,10 @@ int zend_accel_invalidate(const char *filename, int filename_len, zend_bool forc realpath = accelerator_orig_zend_resolve_path(filename, filename_len TSRMLS_CC); #endif + if (!realpath) { + return FAILURE; + } + persistent_script = zend_accel_hash_find(&ZCSG(hash), realpath, strlen(realpath) + 1); if (persistent_script && !persistent_script->corrupted) { zend_file_handle file_handle; |