Commitb2076b0

and

authored

gh-100374: Fixed a bug in socket.getfqdn() (gh-100375)

(cherry picked from commit12be23c)Co-authored-by: Dominic Socular <BBH@awsl.rip>

1 parentae8520c commitb2076b0Copy full SHA for b2076b0

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -784,11 +784,11 @@ def getfqdn(name=''):`
`784`	`784`
`785`	`785`	`First the hostname returned by gethostbyaddr() is checked, then`
`786`	`786`	possibly existing aliases. In case no FQDN is available and `name`
`787`		- was given, it is returned unchanged. If `name` was empty or'0.0.0.0',
	`787`	+ was given, it is returned unchanged. If `name` was empty,'0.0.0.0' or '::',
`788`	`788`	`hostname from gethostname() is returned.`
`789`	`789`	`"""`
`790`	`790`	`name=name.strip()`
`791`		`-ifnotnameorname=='0.0.0.0':`
	`791`	`+ifnotnameornamein ('0.0.0.0','::'):`
`792`	`792`	`name=gethostname()`
`793`	`793`	`try:`
`794`	`794`	`hostname,aliases,ipaddrs=gethostbyaddr(name)`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1760,6 +1760,10 @@ def test_getaddrinfo_ipv6_basic(self):`
`1760`	`1760`	`)`
`1761`	`1761`	`self.assertEqual(sockaddr, ('ff02::1de:c0:face:8d',1234,0,0))`
`1762`	`1762`
	`1763`	`+deftest_getfqdn_filter_localhost(self):`
	`1764`	`+self.assertEqual(socket.getfqdn(),socket.getfqdn("0.0.0.0"))`
	`1765`	`+self.assertEqual(socket.getfqdn(),socket.getfqdn("::"))`
	`1766`	`+`
`1763`	`1767`	`@unittest.skipUnless(socket_helper.IPV6_ENABLED,'IPv6 required for this test.')`
`1764`	`1768`	`@unittest.skipIf(sys.platform=='win32','does not work on Windows')`
`1765`	`1769`	`@unittest.skipIf(AIX,'Symbolic scope id does not work')`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix incorrect result and delay in:func:`socket.getfqdn`. Patch by Dominic Socular.

Comments

(0)