Commit 854136f
committed
Fix GH-12703 and optimize parse_url control-char replacement
Two changes to ext/standard/url.c.
1. Fix GH-12703: parse_url mishandles colon inside path.
parse_url('/page:1') returns false instead of the path, and
parse_url('//www.example.com/foo:65535/') reports a spurious
port of 65535. Both stem from the scheme walk's error branch
routing /-prefixed inputs into the `parse_port` fallback.
Guard the `parse_port` branch with `*s != '/'`. A leading slash
can't start a scheme, so the input must be a path or a //host
authority. The existing branch ordering then lets the //host
check catch `//...` inputs and `just_path` catch the rest.
2. Speed up php_replace_controlchars on typical URLs.
Each parse calls php_replace_controlchars once per component
(scheme, host, user, pass, path, query, fragment), and each
call walked the bytes through iscntrl(). iscntrl() hits
__ctype_b_loc() for a locale-aware lookup, and callgrind showed
it at ~14% of total instructions on a realistic URL workload.
Replace the call with an inline `*s < 0x20 || *s == 0x7f`
compare. URL components are bytes, not locale-dependent text,
so C-locale semantics are what we want regardless of the
process locale. The Zend language scanner uses the same pattern
(`yych <= 0x1F`).
Benchmark across 13 realistic URL shapes: 12-22% faster, 16%
average. No behavior change in the C/POSIX locale.
Closes GH-127031 parent 555e652 commit 854136f
2 files changed
+113
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
57 | 63 | | |
58 | | - | |
59 | | - | |
| 64 | + | |
| 65 | + | |
60 | 66 | | |
61 | 67 | | |
62 | 68 | | |
| |||
104 | 110 | | |
105 | 111 | | |
106 | 112 | | |
107 | | - | |
| 113 | + | |
108 | 114 | | |
109 | 115 | | |
110 | 116 | | |
| |||
0 commit comments