gh-110467: Fix EOF occurred in violation of protocol starting Python3.10 on large requests by keepworking · Pull Request #115273 · python/cpython

bedevere-app

Hello, @tiran I have qustion about this update of test code

When I looked at the linked pull request, I could see that the processing of ConnectionResetError has been modified to be incorporated into the lower part of OSError.

Before the correction, the server is not stopped when the error is ConnectionResetError, but after the correction, the server is also stopped when the error is ConnectionResetError.

I wonder if this is the intended correction.

except (ConnectionResetError, ConnectionAbortedError):
    # XXX: OpenSSL 1.1.1 sometimes raises ConnectionResetError
    # when connection is not shut down gracefully.
    if self.server.chatty and support.verbose:
        sys.stdout.write(
            " Connection reset by peer: {}\n".format(
                self.addr)
        )
    self.close()
    self.running = False 
    # <<<<< do not stop the server in this exception
except ssl.SSLError as err:
    # On Windows sometimes test_pha_required_nocert receives the
    # PEER_DID_NOT_RETURN_A_CERTIFICATE exception
    # before the 'tlsv13 alert certificate required' exception.
    # If the server is stopped when PEER_DID_NOT_RETURN_A_CERTIFICATE
    # is received test_pha_required_nocert fails with ConnectionResetError
    # because the underlying socket is closed
    if 'PEER_DID_NOT_RETURN_A_CERTIFICATE' == err.reason:
        if self.server.chatty and support.verbose:
            sys.stdout.write(err.args[1])
        # test_pha_required_nocert is expecting this exception
        raise ssl.SSLError('tlsv13 alert certificate required')
except OSError:
    if self.server.chatty:
        handle_error("Test server failure:\n")
    self.close()
    self.running = False

    # normally, we'd just stop here, but for the test
    # harness, we want to stop the server
    self.server.stop()

except OSError as e:
    # handles SSLError and socket errors
    if self.server.chatty and support.verbose:
        if isinstance(e, ConnectionError):
            # OpenSSL 1.1.1 sometimes raises
            # ConnectionResetError when connection is not
            # shut down gracefully.
            print(
                f" Connection reset by peer: {self.addr}"
            )
        else:
            handle_error("Test server failure:\n")
    try:
        self.write(b"ERROR\n")
    except OSError:
        pass
    self.close()
    self.running = False

    # normally, we'd just stop here, but for the test
    # harness, we want to stop the server
    self.server.stop()
    # <<<<< stop the server in this exception