Commit 1fee492f authored by Allan K. Edwards's avatar Allan K. Edwards
Browse files

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
parent de23c162

ApacheCore.def

+3 −0
Changes for ApacheCore.def: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

Makefile.win

+6 −6
Changes for Makefile.win: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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

libhttpd.def

+3 −0
Changes for libhttpd.def: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/mappers/mod_rewrite.c

+9 −2
Changes for modules/mappers/mod_rewrite.c: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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;

server/mpm/winnt/mpm_winnt.c

+6 −0
Changes for server/mpm/winnt/mpm_winnt.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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,