From: Stefan Eissing <icing@apache.org>
Date: Tue, 8 Sep 2015 10:01:43 +0000 (+0000)
Subject: added 1701347, re-merged with current 2.4.x
X-Git-Tag: 2.4.17~79^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdf2eb33e9d1472c14438170053d783e025f3c3;p=thirdparty%2Fapache%2Fhttpd.git

added 1701347, re-merged with current 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701759 13f79535-47bb-0310-9956-ffa450edef68
---

2bdf2eb33e9d1472c14438170053d783e025f3c3
diff --cc modules/http2/mod_h2.dsp
index 7147e2d5631,00000000000..3d73f19513d
mode 100644,000000..100644
--- a/modules/http2/mod_h2.dsp
+++ b/modules/http2/mod_h2.dsp
@@@ -1,211 -1,0 +1,207 @@@
 +# Microsoft Developer Studio Project File - Name="mod_h2" - Package Owner=<4>
 +# Microsoft Developer Studio Generated Build File, Format Version 6.00
 +# ** DO NOT EDIT **
 +
 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 +
 +CFG=mod_h2 - Win32 Release
 +!MESSAGE This is not a valid makefile. To build this project using NMAKE,
 +!MESSAGE use the Export Makefile command and run
 +!MESSAGE 
 +!MESSAGE NMAKE /f "mod_h2.mak".
 +!MESSAGE 
 +!MESSAGE You can specify a configuration when running NMAKE
 +!MESSAGE by defining the macro CFG on the command line. For example:
 +!MESSAGE 
 +!MESSAGE NMAKE /f "mod_h2.mak" CFG="mod_h2 - Win32 Release"
 +!MESSAGE 
 +!MESSAGE Possible choices for configuration are:
 +!MESSAGE 
 +!MESSAGE "mod_h2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 +!MESSAGE "mod_h2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 +!MESSAGE 
 +
 +# Begin Project
 +# PROP AllowPerConfigDependencies 0
 +# PROP Scc_ProjName ""
 +# PROP Scc_LocalPath ""
 +CPP=cl.exe
 +MTL=midl.exe
 +RSC=rc.exe
 +
 +!IF  "$(CFG)" == "mod_h2 - Win32 Release"
 +
 +# PROP BASE Use_MFC 0
 +# PROP BASE Use_Debug_Libraries 0
 +# PROP BASE Output_Dir "Release"
 +# PROP BASE Intermediate_Dir "Release"
 +# PROP BASE Target_Dir ""
 +# PROP Use_MFC 0
 +# PROP Use_Debug_Libraries 0
 +# PROP Output_Dir "Release"
 +# PROP Intermediate_Dir "Release"
 +# PROP Ignore_Export_Lib 0
 +# PROP Target_Dir ""
 +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ssize_t=long" /FD /c
 +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Release\mod_h2_src" /FD /c
 +# ADD BASE MTL /nologo /D "NDEBUG" /win32
 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 +# ADD BASE RSC /l 0x409 /d "NDEBUG"
 +# ADD RSC /l 0x409 /fo"Release/mod_h2.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_h2.so" /d LONG_NAME="http2_module for Apache"
 +BSC32=bscmake.exe
 +# ADD BASE BSC32 /nologo
 +# ADD BSC32 /nologo
 +LINK32=link.exe
 +# ADD BASE LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /out:".\Release\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so
 +# ADD LINK32 kernel32.lib nghttp2.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Release\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so /opt:ref
 +# Begin Special Build Tool
 +TargetPath=.\Release\mod_h2.so
 +SOURCE="$(InputPath)"
 +PostBuild_Desc=Embed .manifest
 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 +# End Special Build Tool
 +
 +!ELSEIF  "$(CFG)" == "mod_h2 - Win32 Debug"
 +
 +# PROP BASE Use_MFC 0
 +# PROP BASE Use_Debug_Libraries 1
 +# PROP BASE Output_Dir "Debug"
 +# PROP BASE Intermediate_Dir "Debug"
 +# PROP BASE Target_Dir ""
 +# PROP Use_MFC 0
 +# PROP Use_Debug_Libraries 1
 +# PROP Output_Dir "Debug"
 +# PROP Intermediate_Dir "Debug"
 +# PROP Ignore_Export_Lib 0
 +# PROP Target_Dir ""
 +# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ssize_t=long" /FD /c
 +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/nghttp2/lib/includes" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ssize_t=long" /Fd"Debug\mod_h2_src" /FD /c
 +# ADD BASE MTL /nologo /D "_DEBUG" /win32
 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 +# ADD BASE RSC /l 0x409 /d "_DEBUG"
 +# ADD RSC /l 0x409 /fo"Debug/mod_h2.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_h2.so" /d LONG_NAME="http2_module for Apache"
 +BSC32=bscmake.exe
 +# ADD BASE BSC32 /nologo
 +# ADD BSC32 /nologo
 +LINK32=link.exe
 +# ADD BASE LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so
 +# ADD LINK32 kernel32.lib nghttp2d.lib /nologo /subsystem:windows /dll /libpath:"..\..\srclib\nghttp2\lib\MSVC_obj" /incremental:no /debug /out:".\Debug\mod_h2.so" /base:@..\..\os\win32\BaseAddr.ref,mod_h2.so
 +# Begin Special Build Tool
 +TargetPath=.\Debug\mod_h2.so
 +SOURCE="$(InputPath)"
 +PostBuild_Desc=Embed .manifest
 +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 +# End Special Build Tool
 +
 +!ENDIF 
 +
 +# Begin Target
 +
 +# Name "mod_h2 - Win32 Release"
 +# Name "mod_h2 - Win32 Debug"
 +# Begin Source File
 +
 +SOURCE=./h2_alt_svc.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_config.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_conn.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_conn_io.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_ctx.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_from_h1.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_h2.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_io.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_io_set.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_mplx.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_request.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_response.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_session.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_stream.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_stream_set.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_switch.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_task.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_task_input.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_task_output.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_task_queue.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_to_h1.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_util.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_worker.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=./h2_workers.c
 +# End Source File
 +# Begin Source File
 +
- SOURCE=./h2_workers.c
- # End Source File
- # Begin Source File
- 
 +SOURCE=./mod_h2.c
 +# End Source File
 +# Begin Source File
 +
 +SOURCE=..\..\build\win32\httpd.rc
 +# End Source File
 +# End Target
 +# End Project