Add some mime magic to the Win32 build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91291 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index bbb61a2071065f0d54d4a370d1b9201b6d697432..d06973a1764a7ae3b589a80052ecfc88f0ea61d0 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -78,6 +78,9 @@ Package=<4>
     Project_Dep_Name mod_info
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_mime_magic
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_rewrite
     End Project Dependency
     Begin Project Dependency
@@ -543,6 +546,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_unique_id"=".\modules\metadata\mod_mime_magic.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_rewrite"=".\modules\mappers\mod_rewrite.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -802,6 +823,9 @@ Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
 }}}
 
 Package=<4>

diff --git a/Makefile.win b/Makefile.win
index c2678ce6fda35ab4d3ecfd1abef6ae9f3a56eff0..d1c6dbd4432bb13791025059de53d20da69e312c 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -158,6 +158,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_expires.mak CFG="mod_expires - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_mime_magic.mak CFG="mod_mime_magic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_unique_id.mak CFG="mod_unique_id - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_usertrack.mak CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
@@ -225,6 +226,7 @@ _build:
                "mod_cern_meta - Win32 $(LONG)"\
                "mod_expires - Win32 $(LONG)"\
                "mod_headers - Win32 $(LONG)"\
+               "mod_mime_magic - Win32 $(LONG)"\
                "mod_unique_id - Win32 $(LONG)"\
                "mod_usertrack - Win32 $(LONG)"\
                "mod_proxy - Win32 $(LONG)"\
@@ -295,6 +297,7 @@ _install:
        copy modules\metadata\$(LONG)\mod_cern_meta.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_expires.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"
+       copy modules\metadata\$(LONG)\mod_mime_magic.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_unique_id.so "$(INSTDIR)\modules"
        copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"
        copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"

diff --git a/modules/metadata/mod_mime_magic.dsp b/modules/metadata/mod_mime_magic.dsp
new file mode 100644 (file)
index 0000000..f831ae4
--- /dev/null
+++ b/modules/metadata/mod_mime_magic.dsp
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="mod_mime_magic" - 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_mime_magic - 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_mime_magic.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_mime_magic.mak" CFG="mod_mime_magic - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mod_mime_magic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_mime_magic - 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_mime_magic - 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" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_mime_magic" /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 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_mime_magic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mime_magic
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_mime_magic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mime_magic
+
+!ELSEIF  "$(CFG)" == "mod_mime_magic - 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 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_mime_magic" /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 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mime_magic
+# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_mime_magic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mime_magic
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mod_mime_magic - Win32 Release"
+# Name "mod_mime_magic - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_mime_magic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_mime_magic.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "mod_mime_magic - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_mime_magic.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_mime_magic  "mime_magic_module for Apache" ../../include/ap_release.h  > .\mod_mime_magic.rc
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mod_mime_magic - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_mime_magic.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       awk -f ../../build/win32/win32ver.awk mod_mime_magic  "mime_magic_module for Apache" ../../include/ap_release.h  > .\mod_mime_magic.rc
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 59f3d8091efd7209317a677050004421ad6ee0c2..f7dd27c94235f4e8b30ef036abc9dca79b3be352 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -23,10 +23,11 @@ mod_file_cache       0x6FE20000    0x00020000
 mod_auth_dbm         0x6FE10000    0x00010000
 mod_unique_id        0x6FE00000    0x00010000
 mod_vhost_alias      0x6FDF0000    0x00010000
-mod_dav_fs           0x6FDE0000    0x00010000
+mod_mime_magic       0x6FDE0000    0x00010000
 mod_dav              0x6FDC0000    0x00020000
-mod_proxy            0x6FDB0000    0x00010000
-proxy_connect        0x6FDA0000    0x00010000
-proxy_ftp            0x6FD90000    0x00010000
-proxy_http           0x6FD80000    0x00010000
-mod_ssl              0x6FD00000    0x00080000
+mod_dav_fs           0x6FDB0000    0x00010000
+mod_proxy            0x6FDA0000    0x00010000
+proxy_connect        0x6FD90000    0x00010000
+proxy_ftp            0x6FD80000    0x00010000
+proxy_http           0x6FD70000    0x00010000
+mod_ssl              0x6FD00000    0x00070000