mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-18 20:22:27 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 035929fec7 into e017b1bc6e

Browse source
This commit is contained in:
doskel 2026-06-16 16:24:05 -06:00 committed by GitHub
parent e017b1bc6e 035929fec7
commit b29de2bd03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
copyparty/__main__.py
View file

@ -1521,6 +1521,7 @@ def add_ftp(ap):
ap2.add_argument("--ftp-wt", metavar="SEC", type=int, default=7, help="grace period for resuming interrupted uploads (any client can write to any file last-modified more recently than \033[33mSEC\033[0m seconds ago)")
ap2.add_argument("--ftp-nat", metavar="ADDR", type=u, default="", help="the NAT address to use for passive connections")
ap2.add_argument("--ftp-pr", metavar="P-P", type=u, default="", help="the range of TCP ports to use for passive connections, for example \033[32m12000-13000")
ap2.add_argument("--ftp-banner", metavar="BANNER", type=u, default="copyparty ftpd", help="banner to send before ftp login")
def add_webdav(ap):

2
copyparty/ftpd.py
View file

@ -629,7 +629,7 @@ class Ftpd(object):
FtpHandler.hub = h2.hub = hub
FtpHandler.args = h2.args = hub.args
FtpHandler.authorizer = h2.authorizer = FtpAuth(hub)
FtpHandler.banner = self.args.ftp_banner.replace("\\n", "\r\n")
if self.args.ftp_pr:
p1, p2 = [int(x) for x in self.args.ftp_pr.split("-")]
if self.args.ftp and self.args.ftps: