kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Automatic transformation of IPv6-IPv4 addresses (::ffff:0.0.0.0) should not be an optional feature.

Browse Source
This commit is contained in:
Savetheinternet 2011-11-25 03:02:34 +11:00
parent 40bc602096
commit 8c2f6d978a
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/config.php
View File

@ -68,9 +68,6 @@
// "302" is strongly recommended. (This shouldn't even be configurable... It's not like it's going to change or anything.) // "302" is strongly recommended. (This shouldn't even be configurable... It's not like it's going to change or anything.)
$config['redirect_http'] = 302; $config['redirect_http'] = 302;
// Make IPv4 addresses look like IPv4 addresses ("::ffff:8.8.8.8" becomes "8.8.8.8")
$config['ipv6_ipv4'] = true;
// A small file in the main directory indicating that the script has been ran and the board(s) have been generated. // A small file in the main directory indicating that the script has been ran and the board(s) have been generated.
// This keeps the script from querying the database and causing strain when not needed. // This keeps the script from querying the database and causing strain when not needed.
$config['has_installed'] = '.installed'; $config['has_installed'] = '.installed';

14
inc/functions.php
View File

@ -97,15 +97,13 @@
ini_set('display_errors', 1); ini_set('display_errors', 1);
} }
if($config['ipv6_ipv4'] && isset($_SERVER['REMOTE_ADDR'])) { // Keep the original address to properly comply with other board configurations
// Keep the original address to properly comply with other board configurations if(!isset($__ip))
if(!isset($__ip)) $__ip = $_SERVER['REMOTE_ADDR'];
$__ip = &$_SERVER['REMOTE_ADDR'];
// ::ffff:0.0.0.0 // ::ffff:0.0.0.0
if(preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m)) if(preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m))
$_SERVER['REMOTE_ADDR'] = $m[2]; $_SERVER['REMOTE_ADDR'] = $m[2];
}
if(_setlocale(LC_ALL, $config['locale']) === false) { if(_setlocale(LC_ALL, $config['locale']) === false) {
$error = function_exists('error') ? 'error' : 'basic_error_function_because_the_other_isnt_loaded_yet'; $error = function_exists('error') ? 'error' : 'basic_error_function_because_the_other_isnt_loaded_yet';