httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server listen.c
Date Thu, 25 Mar 2004 02:32:54 GMT
stoddard    2004/03/24 18:32:54

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS CHANGES
               server   Tag: APACHE_2_0_BRANCH listen.c
  Log:
  Fix crash when Apache was started with no Listen directives.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.770 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.769
  retrieving revision 1.751.2.770
  diff -u -r1.751.2.769 -r1.751.2.770
  --- STATUS	25 Mar 2004 02:20:27 -0000	1.751.2.769
  +++ STATUS	25 Mar 2004 02:32:52 -0000	1.751.2.770
  @@ -88,11 +88,6 @@
              modules/dav/fs/lock.c: r1.31
          +1: trawick
   
  -    *) Michael Corcoran's patch to listen.c to avoid segfault when
  -       there are no Listen directives.
  -           server/listen.c: r1.101
  -       +1: trawick, stoddard, rederpj
  -
       *) Limit the concurrency in 'ab' to MAX_CONCURRENCY to prevent a 
          segmentation fault.
              support/ab.c: r1.140, r1.141
  
  
  
  1.988.2.262 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.261
  retrieving revision 1.988.2.262
  diff -u -r1.988.2.261 -r1.988.2.262
  --- CHANGES	25 Mar 2004 02:20:26 -0000	1.988.2.261
  +++ CHANGES	25 Mar 2004 02:32:53 -0000	1.988.2.262
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) Fix crash when Apache was started with no Listen directives.
  +     [Michael Corcoran <mcorcoran warpsolutions.com>]
  +
     *) core_output_filter: Fix bug that could result in sending
        garbage over the network when module handlers construct
        bucket brigades containing multiple file buckets all referencing
  
  
  
  No                   revision
  No                   revision
  1.83.2.8  +1 -1      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.83.2.7
  retrieving revision 1.83.2.8
  diff -u -r1.83.2.7 -r1.83.2.8
  --- listen.c	18 Mar 2004 07:36:53 -0000	1.83.2.7
  +++ listen.c	25 Mar 2004 02:32:54 -0000	1.83.2.8
  @@ -335,7 +335,7 @@
        * is already forgotten about by the time we call accept, we won't
        * be hung until another connection arrives on that port
        */
  -    if (ap_listeners->next) {
  +    if (ap_listeners && ap_listeners->next) {
           for (lr = ap_listeners; lr; lr = lr->next) {
               apr_status_t status;
   
  
  
  

Mime
View raw message