Skip to content

Commit 0fc9bbf

Browse files
committed
opcache: Use more formal language in warning message
1 parent a533f7e commit 0fc9bbf

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ext/opcache/tests/opcache_enable_noop_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Should not warn:
2121
Disabling:
2222
Should warn:
2323

24-
Warning: Zend OPcache can't be temporarily enabled (it may be only disabled till the end of request) in %s on line %d
24+
Warning: Zend OPcache can't be temporarily enabled (it may be only disabled until the end of request) in %s on line %d

ext/opcache/tests/opcache_enable_noop_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ ini_set('opcache.enable', 1);
1515
--EXPECTF--
1616
Should warn, since the INI was initialized to 0:
1717

18-
Warning: Zend OPcache can't be temporarily enabled (it may be only disabled till the end of request) in %s on line %d
18+
Warning: Zend OPcache can't be temporarily enabled (it may be only disabled until the end of request) in %s on line %d

ext/opcache/zend_accelerator_module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ static ZEND_INI_MH(OnEnable)
171171
if (strcmp(sapi_module.name, "fpm-fcgi") == 0) {
172172
zend_accel_error(ACCEL_LOG_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled. Are you using php_admin_value[opcache.enable]=1 in an individual pool's configuration?");
173173
} else {
174-
zend_accel_error(ACCEL_LOG_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled till the end of request)");
174+
zend_accel_error(ACCEL_LOG_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled until the end of request)");
175175
}
176176
} else {
177-
zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled till the end of request)");
177+
zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " can't be temporarily enabled (it may be only disabled until the end of request)");
178178
}
179179
return FAILURE;
180180
} else {

0 commit comments

Comments
 (0)