From 719890b9bdc09141834ea66a00c7ac3cdc3665e7 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 Sep 2015 09:12:59 +0000
Subject: [PATCH] Sync http2 stuff with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705819 13f79535-47bb-0310-9956-ffa450edef68
---
Makefile.win | 14 +++++++-------
modules/ssl/ssl_engine_kernel.c | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index a953f60fdb..5f6a791a0b 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -250,21 +250,21 @@ _trylua:
_trynghttp2:
!IF $(USEMAK) == 1
cd modules\http2
- $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
!ELSEIF $(USESLN) == 1
- devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
!ELSE
@msdev $(TLP).dsw /USEENV /MAKE \
- "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
!ELSE
-# NOT EXIST("srclib\lua")
+# NOT EXIST("srclib\nghttp2")
_trynghttp2:
@echo -----
- @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.
+ @echo mod_http2 will not build unless nghttp2 is installed in srclib\nghttp2.
@echo Version 1.0 includes an lib\makefile.msvc that will satisfy this
@echo requirement.
@@ -539,7 +539,7 @@ _build:
cd ..\..
!IF EXIST("srclib\nghttp2")
cd modules\http2
- $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
!ENDIF
cd modules\loggers
@@ -829,7 +829,7 @@ _copybin:
copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y
copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\nghttp2")
- copy modules\http2\$(LONG)\mod_h2.$(src_so) "$(inst_so)" <.y
+ copy modules\http2\$(LONG)\mod_http2.$(src_so) "$(inst_so)" <.y
!IF "$(SHORT)" == "D"
copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y
!ELSE
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 7352397b04..9af5daa760 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -2221,7 +2221,7 @@ int ssl_callback_alpn_select(SSL *ssl,
return SSL_TLSEXT_ERR_OK;
}
-#endif
+#endif /* HAVE_TLS_ALPN */
#ifdef HAVE_SRP
--
2.40.0