httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_rewrite.c
Date Wed, 05 Apr 2000 21:01:08 GMT
ake         00/04/05 14:01:08

  Modified:    src      ApacheCore.def CHANGES Makefile.win
               src/modules/mpm/winnt winnt.c
               src/modules/standard mod_rewrite.c
  Log:
  Get mod_rewrite building and running, and mod_status building for Win NT
  
  Revision  Changes    Path
  1.14      +3 -0      apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheCore.def	2000/04/03 19:39:44	1.13
  +++ ApacheCore.def	2000/04/05 21:01:05	1.14
  @@ -394,3 +394,6 @@
           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
  
  
  
  1.58      +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- CHANGES	2000/04/05 17:27:57	1.57
  +++ CHANGES	2000/04/05 21:01:05	1.58
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a3-dev
  +  *) Get mod_rewrite building and running, and mod_status building for Win NT
  +     [Allan Edwards <ake@raleigh.ibm.com>]
  +
     *) Patch to port mod_auth_db to the 2.0 api and also to support 
        Berlekey DB 3.0. It works for me with both Berkeley DB 3.0.55 and 
        2.7.7.  It should work with version 1 as well but I haven't tested it.  
  
  
  
  1.7       +6 -6      apache-2.0/src/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.win	2000/04/05 03:49:16	1.6
  +++ Makefile.win	2000/04/05 21:01:05	1.7
  @@ -73,7 +73,7 @@
   	 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 @@
   	 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 @@
   	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 @@
   	 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 @@
   	 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
  
  
  
  1.48      +6 -0      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- winnt.c	2000/04/03 21:11:55	1.47
  +++ winnt.c	2000/04/05 21:01:06	1.48
  @@ -1837,6 +1837,12 @@
       /* 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,
  
  
  
  1.20      +9 -2      apache-2.0/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_rewrite.c	2000/04/05 02:09:44	1.19
  +++ mod_rewrite.c	2000/04/05 21:01:07	1.20
  @@ -2990,8 +2990,10 @@
   
       /* 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 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;
  
  
  

Mime
View raw message