elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/ip' into dev

Browse Source
master
ELF 5 years ago
parent 2b2d9d04de 5c3cdf2bce
commit 714edf693b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File

12
ThinkPHP/Common/functions.php
Unescape Escape View File

@ -1454,17 +1454,21 @@ function get_client_ip($type = 0,$adv=false) {
static $ip = NULL; static $ip = NULL;
if ($ip !== NULL) return $ip[$type]; if ($ip !== NULL) return $ip[$type];
if($adv){ if($adv){
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { if (isset($_SERVER['HTTP_X_HWWAF_REAL_IP'])) {
$ip = $_SERVER['HTTP_X_HWWAF_REAL_IP'];
} elseif (isset($_SERVER['HTTP_X_REAL_IP'])) {
$ip = $_SERVER['HTTP_X_REAL_IP'];
} elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
$pos = array_search('unknown',$arr); $pos = array_search('unknown',$arr);
if(false !== $pos) unset($arr[$pos]); if(false !== $pos) unset($arr[$pos]);
$ip = trim($arr[0]); $ip = trim($arr[0]);
}elseif (isset($_SERVER['HTTP_CLIENT_IP'])) { } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP']; $ip = $_SERVER['HTTP_CLIENT_IP'];
}elseif (isset($_SERVER['REMOTE_ADDR'])) { } elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR']; $ip = $_SERVER['REMOTE_ADDR'];
} }
}elseif (isset($_SERVER['REMOTE_ADDR'])) { } elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR']; $ip = $_SERVER['REMOTE_ADDR'];
} }
// IP地址合法验证 // IP地址合法验证

10
ThinkPHP/Mode/Api/functions.php
Unescape Escape View File

@ -1051,14 +1051,18 @@ function get_client_ip($type = 0) {
$type = $type ? 1 : 0; $type = $type ? 1 : 0;
static $ip = NULL; static $ip = NULL;
if ($ip !== NULL) return $ip[$type]; if ($ip !== NULL) return $ip[$type];
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { if (isset($_SERVER['HTTP_X_HWWAF_REAL_IP'])) {
$ip = $_SERVER['HTTP_X_HWWAF_REAL_IP'];
} elseif (isset($_SERVER['HTTP_X_REAL_IP'])) {
$ip = $_SERVER['HTTP_X_REAL_IP'];
} elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
$pos = array_search('unknown',$arr); $pos = array_search('unknown',$arr);
if(false !== $pos) unset($arr[$pos]); if(false !== $pos) unset($arr[$pos]);
$ip = trim($arr[0]); $ip = trim($arr[0]);
}elseif (isset($_SERVER['HTTP_CLIENT_IP'])) { } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP']; $ip = $_SERVER['HTTP_CLIENT_IP'];
}elseif (isset($_SERVER['REMOTE_ADDR'])) { } elseif (isset($_SERVER['REMOTE_ADDR'])) {
$ip = $_SERVER['REMOTE_ADDR']; $ip = $_SERVER['REMOTE_ADDR'];
} }
// IP地址合法验证 // IP地址合法验证

Write Preview
Loading…
Cancel
Save