Merge branch 'PHP-7.0' into PHP-7.1

laruence · laruence · commit e04b91e6e24a · 2017-05-16T13:22:43.000+08:00
* PHP-7.0:
  Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -1712,7 +1712,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 				return accelerator_orig_compile_file(file_handle, type);
 			}
 			persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);
+		} else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {
+			return accelerator_orig_compile_file(file_handle, type);
 		}
+
 		if (!persistent_script) {
 			/* try to find cached script by full real path */
 			zend_accel_hash_entry *bucket;

Original file line number	Diff line number	Diff line change
`@@ -1712,7 +1712,10 @@ zend_op_array persistent_compile_file(zend_file_handle file_handle, int type)`
`1712`	`1712`	`return accelerator_orig_compile_file(file_handle, type);`
`1713`	`1713`	`}`
`1714`	`1714`	`persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);`
	`1715`	`+ } else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {`
	`1716`	`+ return accelerator_orig_compile_file(file_handle, type);`
`1715`	`1717`	`}`
	`1718`	`+`
`1716`	`1719`	`if (!persistent_script) {`
`1717`	`1720`	`/* try to find cached script by full real path */`
`1718`	`1721`	`zend_accel_hash_entry *bucket;`