cvs commit: apache-2.0/src/modules/standard mod_dir.c mod_include.c mod_negotiation.c

[dr...@locus.apache.org]

dreid       00/06/17 04:00:59

  Modified:    src/modules/standard mod_dir.c mod_include.c
                        mod_negotiation.c
  Log:
  ap_pool_join is a debugging function so remove it.
  
  Revision  Changes    Path
  1.13      +0 -1      apache-2.0/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_dir.c	2000/05/27 22:40:36	1.12
  +++ mod_dir.c	2000/06/17 11:00:57	1.13
  @@ -181,7 +181,6 @@
           if (ap_is_HTTP_REDIRECT(rr->status) ||
               (rr->status == HTTP_NOT_ACCEPTABLE && num_names == 1)) {
   
  -            ap_pool_join(r->pool, rr->pool);
               error_notfound = rr->status;
               r->notes = ap_overlay_tables(r->pool, r->notes, rr->notes);
               r->headers_out = ap_overlay_tables(r->pool, r->headers_out,
  
  
  
  1.40      +0 -1      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- mod_include.c	2000/06/12 23:02:59	1.39
  +++ mod_include.c	2000/06/17 11:00:57	1.40
  @@ -2444,7 +2444,6 @@
   	 * destroyed, that's dealt with in handle_include().
   	 */
   	r->subprocess_env = parent->subprocess_env;
  -	ap_pool_join(parent->pool, r->pool);
   	r->finfo.mtime = parent->finfo.mtime;
       }
       else {
  
  
  
  1.30      +0 -1      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_negotiation.c	2000/05/27 22:40:37	1.29
  +++ mod_negotiation.c	2000/06/17 11:00:57	1.30
  @@ -2643,7 +2643,6 @@
        * some values in this request will be allocated in r->pool, and others in
        * sub_req->pool.
        */
  -    ap_pool_join(r->pool, sub_req->pool);
       r->mtime = 0; /* reset etag info for subrequest */
       r->filename = sub_req->filename;
       r->handler = sub_req->handler;