summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-12-15 10:18:54 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-12-15 10:18:54 +0100
commit0896f36bc6a61dd679a9e7fb7e33475db1a80ecc (patch)
treee6c68f0f18145f6f4f2be6b52cfc59033847f7da
parent36420426294d66a68889c4601f363ba06de4ae87 (diff)
parent724e241c9d9ab88e5b6fdc6d074aa956e9baa523 (diff)
downloadphp-git-0896f36bc6a61dd679a9e7fb7e33475db1a80ecc.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: JIT: Update invalid opcache.jit INI value message to include "tracing" and "function" values
-rw-r--r--ext/opcache/jit/zend_jit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index b96bcd516d..eb80d5240b 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -4129,7 +4129,7 @@ ZEND_EXT_API int zend_jit_config(zend_string *jit, int stage)
}
failure:
- zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\" or 4-digit number");
+ zend_error(E_WARNING, "Invalid \"opcache.jit\" setting. Should be \"disable\", \"on\", \"off\", \"tracing\", \"function\" or 4-digit number");
JIT_G(enabled) = 0;
JIT_G(on) = 0;
return FAILURE;