PR:

Obtained from:
Submitted by:	Alexey Panchenko alexey@liwest.ru
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96439 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e0846cbc3b598ba02329ce6fa415e72dd6e6c85e..9e864d33492ae55305525167018963e7dd05902c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index a306056c46ed7812a366d73b8aa23a60337a51cb..8d95499f181aa27bccbad70bb939155e41b8bc00 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -672,13 +672,10 @@ proxy_ftp_command(const char *cmd, request_rec *r, conn_rec *ftp_ctrl,
 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;