Received: (from majordom@localhost)
          by hyperreal.com (8.8.4/8.8.4)
	  id XAA25132; Tue, 8 Apr 1997 23:51:34 -0700 (PDT)
Received: (from chuck@localhost)
          by hyperreal.com (8.8.4/8.8.4)
	  id XAA25125 for apache-cvs; Tue, 8 Apr 1997 23:51:32 -0700 (PDT)
Date: Tue, 8 Apr 1997 23:51:32 -0700 (PDT)
From: Chuck Murcko <chuck@hyperreal.com>
Message-Id: <199704090651.XAA25125@hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src CHANGES
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

chuck       97/04/08 23:51:31

  Modified:    src/modules/proxy  proxy_ftp.c proxy_util.c
               src       CHANGES
  Log:
  wrong proxy patch. backed it out.
  
  Revision  Changes    Path
  1.15      +5 -8      apache/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -C3 -r1.14 -r1.15
  *** proxy_ftp.c	1997/04/09 01:42:03	1.14
  --- proxy_ftp.c	1997/04/09 06:51:07	1.15
  ***************
  *** 324,337 ****
                o+=w;
            }
        }
  !     if (!r->connection->aborted) {
  !         ap_snprintf(buf, sizeof(buf), "</PRE><HR><I><A HREF=\"http://www.apache.org\">%s</A></I></BODY></HTML>", SERVER_VERSION);
  !         bwrite(con->client, buf, strlen(buf));
  !         if (f2 != NULL) bwrite(f2, buf, strlen(buf));
  !         total_bytes_sent+=strlen(buf);
  !         bflush(con->client);
  !     } else
  !         f2 = proxy_cache_error(c);
        
        return total_bytes_sent;
    }
  --- 324,334 ----
                o+=w;
            }
        }
  !     ap_snprintf(buf, sizeof(buf), "</PRE><HR><I><A HREF=\"http://www.apache.org\">%s</A></I></BODY></HTML>", SERVER_VERSION);
  !     bwrite(con->client, buf, strlen(buf));
  !     if (f2 != NULL) bwrite(f2, buf, strlen(buf));
  !     total_bytes_sent+=strlen(buf);
  !     bflush(con->client);
        
        return total_bytes_sent;
    }
  
  
  
  1.11      +0 -2      apache/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** proxy_util.c	1997/04/09 01:42:04	1.10
  --- proxy_util.c	1997/04/09 06:51:07	1.11
  ***************
  *** 425,432 ****
        }
        if (!con->aborted)
            bflush(con->client);
  -     else
  - 	f2 = proxy_cache_error(c);
        
        kill_timeout(r);
        return total_bytes_sent;
  --- 425,430 ----
  
  
  
  1.228     +0 -3      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.227
  retrieving revision 1.228
  diff -C3 -r1.227 -r1.228
  *** CHANGES	1997/04/09 01:40:49	1.227
  --- CHANGES	1997/04/09 06:51:30	1.228
  ***************
  *** 2,10 ****
    
      *) add macro for memmove to conf.h for SUNOS4 [Marc Slemko]
    
  -   *) Proxy cleanup for transmission errors; avoids core dumps an some
  -      of the truncated files. [Chuck Murcko]
  - 
    Changes with Apache 1.2b8
    
      *) suexec.c doesn't close the log file, allowing CGIs to continue writing
  --- 2,7 ----