test cache entry validity by "PREG_JIT_ATTEMPTED"

Author: mvorisek

ext/pcre/php_pcre.c

@@ -41,6 +41,8 @@
 
 #define PREG_JIT                    (1<<3)
 
+#define PREG_JIT_ATTEMPTED          (1<<4)
+
 #define PCRE_CACHE_SIZE 4096
 
 struct _pcre_cache_entry {
@@ -618,7 +620,12 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	char				*p, *pp;
 	char				*pattern;
 	size_t				 pattern_len;
+#ifdef HAVE_PCRE_JIT_SUPPORT
+    bool				 jit_enabled = PCRE_G(jit);
+	uint32_t			 poptions = jit_enabled ? PREG_JIT_ATTEMPTED : 0;
+#else
 	uint32_t			 poptions = 0;
+#endif
 	const uint8_t       *tables = NULL;
 	zval                *zv;
 	pcre_cache_entry	 new_entry;
@@ -639,14 +646,18 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	zv = zend_hash_find(&PCRE_G(pcre_cache), key);
 	if (zv) {
 		pcre_cache_entry *pce = (pcre_cache_entry*)Z_PTR_P(zv);
-		if (!(pce->preg_options & PREG_JIT) == !PCRE_G(jit)) {
+#ifdef HAVE_PCRE_JIT_SUPPORT
+		if (!!(pce->preg_options & PREG_JIT_ATTEMPTED) == jit_enabled) {
+#endif
 			if (key != regex) {
 				zend_string_release_ex(key, 0);
 			}
 			return pce;
+#ifdef HAVE_PCRE_JIT_SUPPORT
 		} else {
 			zend_hash_del(&PCRE_G(pcre_cache), key);
 		}
+#endif
 	}
 
 	p = ZSTR_VAL(regex);
@@ -826,7 +837,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
 	}
 
 #ifdef HAVE_PCRE_JIT_SUPPORT
-	if (PCRE_G(jit)) {
+	if (jit_enabled) {
 		/* Enable PCRE JIT compiler */
 		rc = pcre2_jit_compile(re, PCRE2_JIT_COMPLETE);
 		if (EXPECTED(rc >= 0)) {