Skip to content

ZRFE-1881: Upgrade nginx to 1.26.3 #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghen2 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

ZRFE-1881: Upgrade nginx to 1.26.3 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion thirdparty/nginx/patches/nginx_auto_options.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- nginx/auto/options 2023-08-18 17:02:49.224080200 +0530
+++ nginx/auto/options 2023-09-14 18:47:11.483533400 +0530
@@ -151,6 +151,12 @@
USE_OPENSSL=NO
USE_OPENSSL_QUIC=NO
OPENSSL=NONE

+# Zimbra customizations start here: Implement SASL Authentication (Jira Tickets: )
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/nginx/patches/nginx_src_event.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff -urN nginx/src/event/ngx_event_openssl.c nginx/src/event/ngx_event_openssl.
--- nginx/src/event/ngx_event_openssl.c 2023-10-03 16:49:31.242377500 +0530
+++ nginx/src/event/ngx_event_openssl.c 2023-10-12 01:03:16.055868100 +0530
@@ -3203,9 +3203,6 @@
ngx_uint_t tries;
#endif

rc = NGX_OK;
-
Expand Down
2 changes: 1 addition & 1 deletion versions.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ MARIADB_VERSION := 10.4.13

MAVEN_VERSION := 3.3.9

NGINX_VERSION := 1.24.0
NGINX_VERSION := 1.26.3
NGINX_HTTP_KEEPALIVE := 19755fc0e22aa7d7ac2198f78b297951d31ea1dc

OPENSSL_VERSION := 3.0.9
Expand Down