ludra/nginx-build
1
0 Fork 0
forked from Hakase/nginx-build
Code Issues Pull Requests Releases Wiki Activity

Latest update - 7312

Browse Source
This commit is contained in:
Hakase
2018-07-06 08:38:04 +09:00
parent 46231b2394
commit cf36656535
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ngx_resolver.c
+18 -2
View File
@@ -847,7 +847,15 @@ ngx_resolve_name_locked(ngx_resolver_t *r, ngx_resolver_ctx_t *ctx,
rn->nsrvs = 0;
if (ngx_resolver_send_query(r, rn) != NGX_OK) {
goto failed;
/* immediately retry once on failure */
rn->last_connection++;
if (rn->last_connection == r->connections.nelts) {
rn->last_connection = 0;
}
(void) ngx_resolver_send_query(r, rn);
}
if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
@@ -1051,7 +1059,15 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
rn->nsrvs = 0;
if (ngx_resolver_send_query(r, rn) != NGX_OK) {
goto failed;
/* immediately retry once on failure */
rn->last_connection++;
if (rn->last_connection == r->connections.nelts) {
rn->last_connection = 0;
}
(void) ngx_resolver_send_query(r, rn);
}
if (ngx_resolver_set_timeout(r, ctx) != NGX_OK) {
src/event/ngx_event_openssl.c
+2
View File
@@ -2101,6 +2101,8 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
|| n == SSL_R_DIGEST_CHECK_FAILED /* 149 */
|| n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */
|| n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */
|| n == SSL_R_HTTPS_PROXY_REQUEST /* 155 */
|| n == SSL_R_HTTP_REQUEST /* 156 */
|| n == SSL_R_LENGTH_MISMATCH /* 159 */
#ifdef SSL_R_NO_CIPHERS_PASSED
|| n == SSL_R_NO_CIPHERS_PASSED /* 182 */