Get mod_rewrite building and running, and mod_status building for Win NT

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

diff --git a/ApacheCore.def b/ApacheCore.def
index df8104726bbcb2fd907c3f0ceb537d0058e5afcc..a3427bc0ae1e252db0d152801b939870e16fb3db 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -394,3 +394,6 @@ EXPORTS
         ap_hook_post_config @389
         ap_hook_open_logs @390
         ap_hook_child_init @391
+        ap_get_status_table @392
+        ap_run_default_port @393
+        ap_run_http_method @394

diff --git a/Makefile.win b/Makefile.win
index 1cd0c9962cdd03656e554d15799e9a292cfc2fe1..c9e86addc197309156b02bc8927d9f5d19657bd1 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -73,7 +73,7 @@ _build:
         nmake /nologo CFG="Apache - Win32 $(LONG)" -f Apache.mak
        cd os\win32
 #        set CFG=ApacheModuleStatus - Win32 $(LONG)
-#        nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak
+         nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak
 #        nmake /nologo CFG"=ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak
         nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak
         nmake /nologo CFG="ApacheModuleDigest - Win32 $(LONG)" -f ApacheModuleDigest.mak
@@ -82,7 +82,7 @@ _build:
         nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak
         nmake /nologo CFG="ApacheModuleSpeling - Win32 $(LONG)" -f ApacheModuleSpeling.mak
         nmake /nologo CFG="ApacheModuleUserTrack - Win32 $(LONG)" -f ApacheModuleUserTrack.mak
-#        nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak
+         nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak
        cd ..\..
 #       cd modules\proxy
 #        nmake /nologo CFG="ApacheModuleProxy - Win32 $(LONG)" -f ApacheModuleProxy.mak
@@ -97,14 +97,14 @@ _install:
        copy Apache$(SHORT)\Apache.exe $(INSTDIR)
        copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
        copy lib\apr\$(LONG)\aprlib.dll $(INSTDIR)
-#       copy os\win32\ApacheModuleStatus$(SHORT)\ApacheModuleStatus.dll $(INSTDIR)\modules
+        copy os\win32\ApacheModuleStatus$(SHORT)\ApacheModuleStatus.dll $(INSTDIR)\modules
 #       copy os\win32\ApacheModuleInfo$(SHORT)\ApacheModuleInfo.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleAuthAnon$(SHORT)\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleDigest$(SHORT)\ApacheModuleDigest.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleCERNMeta$(SHORT)\ApacheModuleCERNMeta.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleExpires$(SHORT)\ApacheModuleExpires.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleHeaders$(SHORT)\ApacheModuleHeaders.dll $(INSTDIR)\modules
-#       copy os\win32\ApacheModuleRewrite$(SHORT)\ApacheModuleRewrite.dll $(INSTDIR)\modules
+        copy os\win32\ApacheModuleRewrite$(SHORT)\ApacheModuleRewrite.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules
        copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules
 #       copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules
@@ -136,7 +136,7 @@ _clean:
         nmake /nologo CFG="ApacheCore - Win32 $(LONG)" -f ApacheCore.mak clean
         nmake /nologo CFG="Apache - Win32 $(LONG)" -f Apache.mak clean
        cd os\win32
-#        nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak clean
+         nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak clean
 #        nmake /nologo CFG="ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak clean
         nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak clean
         nmake /nologo CFG="ApacheModuleDigest - Win32 $(LONG)" -f ApacheModuleDigest.mak clean
@@ -145,7 +145,7 @@ _clean:
         nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak clean
         nmake /nologo CFG="ApacheModuleSpeling - Win32 $(LONG)" -f ApacheModuleSpeling.mak clean
         nmake /nologo CFG="ApacheModuleUserTrack - Win32 $(LONG)" -f ApacheModuleUserTrack.mak clean
-#        nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak clean
+         nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak clean
        cd ..\..
 #       cd modules\proxy
 #        nmake /nologo CFG="ApacheModuleProxy - Win32 $(LONG)" -f ApacheModuleProxy.mak clean

diff --git a/libhttpd.def b/libhttpd.def
index df8104726bbcb2fd907c3f0ceb537d0058e5afcc..a3427bc0ae1e252db0d152801b939870e16fb3db 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -394,3 +394,6 @@ EXPORTS
         ap_hook_post_config @389
         ap_hook_open_logs @390
         ap_hook_child_init @391
+        ap_get_status_table @392
+        ap_run_default_port @393
+        ap_run_http_method @394

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 421f1967ebb0e6aaf35c214b0b13eb02d5d7aa1a..f03763e10868609a004677d56d1d811d3f264948 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -2990,8 +2990,10 @@ static char *lookup_map_program(request_rec *r, ap_file_t *fpin,
 
     /* write out the request key */
 #ifdef NO_WRITEV
-    ap_write(fpin, key, strlen(key));
-    ap_write(fpin, "\n", 1);
+    nbytes = strlen(key);
+    ap_write(fpin, key, &nbytes);
+    nbytes = 1;
+    ap_write(fpin, "\n", &nbytes);
 #else
     iova[0].iov_base = key;
     iova[0].iov_len = strlen(key);
@@ -3330,6 +3332,11 @@ static void rewritelock_create(server_rec *s, ap_context_t *p)
 
 static ap_status_t rewritelock_remove(void *data)
 {
+    /* only operate if a lockfile is used */
+    if (lockname == NULL || *(lockname) == '\0') {
+        return;
+    }
+
     /* destroy the rewritelock */
     ap_destroy_lock (rewrite_map_lock);
     rewrite_map_lock = NULL;

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 5782b429480b003b876a510cf90fd774a62fe5c8..2632b5fbc6aa180a34ab8125a6b6e11b5c359649 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1837,6 +1837,12 @@ API_EXPORT(void) ap_reset_connection_status(long conn_id)
     /* NOP */
 }
 
+API_EXPORT(ap_array_header_t *) ap_get_status_table(ap_context_t *p)
+{
+    /* NOP */
+    return NULL;
+}
+
 static const command_rec winnt_cmds[] = {
 LISTEN_COMMANDS
 { "PidFile", set_pidfile, NULL, RSRC_CONF, TAKE1,