mod_proxy_ajp: Support unknown HTTP methods.

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index b81517431a5e103bf8be6b5f6d6e37c425b78331..4bf3abffddefc6080c449e43648cf774e56d8b56 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,14 +1,18 @@
 # Makefile for Windows NT and Windows 95/98/2000
 
 # Targets are:
-#   _buildr   - build Apache in Release mode
-#   _buildd   - build Apache in Debug mode
-#   installr   - build and install a Release build
-#   installd   - build and install a Debug build
-#   clean      - remove (most) generated files
-#   _cleanr    - remove (most) files generated by a Release build
-#   _cleand    - remove (most) files generated by a Debug build
-#   _browse    - build the browse info file
+#   _buildr     - build Apache in Release mode
+#   _buildd     - build Apache in Debug mode
+#   installr    - build and install a Release build
+#   installd    - build and install a Debug build
+#   clean       - remove (most) generated files
+#   _cleanr     - remove (most) files generated by a Release build
+#   _cleand     - remove (most) files generated by a Debug build
+#   _browse     - build the browse info file
+#   _fixshebang - add proper shebang lines to activate installed 
+#                 printenv files
+#                 Note: _fixshebang must be run separately and is not
+#                 run by any of the above install* targets.
 #
 # The following install defaults may be customized;
 #
@@ -632,6 +636,9 @@ _build:
        devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html
        devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc
 !ENDIF
+!IF EXIST("srclib\serf")
+       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_serf
+!ENDIF
 
 !ELSE
 
@@ -677,6 +684,10 @@ _build:
        @msdev $(TLP).dsw /USEENV /MAKE \
                "mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
+!IF EXIST("srclib\serf")
+       @msdev $(TLP).dsw /USEENV /MAKE \
+               "mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
 
 !ENDIF
 
@@ -1044,21 +1055,9 @@ BEGIN {
                INSTALL_DIR="$(INSTDIR)\bin\iconv"
        cd ..\..
 !ENDIF
-       copy docs\cgi-examples\printenv.vbs "$(INSTDIR)\cgi-bin\printenv.vbs" <.y
        copy docs\cgi-examples\printenv "$(INSTDIR)\cgi-bin\printenv.pl" <.y
-       -awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
-    BEGIN { 
-       if ( "perl -e \"print $$^X;\"" | getline perlroot ) {
-           gsub( /\\/, "/", perlroot );
-           print "#!" perlroot;
-       }
-    }
-    {
-       if ( $$0 !~ /^#!/ ) {
-           print $$0;
-       }
-    }
-<<
+       copy docs\cgi-examples\printenv.vbs "$(INSTDIR)\cgi-bin\printenv.vbs" <.y
+       copy docs\cgi-examples\printenv.wsf "$(INSTDIR)\cgi-bin\printenv.wsf" <.y
        xcopy docs\error        "$(INSTDIR)\error" /s /d < .a
        xcopy docs\docroot      "$(INSTDIR)\htdocs" /d < .a
        xcopy docs\icons        "$(INSTDIR)\icons" /s /d < .a
@@ -1074,6 +1073,7 @@ BEGIN {
                include\*.h \
                os\win32\os.h \
                modules\cache\mod_cache.h \
+               modules\cache\cache_common.h \
                modules\core\mod_so.h \
                modules\core\mod_watchdog.h \
                modules\database\mod_dbd.h \
@@ -1131,3 +1131,46 @@ BEGIN {
 <<
        del .y
        del .a
+
+_fixshebang:
+!IF EXIST("$(INSTDIR)\cgi-bin")
+       -awk -f <<script.awk "docs/cgi-examples/printenv" > "$(INSTDIR)\cgi-bin\printenv.pl"
+    BEGIN { 
+       if ( "perl -e \"print $$^X;\"" | getline perlroot ) {
+           gsub( /\\/, "/", perlroot );
+           print "#!" perlroot;
+       }
+    }
+    {
+       if ( $$0 !~ /^#!/ ) {
+           print $$0;
+       }
+    }
+<<
+       -cscript -nologo <<script.vbs "docs/cgi-examples/printenv.vbs" "$(INSTDIR)\cgi-bin\printenv.vbs"
+    Dim fso, f, c
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set f = fso.OpenTextFile(WScript.Arguments(0), 1)
+    f.SkipLine
+    c = f.ReadAll
+    f.Close
+    Set f = fso.OpenTextFile(WScript.Arguments(1), 2, TRUE)
+    f.WriteLine "'!" & Replace(WScript.FullName, "\", "/") & " -nologo"
+    f.Write c
+    f.Close
+<<
+       -cscript -nologo <<script.vbs "docs/cgi-examples/printenv.wsf" "$(INSTDIR)\cgi-bin\printenv.wsf"
+    Dim fso, f, c
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set f = fso.OpenTextFile(WScript.Arguments(0), 1)
+    f.SkipLine
+    c = f.ReadAll
+    f.Close
+    Set f = fso.OpenTextFile(WScript.Arguments(1), 2, TRUE)
+    f.WriteLine "'!" & Replace(WScript.FullName, "\", "/") & " -nologo"
+    f.Write c
+    f.Close
+<<
+!ENDIF
+
+