httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Sat, 06 Oct 2001 22:47:20 GMT
wrowe       01/10/06 15:47:20

  Modified:    server   request.c
  Log:
    Hmmm... continue's not so good an idea here :)
  
  Revision  Changes    Path
  1.63      +18 -16    httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- request.c	2001/10/06 22:16:11	1.62
  +++ request.c	2001/10/06 22:47:20	1.63
  @@ -415,6 +415,8 @@
       return OK;
   }
   
  +/* #define REPLACE_PATH_INFO_METHOD
  + */
   #ifndef REPLACE_PATH_INFO_METHOD
   
   static int check_symlinks(char *d, int opts, apr_pool_t *p)
  @@ -1142,23 +1144,23 @@
                        */
   minimerge2:
                       this_dir = ap_get_module_config(htaccess_conf, &core_module);
  -
  -                    if (!this_dir)
  -                        continue;
   
  -                    if (this_dir->opts & OPT_UNSET) {
  -	                opts_add = (opts_add & ~this_dir->opts_remove) | this_dir->opts_add;
  -	                opts_remove = (opts_remove & ~this_dir->opts_add)
  -	                            | this_dir->opts_remove;
  -	                opts = (opts & ~opts_remove) | opts_add;
  -                    }
  -                    else {
  -	                opts = this_dir->opts;
  -	                opts_add = this_dir->opts_add;
  -	                opts_remove = this_dir->opts_remove;
  -                    }
  -                    if (!(this_dir->override & OR_UNSET)) {
  -                        override = this_dir->override;
  +                    if (this_dir) 
  +                    {
  +                        if (this_dir->opts & OPT_UNSET) {
  +	                    opts_add = (opts_add & ~this_dir->opts_remove) | this_dir->opts_add;
  +	                    opts_remove = (opts_remove & ~this_dir->opts_add)
  +	                                | this_dir->opts_remove;
  +	                    opts = (opts & ~opts_remove) | opts_add;
  +                        }
  +                        else {
  +	                    opts = this_dir->opts;
  +	                    opts_add = this_dir->opts_add;
  +	                    opts_remove = this_dir->opts_remove;
  +                        }
  +                        if (!(this_dir->override & OR_UNSET)) {
  +                            override = this_dir->override;
  +                        }
                       }
                   }
               }
  
  
  

Mime
View raw message