Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2013-06-23 23:14:23 +02:00

View File

@@ -858,7 +858,7 @@ sub FetchPublicIp {
Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
} }
my $user_agent = &MakeUserAgent(); my $user_agent = &MakeUserAgent();
my ($out, $response) = Net::SSLeay::get_http( 'checkip.dns.lightningwirelabs.com', my ($out, $response) = Net::SSLeay::get_http( 'checkip4.dns.lightningwirelabs.com',
80, 80,
"/", "/",
Net::SSLeay::make_headers('User-Agent' => $user_agent ) Net::SSLeay::make_headers('User-Agent' => $user_agent )