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

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

@ -1454,7 +1454,11 @@ function get_client_ip($type = 0,$adv=false) {
static $ip = NULL;
if ($ip !== NULL) return $ip[$type];
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']);
$pos = array_search('unknown',$arr);
if(false !== $pos) unset($arr[$pos]);

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

@ -1051,7 +1051,11 @@ function get_client_ip($type = 0) {
$type = $type ? 1 : 0;
static $ip = NULL;
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']);
$pos = array_search('unknown',$arr);
if(false !== $pos) unset($arr[$pos]);

Write Preview
Loading…
Cancel
Save