mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Merge the last of the 'filtering' functions into ssl_engine_io.c, merge
ssl_abort into what was ssl_hook_CloseConnection, clean out a bunch of now-static or private headers from mod_ssl.h, and final fix a very small but potent segfault if ->pssl is destroyed within our read loop. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97411 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -389,14 +389,6 @@ typedef struct {
|
||||
* (i.e. the global configuration for each httpd process)
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
SSL *pssl;
|
||||
BIO *pbioRead;
|
||||
BIO *pbioWrite;
|
||||
ap_filter_t *pInputFilter;
|
||||
ap_filter_t *pOutputFilter;
|
||||
} SSLFilterRec;
|
||||
|
||||
typedef enum {
|
||||
SSL_SHUTDOWN_TYPE_UNSET,
|
||||
SSL_SHUTDOWN_TYPE_STANDARD,
|
||||
@@ -590,17 +582,12 @@ void ssl_init_Child(apr_pool_t *, server_rec *);
|
||||
apr_status_t ssl_init_ModuleKill(void *data);
|
||||
|
||||
/* Apache API hooks */
|
||||
void ssl_hook_NewConnection(conn_rec *);
|
||||
void ssl_hook_TimeoutConnection(int);
|
||||
int ssl_hook_process_connection(SSLFilterRec *pRec);
|
||||
apr_status_t ssl_hook_CloseConnection(SSLFilterRec *);
|
||||
int ssl_hook_Translate(request_rec *);
|
||||
int ssl_hook_Auth(request_rec *);
|
||||
int ssl_hook_UserCheck(request_rec *);
|
||||
int ssl_hook_Access(request_rec *);
|
||||
int ssl_hook_Fixup(request_rec *);
|
||||
int ssl_hook_ReadReq(request_rec *);
|
||||
int ssl_hook_Handler(request_rec *);
|
||||
|
||||
/* OpenSSL callbacks */
|
||||
RSA *ssl_callback_TmpRSA(SSL *, int, int);
|
||||
|
Reference in New Issue
Block a user