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/generators mod_cgid.c
Date Mon, 23 Jun 2003 12:28:26 GMT
trawick     2003/06/23 05:28:25

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/generators Tag: APACHE_2_0_BRANCH mod_cgid.c
  Log:
  merge this from 2.0.47:
  
      * mod_cgid: Eliminate a double-close of a socket.  This resolves
        various operational problems in a threaded MPM, since on the
        second attempt to close the socket, the same descriptor was
        often already in use by another thread for another purpose.
  
  reviewed by: brianp, stoddard
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.119 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.118
  retrieving revision 1.988.2.119
  diff -u -r1.988.2.118 -r1.988.2.119
  --- CHANGES	3 Jun 2003 10:57:14 -0000	1.988.2.118
  +++ CHANGES	23 Jun 2003 12:28:23 -0000	1.988.2.119
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.47
   
  +  *) mod_cgid: Eliminate a double-close of a socket.  This resolves
  +     various operational problems in a threaded MPM, since on the
  +     second attempt to close the socket, the same descriptor was
  +     often already in use by another thread for another purpose.
  +     [Jeff Trawick]
  +
     *) mod_negotiation: Introduce "prefer-language" environment variable,
        which allows to influence the negotiation process on request basis
        to prefer a certain language.  [André Malo]
  
  
  
  1.751.2.334 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.333
  retrieving revision 1.751.2.334
  diff -u -r1.751.2.333 -r1.751.2.334
  --- STATUS	23 Jun 2003 11:16:10 -0000	1.751.2.333
  +++ STATUS	23 Jun 2003 12:28:24 -0000	1.751.2.334
  @@ -248,13 +248,6 @@
           os/unix/unixd.h 1.138
           +1: trawick
   
  -    * mod_cgid: Eliminate a double-close of a socket.  This resolves
  -      various operational problems in a threaded MPM, since on the
  -      second attempt to close the socket, the same descriptor was
  -      often already in use by another thread for another purpose.
  -        modules/generators/mod_cgid.c 1.151
  -        +1: trawick, brianp, stoddard
  -
   CURRENT RELEASE NOTES:
   
       * Backwards compatibility is expected of future Apache 2.0 releases,
  
  
  
  No                   revision
  No                   revision
  1.145.2.6 +2 -3      httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.145.2.5
  retrieving revision 1.145.2.6
  diff -u -r1.145.2.5 -r1.145.2.6
  --- mod_cgid.c	31 Mar 2003 06:09:39 -0000	1.145.2.5
  +++ mod_cgid.c	23 Jun 2003 12:28:25 -0000	1.145.2.6
  @@ -1189,22 +1189,21 @@
           return APR_EGENERAL;
       }
   
  +    /* we got a socket, and there is already a cleanup registered for it */
  +
       req.req_type = GETPID_REQ;
       req.conn_id = info->r->connection->id;
   
       stat = sock_write(sd, &req, sizeof(req));
       if (stat != APR_SUCCESS) {
  -        close(sd);
           return stat;
       }
   
       /* wait for pid of script */
       stat = sock_read(sd, &pid, sizeof(pid));
       if (stat != APR_SUCCESS) {
  -        close(sd);
           return stat;
       }
  -    close(sd);
   
       if (pid == 0) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, info->r,
  
  
  

Mime
View raw message