Merge commit '484a904fa7' as 'nginx'

2026-04-30 00:59:20 +00:00 · 2026-04-30 00:59:20 +00:00 · 2b63c55768
commit 2b63c55768
parent a9df3b8ae9 484a904fa7
528 changed files with 294288 additions and 0 deletions
--- a/nginx/auto/lib/openssl/makefile.msvc
+++ b/nginx/auto/lib/openssl/makefile.msvc
@ -0,0 +1,21 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+all:
+	cd $(OPENSSL)
+
+	perl Configure $(OPENSSL_TARGET) no-shared no-threads		\
+		--prefix="%cd%/openssl" 				\
+		--openssldir="%cd%/openssl/ssl" 			\
+		$(OPENSSL_OPT)
+
+	if exist ms\do_ms.bat (						\
+		ms\do_ms						\
+		&& $(MAKE) -f ms\nt.mak					\
+		&& $(MAKE) -f ms\nt.mak install				\
+	) else (							\
+		$(MAKE)							\
+		&& $(MAKE) install_sw					\
+	)