df5db8afaf
In curl 8.12 I tried to improve the logic on how we handle connections that "upgrade" to TLS later, e.g. with a STARTTLS. I found the existing code hard to read in this regard. But of course, the "improvements" blew up in my face. We fixed issues with imap, opo3, smtp in 8.12.1, but ftp was no longer reusing existing, upgraded control connections as before. This PR adds checks in our pytest FTP tests that verify reuse is happening as intended. I rewrote the logic in url.c again, so that the new test checks now pass. Reported-by: Zenju on github Fixes #16384 Closes #16392
82 lines
2.4 KiB
Makefile
82 lines
2.4 KiB
Makefile
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
|
|
SUBDIRS = clients
|
|
|
|
TESTENV = \
|
|
testenv/__init__.py \
|
|
testenv/caddy.py \
|
|
testenv/certs.py \
|
|
testenv/client.py \
|
|
testenv/curl.py \
|
|
testenv/env.py \
|
|
testenv/httpd.py \
|
|
testenv/mod_curltest/mod_curltest.c \
|
|
testenv/nghttpx.py \
|
|
testenv/ports.py \
|
|
testenv/vsftpd.py \
|
|
testenv/ws_echo_server.py
|
|
|
|
EXTRA_DIST = \
|
|
CMakeLists.txt \
|
|
conftest.py \
|
|
requirements.txt \
|
|
scorecard.py \
|
|
test_01_basic.py \
|
|
test_02_download.py \
|
|
test_03_goaway.py \
|
|
test_04_stuttered.py \
|
|
test_05_errors.py \
|
|
test_06_eyeballs.py \
|
|
test_07_upload.py \
|
|
test_08_caddy.py \
|
|
test_09_push.py \
|
|
test_10_proxy.py \
|
|
test_11_unix.py \
|
|
test_12_reuse.py \
|
|
test_13_proxy_auth.py \
|
|
test_14_auth.py \
|
|
test_15_tracing.py \
|
|
test_16_info.py \
|
|
test_17_ssl_use.py \
|
|
test_18_methods.py \
|
|
test_19_shutdown.py \
|
|
test_20_websockets.py \
|
|
test_30_vsftpd.py \
|
|
test_31_vsftpds.py \
|
|
test_32_ftps_vsftpd.py \
|
|
$(TESTENV)
|
|
|
|
clean-local:
|
|
rm -rf *.pyc __pycache__
|
|
rm -rf gen
|
|
|
|
check: clients
|
|
|
|
clients:
|
|
@(cd clients; $(MAKE) check)
|
|
|
|
checksrc:
|
|
cd clients && $(MAKE) checksrc
|