Revert "fix for pcre2 10.38"

mvorisek · mvorisek · commit 63161cfe8421 · 2025-03-26T12:18:12.000+01:00
This reverts commit dd61002.
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -199,13 +199,6 @@ static void php_pcre_efree(void *block, void *data)
 	efree(block);
 }
 
-#ifdef PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
-	/* pcre 10.38 needs PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK, disabled by default */
-#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK
-#else
-#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS 0
-#endif
-
 #define PHP_PCRE_PREALLOC_MDATA_SIZE 32
 
 static void php_pcre_init_pcre2(uint8_t jit)
@@ -226,8 +219,6 @@ static void php_pcre_init_pcre2(uint8_t jit)
 		}
 	}
 
-	pcre2_set_compile_extra_options(cctx, PHP_PCRE_DEFAULT_EXTRA_COPTIONS);
-
 	if (!mctx) {
 		mctx = pcre2_match_context_create(gctx);
 		if (!mctx) {

Original file line number	Diff line number	Diff line change
`@@ -199,13 +199,6 @@ static void php_pcre_efree(void block, void data)`
`199`	`199`	`efree(block);`
`200`	`200`	`}`
`201`	`201`
`202`		`-#ifdef PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK`
`203`		`- /* pcre 10.38 needs PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK, disabled by default */`
`204`		`-#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK`
`205`		`-#else`
`206`		`-#define PHP_PCRE_DEFAULT_EXTRA_COPTIONS 0`
`207`		`-#endif`
`208`		`-`
`209`	`202`	`#define PHP_PCRE_PREALLOC_MDATA_SIZE 32`
`210`	`203`
`211`	`204`	`static void php_pcre_init_pcre2(uint8_t jit)`
`@@ -226,8 +219,6 @@ static void php_pcre_init_pcre2(uint8_t jit)`
`226`	`219`	`}`
`227`	`220`	`}`
`228`	`221`
`229`		`- pcre2_set_compile_extra_options(cctx, PHP_PCRE_DEFAULT_EXTRA_COPTIONS);`
`230`		`-`
`231`	`222`	`if (!mctx) {`
`232`	`223`	`mctx = pcre2_match_context_create(gctx);`
`233`	`224`	`if (!mctx) {`