Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Win32: fixed build on Windows with OpenSSL 3.0.x (ticket #2379).

Browse source 
SSL_sendfile() expects integer file descriptor as an argument, but nginx
uses OS file handles (HANDLE) to work with files on Windows, and passing
HANDLE instead of an integer correctly results in build failure.  Since
SSL_sendfile() is not expected to work on Windows anyway, the code is now
disabled on Windows with appropriate compile-time checks.
This commit is contained in:
Maxim Dounin 2022-09-07 00:47:17 +03:00
parent fdc331ac71
commit 6efacf745c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/event/ngx_event_openssl.c
View file

@ -1769,7 +1769,7 @@ ngx_ssl_handshake(ngx_connection_t *c)
#endif #endif
#endif #endif
#ifdef BIO_get_ktls_send #if (defined BIO_get_ktls_send && !NGX_WIN32)
if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) { if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
@ -1914,7 +1914,7 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
c->read->ready = 1; c->read->ready = 1;
c->write->ready = 1; c->write->ready = 1;
#ifdef BIO_get_ktls_send #if (defined BIO_get_ktls_send && !NGX_WIN32)
if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) { if (BIO_get_ktls_send(SSL_get_wbio(c->ssl->connection)) == 1) {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
@ -2943,7 +2943,7 @@ ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size)
static ssize_t static ssize_t
ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size) ngx_ssl_sendfile(ngx_connection_t *c, ngx_buf_t *file, size_t size)
{ {
#ifdef BIO_get_ktls_send #if (defined BIO_get_ktls_send && !NGX_WIN32)
int sslerr, flags; int sslerr, flags;
ssize_t n; ssize_t n;