Skip to content

Commit 2bc3df8

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Reduce regex backtracking in phpinfo.phpt
2 parents 4252545 + 28d88c7 commit 2bc3df8

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

ext/standard/tests/general_functions/phpinfo.phpt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ phpinfo()
1616
PHP Version => %s
1717

1818
System => %s
19-
Build Date => %s%a
19+
Build Date => %r(.+?)%r
2020
Configure Command => %s
2121
Server API => Command Line Interface
2222
Virtual Directory Support => %s
2323
Configuration File (php.ini) Path => %s
24-
Loaded Configuration File => %a
25-
Scan this dir for additional .ini files => %a
26-
Additional .ini files parsed => %a
24+
Loaded Configuration File => %r(.+?)%r
25+
Scan this dir for additional .ini files => %r(.+?)%r
26+
Additional .ini files parsed => %r(.+?)%r
2727
PHP API => %d
2828
PHP Extension => %d
2929
Zend Extension => %d
3030
Zend Extension Build => API%s
3131
PHP Extension Build => API%s
3232
PHP Integer Size => %d bits
3333
Debug Build => %s
34-
Thread Safety => %s%A
34+
Thread Safety => %r(.+?)%r
3535
Zend Signal Handling => %s
3636
Zend Memory Manager => %s
3737
Zend Multibyte Support => %s
@@ -43,22 +43,22 @@ Registered PHP Streams => %s
4343
Registered Stream Socket Transports => %s
4444
Registered Stream Filters => %s
4545

46-
%a
46+
%r(.+?)%r
4747
_______________________________________________________________________
4848

4949

5050
Configuration
51-
%A
51+
%r(.*?)%r
5252
Core
53-
%A
53+
%r(.*?)%r
5454
Additional Modules
55-
%A
55+
%r(.*?)%r
5656
Environment
57-
%A
57+
%r(.*?)%r
5858
PHP Variables
59-
%A
59+
%r(.*?)%r
6060
PHP License
61-
%A
61+
%r(.*?)%r
6262
bool(true)
6363
--
6464
phpinfo()
@@ -67,5 +67,5 @@ bool(true)
6767
phpinfo()
6868

6969
PHP License
70-
%a
70+
%r(.+?)%r
7171
bool(true)

0 commit comments

Comments
 (0)