Skip to content

Commit c4c45da

Browse files
committed
Reduce regex backtracking in phpinfo.phpt
On NixOS, the output of phpinfo() can get very large, causing us to run into the backtracking limit. Lazy matching for .*/.+ can help reduce backtracking.
1 parent 15a0c3a commit c4c45da

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,21 +16,21 @@ 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
Debug Build => %s
33-
Thread Safety => %s%A
33+
Thread Safety => %r(.+?)%r
3434
Zend Signal Handling => %s
3535
Zend Memory Manager => %s
3636
Zend Multibyte Support => %s
@@ -42,22 +42,22 @@ Registered PHP Streams => %s
4242
Registered Stream Socket Transports => %s
4343
Registered Stream Filters => %s
4444

45-
%a
45+
%r(.+?)%r
4646
_______________________________________________________________________
4747

4848

4949
Configuration
50-
%A
50+
%r(.*?)%r
5151
Core
52-
%A
52+
%r(.*?)%r
5353
Additional Modules
54-
%A
54+
%r(.*?)%r
5555
Environment
56-
%A
56+
%r(.*?)%r
5757
PHP Variables
58-
%A
58+
%r(.*?)%r
5959
PHP License
60-
%A
60+
%r(.*?)%r
6161
bool(true)
6262
--
6363
phpinfo()
@@ -66,5 +66,5 @@ bool(true)
6666
phpinfo()
6767

6868
PHP License
69-
%a
69+
%r(.+?)%r
7070
bool(true)

0 commit comments

Comments
 (0)