Compare commits

..

No commits in common. "master" and "release-1.29.4" have entirely different histories.

3 changed files with 4 additions and 5 deletions

View File

@ -58,7 +58,7 @@ body:
required: true required: true
- type: textarea - type: textarea
id: version id: environment
attributes: attributes:
label: NGINX version and build configuration options label: NGINX version and build configuration options
description: Please provide details about your NGINX build. description: Please provide details about your NGINX build.
@ -79,7 +79,7 @@ body:
required: true required: true
- type: textarea - type: textarea
id: architecture id: environment
attributes: attributes:
label: Architecture where NGINX is being built and/or deployed label: Architecture where NGINX is being built and/or deployed
description: Please provide details about your deployment environment. description: Please provide details about your deployment environment.

View File

@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_ #define _NGINX_H_INCLUDED_
#define nginx_version 1029005 #define nginx_version 1029004
#define NGINX_VERSION "1.29.5" #define NGINX_VERSION "1.29.4"
#define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD #ifdef NGX_BUILD

View File

@ -4012,7 +4012,6 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
|| n == SSL_R_TLSV1_ALERT_USER_CANCELLED /* 1090 */ || n == SSL_R_TLSV1_ALERT_USER_CANCELLED /* 1090 */
|| n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION /* 1100 */ || n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION /* 1100 */
#endif #endif
|| n == 1121 /* SSL_R_TLSV1_ALERT_ECH_REQUIRED */
) )
{ {
switch (c->log_error) { switch (c->log_error) {