New upstream version 7.52.1

2 files changed, 28 insertions, 3 deletions

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index bd5c8e03..1443dfa0 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -21,6 +21,8 @@ CFGSET=true
 !MESSAGE                                  Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
 !MESSAGE                                  Uncompress them into the deps folder.
 !MESSAGE   WITH_SSL=<dll or static>     - Enable OpenSSL support, DLL or static
+!MESSAGE   ENABLE_NGHTTP2=<yes or no>   - Enable HTTP/2 support, defaults to no
+!MESSAGE                                  Requires OpenSSL
 !MESSAGE   WITH_CARES=<dll or static>   - Enable c-ares support, DLL or static
 !MESSAGE   WITH_ZLIB=<dll or static>    - Enable zlib support, DLL or static
 !MESSAGE   WITH_SSH2=<dll or static>    - Enable libSSH2 support, DLL or static
@@ -109,6 +111,16 @@ USE_SSL = true
 SSL     = static
 !ENDIF
 
+!IF "$(USE_SSL)"=="true"
+!IF "$(ENABLE_NGHTTP2)"=="yes"
+USE_NGHTTP2 = true
+!ENDIF
+!ENDIF
+
+!IFNDEF USE_NGHTTP2
+USE_NGHTTP2 = false
+!ENDIF
+
 !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"
 USE_MBEDTLS = true
 MBEDTLS     = $(WITH_MBEDTLS)
@@ -213,6 +225,7 @@ $(MODE):
 
 	@SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
 	@SET MACHINE=$(MACHINE)
+	@SET USE_NGHTTP2=$(USE_NGHTTP2)
 	@SET USE_IDN=$(USE_IDN)
 	@SET USE_IPV6=$(USE_IPV6)
 	@SET USE_SSPI=$(USE_SSPI)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 159dccd3..96ab37ef 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -123,8 +123,22 @@ USE_SSL      = true
 SSL          = static

 !ENDIF

 

+!IFNDEF USE_NGHTTP2

+USE_NGHTTP2  = false

+!ENDIF

+

 !IFDEF USE_SSL

 SSL_CFLAGS   = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"

+

+!IF "$(USE_NGHTTP2)"=="yes"

+USE_NGHTTP2  = true

+!ENDIF

+

+!IF "$(USE_NGHTTP2)"=="true"

+SSL_CFLAGS   = $(SSL_CFLAGS) /DUSE_NGHTTP2

+SSL_LIBS     = $(SSL_LIBS) nghttp2.lib

+!ENDIF

+

 !ENDIF

 

 !IF "$(WITH_MBEDTLS)"=="dll" || "$(WITH_MBEDTLS)"=="static"

@@ -416,6 +430,7 @@ package: $(TARGET)
 

 $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)

 	@echo Using SSL: $(USE_SSL)

+	@echo Using NGHTTP2: $(USE_NGHTTP2)

 	@echo Using c-ares: $(USE_CARES)

 	@echo Using SSH2: $(USE_SSH2)

 	@echo Using ZLIB: $(USE_ZLIB)

@@ -494,7 +509,6 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 

 CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \

  $(CURL_DIROBJ)\nonblock.obj \

- $(CURL_DIROBJ)\strcase.obj \

  $(CURL_DIROBJ)\strtoofft.obj \

  $(CURL_DIROBJ)\warnless.obj

  

@@ -509,8 +523,6 @@ $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
 	$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c

 $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c

 	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c

-$(CURL_DIROBJ)\strcase.obj: ../lib/strcase.c

-	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strcase.c

 $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c

 	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c

 $(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c