You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ia...@apache.org on 2002/08/18 23:01:07 UTC

cvs commit: httpd-2.0/modules/proxy proxy_ftp.c

ianh        2002/08/18 14:01:06

  Modified:    .        CHANGES
               modules/proxy proxy_ftp.c
  Log:
  Submitted by:	Alexey Panchenko alexey@liwest.ru
  
  Revision  Changes    Path
  1.888     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.887
  retrieving revision 1.888
  diff -u -r1.887 -r1.888
  --- CHANGES	18 Aug 2002 12:37:32 -0000	1.887
  +++ CHANGES	18 Aug 2002 21:01:05 -0000	1.888
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0.41
  +
  +  *) thread safety & proxy-ftp [Alexey Panchenko alexey@liwest.ru, Ian Holsman]
  +
     *) mod_disk_cache works much better. This module should still
        be considered experimental. [Eric Prud'hommeaux]
   
  
  
  
  1.130     +1 -4      httpd-2.0/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- proxy_ftp.c	17 Jul 2002 17:55:59 -0000	1.129
  +++ proxy_ftp.c	18 Aug 2002 21:01:06 -0000	1.130
  @@ -672,12 +672,9 @@
   static int ftp_set_TYPE(char xfer_type, request_rec *r, conn_rec *ftp_ctrl,
                     apr_bucket_brigade *bb, char **pmessage)
   {
  -    static char old_type[2] = { 'A', '\0' }; /* After logon, mode is ASCII */
  +    char old_type[2] = { 'A', '\0' }; /* After logon, mode is ASCII */
       int ret = HTTP_OK;
       int rc;
  -
  -    if (xfer_type == old_type[0])
  -        return ret;
   
       /* set desired type */
       old_type[0] = xfer_type;