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/server mpm_common.c
Date Tue, 27 Jan 2004 17:11:04 GMT
trawick     2004/01/27 09:11:04

  Modified:    server   mpm_common.c
  Log:
  avoid losing a subpool (until restart) on a rare error path
  
  Revision  Changes    Path
  1.113     +2 -0      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- mpm_common.c	1 Jan 2004 13:26:23 -0000	1.112
  +++ mpm_common.c	27 Jan 2004 17:11:04 -0000	1.113
  @@ -492,6 +492,7 @@
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                        "get socket to connect to listener");
  +        apr_pool_destroy(p);
           return rv;
       }
   
  @@ -506,6 +507,7 @@
           ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                        "set timeout on socket to connect to listener");
           apr_socket_close(sock);
  +        apr_pool_destroy(p);
           return rv;
       }
   
  
  
  

Mime
View raw message