cvs commit: apache-1.3/src/modules/standard mod_rewrite.h mod_rewrite.c

[rse]

rse         99/04/22 02:54:41

  Modified:    src/modules/standard mod_rewrite.h mod_rewrite.c
  Log:
  RewriteLock is a _global_ facility of the rewrite engine, so make sure the
  directive can only be used in a global context and not within any
  <VirtualHost> sections, etc.
  
  Revision  Changes    Path
  1.62      +1 -0      apache-1.3/src/modules/standard/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_rewrite.h     1999/03/07 18:03:37     1.61
  +++ mod_rewrite.h     1999/04/22 09:54:37     1.62
  @@ -105,6 +105,7 @@
   #include <sys/stat.h>
   
       /* Include from the Apache server ... */
  +#define CORE_PRIVATE
   #include "httpd.h"
   #include "http_config.h"
   #include "http_conf_globals.h"
  
  
  
  1.137     +3 -0      apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- mod_rewrite.c     1999/03/07 18:03:34     1.136
  +++ mod_rewrite.c     1999/04/22 09:54:37     1.137
  @@ -529,7 +529,10 @@
   static const char *cmd_rewritelock(cmd_parms *cmd, void *dconf, char *a1)
   {
       rewrite_server_conf *sconf;
  +    const char *error;
   
  +    if ((error = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
  +        return error;
       sconf = (rewrite_server_conf *)
               ap_get_module_config(cmd->server->module_config, 
&rewrite_module);