cvs commit: apache/src/modules/proxy proxy_ftp.c proxy_util.c

[Chuck Murcko]

chuck       97/04/08 18:42:05

  Modified:    src/modules/proxy  proxy_ftp.c proxy_util.c
  Log:
  Clean up aborts on transmission errors; also fixes some of the
  truncated file problems.
  
  Revision  Changes    Path
  1.14      +8 -5      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.13
  retrieving revision 1.14
  diff -C3 -r1.13 -r1.14
  *** proxy_ftp.c       1997/04/06 07:43:48     1.13
  --- proxy_ftp.c       1997/04/09 01:42:03     1.14
  ***************
  *** 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;
    }
  --- 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;
    }
  
  
  
  1.10      +2 -0      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.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** proxy_util.c      1997/04/06 07:43:49     1.9
  --- proxy_util.c      1997/04/09 01:42:04     1.10
  ***************
  *** 425,430 ****
  --- 425,432 ----
        }
        if (!con->aborted)
            bflush(con->client);
  +     else
  +     f2 = proxy_cache_error(c);
        
        kill_timeout(r);
        return total_bytes_sent;