Received: by taz.hyperreal.com (8.8.3/V2.0) id KAA18967;
 Fri, 10 Jan 1997 10:47:44 -0800 (PST)
Received: by taz.hyperreal.com (8.8.3/V2.0) id KAA18958;
 Fri, 10 Jan 1997 10:47:41 -0800 (PST)
Date: Fri, 10 Jan 1997 10:47:41 -0800 (PST)
From: Chuck Murcko <chuck@hyperreal.com>
Message-Id: <199701101847.KAA18958@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src http_main.c CHANGES
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

chuck       97/01/10 10:47:40

  Modified:    src       http_main.c CHANGES
  Log:
  Reviewed by:	Chuck Murcko, Rob Hartill, Brian Behlendorf
  Remove duplicate pcalloc() call from new_connection().
  
  Revision  Changes    Path
  1.105     +1 -2      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -C3 -r1.104 -r1.105
  *** http_main.c	1997/01/10 11:26:22	1.104
  --- http_main.c	1997/01/10 18:47:36	1.105
  ***************
  *** 1439,1449 ****
    {
        conn_rec *conn = (conn_rec *)pcalloc (p, sizeof(conn_rec));
        
  !     /* Get a connection structure, and initialize what fields we can
         * (the rest are zeroed out by pcalloc).
         */
        
  -     conn = (conn_rec *)pcalloc(p, sizeof(conn_rec));
        conn->child_num = child_num;
        
        conn->pool = p;
  --- 1439,1448 ----
    {
        conn_rec *conn = (conn_rec *)pcalloc (p, sizeof(conn_rec));
        
  !     /* Got a connection structure, so initialize what fields we can
         * (the rest are zeroed out by pcalloc).
         */
        
        conn->child_num = child_num;
        
        conn->pool = p;
  
  
  
  1.115     +2 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -C3 -r1.114 -r1.115
  *** CHANGES	1997/01/10 03:39:17	1.114
  --- CHANGES	1997/01/10 18:47:37	1.115
  ***************
  *** 1,5 ****
  --- 1,7 ----
    Changes with Apache 1.2b5
    
  +   *) remove duplicate pcalloc() call in new_connection().
  + 
      *) Fix incorrect comparison which could allow number of children =
         MaxClients + 1 if less than HARD_SERVER_LIMIT. Also fix potential
         problem if StartServers > HARD_SERVER_LIMIT. [Ed Korthof]