Module Name: src
Committed By: martin
Date: Tue May 16 16:26:03 UTC 2023
Modified Files:
src/usr.bin/ftp [netbsd-10]: ftp.c ssl.c util.c version.h
Log Message:
Pull up following revision(s) (requested by lukem in ticket #171):
usr.bin/ftp/ssl.c: revision 1.15
usr.bin/ftp/util.c: revision 1.167
usr.bin/ftp/ftp.c: revision 1.175
usr.bin/ftp/version.h: revision 1.97
add timeout for ssl connect
Implement a timeout for SSL connection setup, using -q QUITTIME,
defaulting to 60 seconds.
SSL_connect(3) (unlike connect(2)) doesn't timeout by default.
Adapt ssl error messages destination: if unexpected error
from local API, use warn()/warnx() to stderr;
if expected error from a network operation (e.g., timeouts),
use fprintf to ttyout (which might be stdout).
Consistently use ftp_poll() instead of select();
ssl.c (using select()) was added 7 years after the
previous uses of select() were converted to poll().
Check EAGAIN as well as existing EINTR error from ftp_poll(),
for portability.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.174.2.1 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/usr.bin/ftp/ssl.c
cvs rdiff -u -r1.164.2.1 -r1.164.2.2 src/usr.bin/ftp/util.c
cvs rdiff -u -r1.95.2.1 -r1.95.2.2 src/usr.bin/ftp/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
