mirror of
https://github.com/9001/copyparty.git
synced 2025-08-17 17:12:13 -06:00
linux 6.1 fixed the 6.0 bugs; remove workarounds
This commit is contained in:
parent
18942ed066
commit
5bb9f56247
|
@ -2,7 +2,6 @@
|
|||
from __future__ import print_function, unicode_literals
|
||||
|
||||
import base64
|
||||
import errno
|
||||
import math
|
||||
import os
|
||||
import socket
|
||||
|
@ -287,16 +286,6 @@ class HttpSrv(object):
|
|||
if self.stopping:
|
||||
break
|
||||
|
||||
if (
|
||||
ex.errno == errno.EINVAL
|
||||
and ip == "0.0.0.0"
|
||||
and ("::", port) in self.bound
|
||||
):
|
||||
t = "accept({}): {} -- probably due to dualstack; terminating ({}, {})"
|
||||
self.log(self.name, t.format(fno, ex, ip, port), c=6)
|
||||
srv_sck.close()
|
||||
return
|
||||
|
||||
self.log(self.name, "accept({}): {}".format(fno, ex), c=6)
|
||||
time.sleep(0.02)
|
||||
continue
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
# coding: utf-8
|
||||
from __future__ import print_function, unicode_literals
|
||||
|
||||
import errno
|
||||
import os
|
||||
import re
|
||||
import socket
|
||||
|
@ -224,11 +223,6 @@ class TcpSrv(object):
|
|||
|
||||
try:
|
||||
srv.bind((ip, port))
|
||||
sport = srv.getsockname()[1]
|
||||
if port != sport:
|
||||
# linux 6.0.16 lets you bind a port which is in use
|
||||
# except it just gives you a random port instead
|
||||
raise OSError(errno.EADDRINUSE, "")
|
||||
self.srv.append(srv)
|
||||
except (OSError, socket.error) as ex:
|
||||
if ex.errno in E_ADDR_IN_USE:
|
||||
|
|
Loading…
Reference in a new issue