diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:30:26 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:30:26 +0200 |
| commit | b1ae6f6407e300bf9948072f109057e40f967289 (patch) | |
| tree | b76bf99c5f87f16fc48e9363876c14be9586df15 /phpBB/includes/session.php | |
| parent | 116744d4e5ba95645162c77124854cc58e1d6084 (diff) | |
| parent | 83dfe0d22c71df8e5701c812d304ef8918c3190f (diff) | |
| download | forums-b1ae6f6407e300bf9948072f109057e40f967289.tar forums-b1ae6f6407e300bf9948072f109057e40f967289.tar.gz forums-b1ae6f6407e300bf9948072f109057e40f967289.tar.bz2 forums-b1ae6f6407e300bf9948072f109057e40f967289.tar.xz forums-b1ae6f6407e300bf9948072f109057e40f967289.zip | |
Merge branch 'ticket/bantu/10195' into develop-olympus
* ticket/bantu/10195:
[ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d803f8d799..2181375dc1 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1238,6 +1238,12 @@ class session $ip = $this->ip; } + // Neither Spamhaus nor Spamcop supports IPv6 addresses. + if (strpos($ip, ':') !== false) + { + return false; + } + $dnsbl_check = array( 'sbl.spamhaus.org' => 'http://www.spamhaus.org/query/bl?ip=', ); |