generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 41dcafc2: am c705daa0: Merge "Disable IPv6 when looking for tzdata updates."

Browse Source 
* commit '41dcafc27627dbc79e492056799b3cde4056d412':
  Disable IPv6 when looking for tzdata updates.
This commit is contained in:
Elliott Hughes 2013-04-22 16:57:46 -07:00 committed by Android Git Automerger
commit 14cbb15b99
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libc/tools/zoneinfo/update-tzdata.py
View File

@ -6,6 +6,7 @@ import ftplib
import httplib
import os
import re
import socket
import subprocess
import sys
import tarfile
@ -32,6 +33,14 @@ regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward',
'etcetera', 'europe', 'northamerica', 'southamerica']
def DisableIpv6():
"""Replaces socket.getaddrinfo with a version that only requests IPv4 addresses."""
__real_getaddrinfo = socket.getaddrinfo
def __ipv4_getaddrinfo(host, port, family=0, socktype=0, proto=0, flags=0):
return __real_getaddrinfo(host, port, socket.AF_INET, socktype, proto, flags)
socket.getaddrinfo = __ipv4_getaddrinfo
def GetCurrentTzDataVersion():
return open('%s/tzdata' % bionic_libc_zoneinfo_dir).read().split('\x00', 1)[0]
@ -148,9 +157,9 @@ def main():
tzdata_filenames = []
# The FTP server lets you download intermediate releases, and also lets you
# download the signatures for verification, so it's your best choice. It's
# also less reliable than the HTTP server, so we support that too as a backup.
# download the signatures for verification, so it's your best choice.
use_ftp = True
DisableIpv6() # I've been unable to talk to the FTP server over IPv6 (2013-04).
if use_ftp:
ftp = ftplib.FTP('ftp.iana.org')