mirror of
https://github.com/hoellen/dockerfiles.git
synced 2025-04-20 04:19:18 +00:00
36 lines
2.0 KiB
Diff
36 lines
2.0 KiB
Diff
diff -Naur nginx-1.11.4/src/event/ngx_event_openssl.c nginx-1.11.4-patched/src/event/ngx_event_openssl.c
|
|
--- nginx-1.11.4/src/event/ngx_event_openssl.c 2016-09-16 00:49:53.176182112 +0200
|
|
+++ nginx-1.11.4-patched/src/event/ngx_event_openssl.c 2016-09-16 00:47:27.636986453 +0200
|
|
@@ -2016,7 +2016,9 @@
|
|
|
|
/* handshake failures */
|
|
if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */
|
|
+#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
|
|
|| n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG /* 129 */
|
|
+#endif
|
|
|| n == SSL_R_DIGEST_CHECK_FAILED /* 149 */
|
|
|| n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */
|
|
|| n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */
|
|
@@ -2024,7 +2026,9 @@
|
|
#ifdef SSL_R_NO_CIPHERS_PASSED
|
|
|| n == SSL_R_NO_CIPHERS_PASSED /* 182 */
|
|
#endif
|
|
+#ifdef SSL_R_NO_CIPHERS_SPECIFIED
|
|
|| n == SSL_R_NO_CIPHERS_SPECIFIED /* 183 */
|
|
+#endif
|
|
|| n == SSL_R_NO_COMPRESSION_SPECIFIED /* 187 */
|
|
|| n == SSL_R_NO_SHARED_CIPHER /* 193 */
|
|
|| n == SSL_R_RECORD_LENGTH_MISMATCH /* 213 */
|
|
diff -Naur nginx-1.11.4/src/http/ngx_http_upstream.c nginx-1.11.4-patched/src/http/ngx_http_upstream.c
|
|
--- nginx-1.11.4/src/http/ngx_http_upstream.c 2016-09-16 00:50:04.068121614 +0200
|
|
+++ nginx-1.11.4-patched/src/http/ngx_http_upstream.c 2016-09-16 00:47:50.916858344 +0200
|
|
@@ -1694,7 +1694,7 @@
|
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
|
"upstream SSL server name: \"%s\"", name.data);
|
|
|
|
- if (SSL_set_tlsext_host_name(c->ssl->connection, name.data) == 0) {
|
|
+ if (SSL_set_tlsext_host_name(c->ssl->connection, (const char*) name.data) == 0) {
|
|
ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0,
|
|
"SSL_set_tlsext_host_name(\"%s\") failed", name.data);
|
|
return NGX_ERROR;
|