Skip to content

Commit a120ad9

Browse files
committed
adjust to downgrade (PR 20380)
1 parent 4227f15 commit a120ad9

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

.github/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/scripts/download-bundled/pcre2-adjust-sljit-directory.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/scripts/download-bundled/pcre2.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
set -ex
33
cd "$(dirname "$0")/../../.."
44

5-
revision=refs/tags/pcre2-10.46
5+
revision=refs/tags/pcre2-10.44
66

77
git clone --depth 1 --recurse-submodules --revision=$revision https://github.com/PCRE2Project/pcre2.git /tmp/php-src-bundled/pcre2
88

99
rm -rf ext/pcre/pcre2lib
1010
cp -R /tmp/php-src-bundled/pcre2/src ext/pcre/pcre2lib
11-
cp -R /tmp/php-src-bundled/pcre2/deps/sljit/sljit_src ext/pcre/pcre2lib/sljit
1211

1312
cd ext/pcre/pcre2lib
1413

@@ -31,6 +30,3 @@ mv pcre2_chartables.c.dist pcre2_chartables.c
3130

3231
# add extra files
3332
git restore config.h # based on config.h.generic but with many changes
34-
35-
# patch customized files
36-
git apply -v ../../../.github/scripts/download-bundled/pcre2-adjust-sljit-directory.patch

ext/pcre/pcre2lib/pcre2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ pcre2_pattern_convert(). */
318318
#define PCRE2_ERROR_ALPHA_ASSERTION_UNKNOWN 195
319319
#define PCRE2_ERROR_SCRIPT_RUN_NOT_AVAILABLE 196
320320
#define PCRE2_ERROR_TOO_MANY_CAPTURES 197
321-
#define PCRE2_ERROR_MISSING_OCTAL_DIGIT 198
321+
#define PCRE2_ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED 198
322322
#define PCRE2_ERROR_BACKSLASH_K_IN_LOOKAROUND 199
323323

324324

0 commit comments

Comments
 (0)