diff options
| author | Joe Orton <jorton@apache.org> | 2020-08-17 12:32:19 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-08-17 12:32:19 +0000 |
| commit | 28602f2509299cd104cbe64511b0cee4e58b358a (patch) | |
| tree | c902c990035ce08904d45caa41b88990546a87ca /modules/ssl/ssl_engine_kernel.c | |
| parent | 45a01f2a802779999712b258425867479acdcddf (diff) | |
| download | httpd-28602f2509299cd104cbe64511b0cee4e58b358a.tar.gz | |
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Move
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
Diffstat (limited to 'modules/ssl/ssl_engine_kernel.c')
| -rw-r--r-- | modules/ssl/ssl_engine_kernel.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index d2a8011294..0b22c2de28 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1146,16 +1146,6 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon /* 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) { char peekbuf[1]; if (r->connection->master) { @@ -1167,6 +1157,14 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon 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) "verify client post handshake"); |