Merge branch 'PHP-7.4'

dstogov · dstogov · commit f64650408a30 · 2019-08-06T13:58:29.000+03:00
* PHP-7.4:
  typo
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4354,7 +4354,7 @@ static int accel_preload(const char *config)
 		CG(map_ptr_last) = orig_map_ptr_last;
 
 		if (EG(full_tables_cleanup)) {
-			zend_accel_error(ACCEL_LOG_FATAL, "Preloading is not comatible with dl() function.");
+			zend_accel_error(ACCEL_LOG_FATAL, "Preloading is not compatible with dl() function.");
 			ret = FAILURE;
 			goto finish;
 		}

Original file line number	Diff line number	Diff line change
`@@ -4354,7 +4354,7 @@ static int accel_preload(const char *config)`
`4354`	`4354`	`CG(map_ptr_last) = orig_map_ptr_last;`
`4355`	`4355`
`4356`	`4356`	`if (EG(full_tables_cleanup)) {`
`4357`		`- zend_accel_error(ACCEL_LOG_FATAL, "Preloading is not comatible with dl() function.");`
	`4357`	`+ zend_accel_error(ACCEL_LOG_FATAL, "Preloading is not compatible with dl() function.");`
`4358`	`4358`	`ret = FAILURE;`
`4359`	`4359`	`goto finish;`
`4360`	`4360`	`}`