www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Move

Browse Source 
fill_reneg_buffer() call down after r->connection->master
  check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880927 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2020-08-17 12:32:19 +00:00
parent 45a01f2a80
commit 28602f2509
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/ssl/ssl_engine_kernel.c
View File

@@ -1145,16 +1145,6 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon
} }
/* Fill reneg buffer if required. */ /* Fill reneg buffer if required. */
if (change_vmode) {
rc = fill_reneg_buffer(r, dc);
if (rc) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10228)
"could not buffer message body to allow "
"TLS Post-Handshake Authentication to proceed");
return rc;
}
}
if (change_vmode) { if (change_vmode) {
char peekbuf[1]; char peekbuf[1];
@@ -1167,6 +1157,14 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon
return HTTP_FORBIDDEN; return HTTP_FORBIDDEN;
} }
rc = fill_reneg_buffer(r, dc);
if (rc) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10228)
"could not buffer message body to allow "
"TLS Post-Handshake Authentication to proceed");
return rc;
}
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(10129) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(10129)
"verify client post handshake"); "verify client post handshake");