From f7e68dba8ca579a3a2357840e827fd598f165ec3 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Tue, 24 May 2022 02:51:49 +0300 Subject: Updated OpenSSL and zlib used for win32 builds. --- misc/GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'misc') diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 58e9f7f00..8f839b477 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -6,8 +6,8 @@ TEMP = tmp CC = cl OBJS = objs.msvc8 -OPENSSL = openssl-1.1.1m -ZLIB = zlib-1.2.11 +OPENSSL = openssl-1.1.1o +ZLIB = zlib-1.2.12 PCRE = pcre2-10.39 -- cgit From 295f5b28aefdb97e94ddd51b0773c6d7a2a91e9b Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 20 Jun 2022 19:30:50 +0300 Subject: Misc: win32 sources now preserved in release tarballs. This makes it possible to build nginx under Windows from release tarballs instead of using source code repository. --- misc/GNUmakefile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'misc') diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 8f839b477..6895317c8 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -15,12 +15,6 @@ release: export mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX) - # delete incomplete sources - rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c - rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c - rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.* - rm -r $(TEMP)/$(NGINX)/src/os/win32 - mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX) mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX) -- cgit From 35c2d7a75e4c845251901b69cb4363fd61ddb1cd Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Tue, 21 Jun 2022 17:09:34 +0300 Subject: Updated OpenSSL used for win32 builds. --- misc/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 6895317c8..dfb5b9b62 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -6,7 +6,7 @@ TEMP = tmp CC = cl OBJS = objs.msvc8 -OPENSSL = openssl-1.1.1o +OPENSSL = openssl-1.1.1p ZLIB = zlib-1.2.12 PCRE = pcre2-10.39 -- cgit