Skip to content

Detect weird local ips #34160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 7 commits into from
Sep 22, 2022
Merged

Detect weird local ips #34160

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c083f77
Harden tests for local IP detection in URLs
come-nc Sep 20, 2022
a907b74
Add missing urldecode and idn_to_utf8 calls to local address checker
come-nc Sep 20, 2022
6b876bb
Add mlocati/ip-lib dependency
come-nc Sep 20, 2022
7ac688a
Use new dependency to normalize IPs
come-nc Sep 20, 2022
31117fa
Fix tests for nested v4 in v6
come-nc Sep 20, 2022
b3b98a3
Update 3rdparty to master
come-nc Sep 20, 2022
7532859
Fix idn_to_utf8 stub signature
come-nc Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix idn_to_utf8 stub signature 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Sep 22, 2022
commit 75328593ad06cea7b3b0331dec999e6f5a083ef1
4 changes: 2 additions & 2 deletions build/stubs/intl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4622,7 +4622,7 @@ function idn_to_ascii($domain, $options = 0, $variant = INTL_IDNA_VARIANT_2003,
* @param int $variant [optional] <p>
* Either INTL_IDNA_VARIANT_2003 for IDNA 2003 or INTL_IDNA_VARIANT_UTS46 for UTS #46.
* </p>
* @param int &$idna_info [optional] <p>
* @param array &$idna_info [optional] <p>
* This parameter can be used only if INTL_IDNA_VARIANT_UTS46 was used for variant.
* In that case, it will be filled with an array with the keys 'result',
* the possibly illegal result of the transformation, 'isTransitionalDifferent',
Expand All @@ -4634,7 +4634,7 @@ function idn_to_ascii($domain, $options = 0, $variant = INTL_IDNA_VARIANT_2003,
* RFC 3490 4.2 states though "ToUnicode never fails. If any step fails, then the original input
* sequence is returned immediately in that step."
*/
function idn_to_utf8($domain, $options = 0, $variant = INTL_IDNA_VARIANT_2003, array &$idna_info) { }
function idn_to_utf8($domain, $options = 0, $variant = INTL_IDNA_VARIANT_2003, array &$idna_info = null) { }

/**
* (PHP 5 &gt;=5.5.0 PECL intl &gt;= 3.0.0a1)<br/>
Expand Down