#! /bin/sh /usr/share/dpatch/dpatch-run
## 12_various-fixes.dpatch by Adrien Cunin <adri2000@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: 3 tiny patches recommended by and backported from upstream
## DP: (rev. 3603, 3612, 3670).

@DPATCH@
diff -urNad filezilla-3.3.1~/src/engine/ftpcontrolsocket.cpp filezilla-3.3.1/src/engine/ftpcontrolsocket.cpp
--- filezilla-3.3.1~/src/engine/ftpcontrolsocket.cpp	2010-01-02 15:42:28.000000000 +0100
+++ filezilla-3.3.1/src/engine/ftpcontrolsocket.cpp	2010-03-10 23:59:00.864524001 +0100
@@ -2980,8 +2980,11 @@
 
 	CDirectoryCache cache;
 	cache.InvalidateServer(*m_pCurrentServer);
+	CPathCache::InvalidateServer(*m_pCurrentServer);
 	m_CurrentPath.Clear();
 
+	m_lastTypeBinary = -1;
+
 	CRawCommandOpData *pData = static_cast<CRawCommandOpData *>(m_pCurOpData);
 
 	if (!Send(pData->m_command))
diff -urNad filezilla-3.3.1~/src/engine/proxy.cpp filezilla-3.3.1/src/engine/proxy.cpp
--- filezilla-3.3.1~/src/engine/proxy.cpp	2010-01-02 15:42:28.000000000 +0100
+++ filezilla-3.3.1/src/engine/proxy.cpp	2010-03-10 23:59:00.864524001 +0100
@@ -521,9 +521,9 @@
 				{
 					const wxWX2MBbuf host = m_host.mb_str(wxConvUTF8);
 					const int hostlen = strlen(host);
-					int addrlen = wxMin(hostlen, 16);
+					int addrlen = wxMax(hostlen, 16);
 
-					m_pSendBuffer = new char[7 + hostlen];
+					m_pSendBuffer = new char[7 + addrlen];
 					m_pSendBuffer[0] = 5;
 					m_pSendBuffer[1] = 1; // CONNECT
 					m_pSendBuffer[2] = 0; // Reserved
@@ -566,7 +566,7 @@
 					else
 					{
 						m_pSendBuffer[3] = 3; // Domain name
-						m_pSendBuffer[4] = addrlen;
+						m_pSendBuffer[4] = hostlen;
 						memcpy(m_pSendBuffer + 5, (const char*)host, hostlen);
 						addrlen = hostlen + 1;
 					}
diff -urNad filezilla-3.3.1~/src/putty/psftp.c filezilla-3.3.1/src/putty/psftp.c
--- filezilla-3.3.1~/src/putty/psftp.c	2010-01-02 15:42:28.000000000 +0100
+++ filezilla-3.3.1/src/putty/psftp.c	2010-03-10 23:59:00.864524001 +0100
@@ -3457,6 +3457,6 @@
 {
     int exitcode = back->exitcode(backhandle);
 
-    if (exitcode > 0)
+    if (exitcode > 0 && exitcode != INT_MAX)
 	connection_fatal(frontend, "Connection closed by server with exitcode %d", exitcode);
 }