httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_http.c
Date Sun, 14 Dec 2003 00:17:41 GMT
trawick     2003/12/13 16:17:41

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/proxy Tag: APACHE_2_0_BRANCH proxy_http.c
  Log:
  merge this fix from 2.1-dev:
  
       Fix memory leak in handling of request bodies during reverse
       proxy operations.
  
  PR:             24991
  Submitted by:	Larry Toppi <larry.toppi citrix.com>
  Reviewed by:	trawick, stas, ianh, stoddard, minfrin
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.195 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.194
  retrieving revision 1.988.2.195
  diff -u -r1.988.2.194 -r1.988.2.195
  --- CHANGES	11 Dec 2003 02:02:08 -0000	1.988.2.194
  +++ CHANGES	14 Dec 2003 00:17:40 -0000	1.988.2.195
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.49
  +
  +  *) Fix memory leak in handling of request bodies during reverse
  +     proxy operations.  PR 24991. [Larry Toppi <larry.toppi citrix.com>]
  +
     *) Win32 MPM: Implement MaxMemFree to enable setting an upper
        limit on the amount of storage used by the bucket brigades
        in each server thread. [Bill Stoddard]
  
  
  
  1.751.2.596 +6 -25     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.595
  retrieving revision 1.751.2.596
  diff -u -r1.751.2.595 -r1.751.2.596
  --- STATUS	12 Dec 2003 17:20:45 -0000	1.751.2.595
  +++ STATUS	14 Dec 2003 00:17:41 -0000	1.751.2.596
  @@ -185,23 +185,11 @@
   
       * mod_cgid: Restart the cgid daemon if it crashes.  PR 19849
           modules/generators/mod_cgid.c 1.152
  -        +1: trawick, gregames, stoddard
  -        oops, 2 problems to deal with:
  -        a) patch relies on worker MPM behavior of
  -           ap_graceful_stop_signalled(), which is to return true if
  -           MPM is exiting (whether stop or restart or graceful);
  -           need MPM state query function working in Unix MPMs first
  -           in order to support this without making the broken
  -           ap_graceful_stop_signalled() more pervasive
  -        b) maybe not the fault of this patch, but on Linux the parent
  -           gets knocked out after a couple of segfaults in cgid
  -           Update: false alarm...  due to confusion about pid in
  -           sig_coredump(), a message is written to error log saying
  -           that parent crashed, but it isn't true... bogus message
  -           seems to be due to a kludge to avoid calling getpid() (to 
  -           support linuxthreads) not working for
  -           mod_cgid->sig_coredump() when mod_cgid got restarted after
  -           a crash
  +        +1: 
  +        oops, also needs:
  +        . 2.1-dev Unix MPM support to query MPM state
  +        . 2.1-dev fix to prevent bogus message about parent crashing when
  +          it is "merely" a restarted cgid daemon which crashed
   
       * ab: catch out of memory (reasoning report ID 29)
           support/ab.c: r1.125
  @@ -365,13 +353,6 @@
           modules/generators/mod_status.c r1.173
           modules/generators/mod_status.h r1.2
         +1: trawick, ianh
  -
  -    * fix memory leak while handling request body with reverse proxy
  -        modules/proxy/proxy_http.c r1.173
  -        (but code has changed slightly since stable branch so patch
  -        posted to bugzilla is one to use...  see PR at
  -        http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24991)
  -      +1: trawick, stas, ianh, stoddard, minfrin
   
   CURRENT RELEASE NOTES:
   
  
  
  
  No                   revision
  No                   revision
  1.164.2.5 +2 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.164.2.4
  retrieving revision 1.164.2.5
  diff -u -r1.164.2.4 -r1.164.2.5
  --- proxy_http.c	2 Dec 2003 14:38:41 -0000	1.164.2.4
  +++ proxy_http.c	14 Dec 2003 00:17:41 -0000	1.164.2.5
  @@ -665,7 +665,8 @@
               }
   
               /* We can't pass this EOS to the output_filters. */
  -            APR_BUCKET_REMOVE(APR_BRIGADE_LAST(bb));
  +            e = APR_BRIGADE_LAST(bb);
  +            apr_bucket_delete(e);
               seen_eos = 1;
           }
   
  
  
  

Mime
View raw message