Received: by taz.hyperreal.com (8.8.4/V2.0) id MAA10675;
 Mon, 17 Feb 1997 12:16:20 -0800 (PST)
Received: by taz.hyperreal.com (8.8.4/V2.0) id MAA10660;
 Mon, 17 Feb 1997 12:16:18 -0800 (PST)
Date: Mon, 17 Feb 1997 12:16:18 -0800 (PST)
From: Marc Slemko <marc@hyperreal.com>
Message-Id: <199702172016.MAA10660@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src http_request.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

marc        97/02/17 12:16:18

  Modified:    src       http_request.c
  Log:
  Fix indenting to be somewhat consistent with surrounding source; now
  indented correctly with something other than ts=6.
  
  Revision  Changes    Path
  1.44      +7 -7      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -C3 -r1.43 -r1.44
  *** http_request.c	1997/02/17 10:46:07	1.43
  --- http_request.c	1997/02/17 20:16:16	1.44
  ***************
  *** 368,380 ****
    	    else if (!strcmp (this_dir, entry_dir))
    	        this_conf = entry_config;
    
  !           if (this_conf)
  !           {
  !               per_dir_defaults =
  !                   merge_per_dir_configs (r->pool, per_dir_defaults, this_conf);
  !               core_dir =(core_dir_config *)get_module_config(per_dir_defaults,
  ! 							   &core_module);
  !           }
    	}
    
    	overrides_here = core_dir->override;
  --- 368,380 ----
    	    else if (!strcmp (this_dir, entry_dir))
    	        this_conf = entry_config;
    
  ! 	    if (this_conf) {
  ! 	        per_dir_defaults =
  ! 	           merge_per_dir_configs (r->pool, per_dir_defaults, this_conf);
  ! 	        core_dir =(core_dir_config *)get_module_config(per_dir_defaults,
  ! 	           &core_module);
  ! 	    }
  ! 
    	}
    
    	overrides_here = core_dir->override;