www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Sync http2 stuff with 2.4.x.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705819 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-09-29 09:12:59 +00:00
parent d2c4561709
commit 719890b9bd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.win
View File

@@ -250,21 +250,21 @@ _trylua:
_trynghttp2: _trynghttp2:
!IF $(USEMAK) == 1 !IF $(USEMAK) == 1
cd modules\http2 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 ..\.. cd ..\..
!ELSEIF $(USESLN) == 1 !ELSEIF $(USESLN) == 1
devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2 devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
!ELSE !ELSE
@msdev $(TLP).dsw /USEENV /MAKE \ @msdev $(TLP).dsw /USEENV /MAKE \
"mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET) "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF !ENDIF
!ELSE !ELSE
# NOT EXIST("srclib\lua") # NOT EXIST("srclib\nghttp2")
_trynghttp2: _trynghttp2:
@echo ----- @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 Version 1.0 includes an lib\makefile.msvc that will satisfy this
@echo requirement. @echo requirement.
@@ -539,7 +539,7 @@ _build:
cd ..\.. cd ..\..
!IF EXIST("srclib\nghttp2") !IF EXIST("srclib\nghttp2")
cd modules\http2 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 ..\.. cd ..\..
!ENDIF !ENDIF
cd modules\loggers cd modules\loggers
@@ -829,7 +829,7 @@ _copybin:
copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y
copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\nghttp2") !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" !IF "$(SHORT)" == "D"
copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y
!ELSE !ELSE

2
modules/ssl/ssl_engine_kernel.c
View File

@@ -2221,7 +2221,7 @@ int ssl_callback_alpn_select(SSL *ssl,
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_OK;
} }
#endif #endif /* HAVE_TLS_ALPN */
#ifdef HAVE_SRP #ifdef HAVE_SRP