@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2021 Jonathan Schleifer + * Copyright (c) 2008-2022 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -62,11 +62,12 @@ */ - (bool)server: (OFHTTPServer *)server didReceiveExceptionOnListeningSocket: (id)exception; /** - * @brief This method is called when a client socket encountered an exception. + * @brief This method is called when a socket for a client encountered an + * exception. * * This can happen when the OFHTTPServer tries to properly close the * connection. If no headers have been sent yet, it will send headers, and if * chunked transfer encoding was used, it will send a chunk of size 0. However, * if the other end already closed the connection before that, this will raise @@ -91,13 +92,10 @@ OF_SUBCLASSING_RESTRICTED @interface OFHTTPServer: OFObject { OFString *_Nullable _host; uint16_t _port; - bool _usesTLS; - OFString *_Nullable _certificateFile, *_Nullable _privateKeyFile; - const char *_Nullable _privateKeyPassphrase; id _Nullable _delegate; OFString *_Nullable _name; OFTCPSocket *_Nullable _listeningSocket; #ifdef OF_HAVE_THREADS size_t _numberOfThreads, _nextThreadIndex; @@ -119,46 +117,10 @@ * Setting this after @ref start has been called raises an * @ref OFAlreadyConnectedException. */ @property (nonatomic) uint16_t port; -/** - * @brief Whether the HTTP server uses TLS. - * - * Setting this after @ref start has been called raises an - * @ref OFAlreadyConnectedException. - */ -@property (nonatomic) bool usesTLS; - -/** - * @brief The path to the X.509 certificate file to use for TLS. - * - * Setting this after @ref start has been called raises an - * @ref OFAlreadyConnectedException. - */ -@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *certificateFile; - -/** - * @brief The path to the PKCS#8 private key file to use for TLS. - * - * Setting this after @ref start has been called raises an - * @ref OFAlreadyConnectedException. - */ -@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *privateKeyFile; - -/** - * @brief The passphrase to decrypt the PKCS#8 private key file for TLS. - * - * @warning You have to ensure that this is in secure memory protected from - * swapping! This is also the reason why this is not an OFString. - * - * Setting this after @ref start has been called raises an - * @ref OFAlreadyConnectedException. - */ -@property OF_NULLABLE_PROPERTY (assign, nonatomic) - const char *privateKeyPassphrase; - /** * @brief The delegate for the HTTP server. */ @property OF_NULLABLE_PROPERTY (assign, nonatomic) id delegate;