Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 108241 Details for
Bug 89290
New ebuild: net-ftp/filezilla
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
transfersocketpatch.patch
transfersocketpatch.patch (text/plain), 2.56 KB, created by
Kalidarn
on 2007-01-26 23:04:40 UTC
(
hide
)
Description:
transfersocketpatch.patch
Filename:
MIME Type:
Creator:
Kalidarn
Created:
2007-01-26 23:04:40 UTC
Size:
2.56 KB
patch
obsolete
>diff -ur filezilla-3.0.0-beta5.2/src/engine/transfersocket.cpp filezilla-3.0.0-beta5.1/src/engine/transfersocket.cpp >--- filezilla-3.0.0-beta5.2/src/engine/transfersocket.cpp 2007-01-12 03:35:36.000000000 +1030 >+++ filezilla-3.0.0-beta5.1/src/engine/transfersocket.cpp 2007-01-27 08:13:30.000000000 +1030 >@@ -168,6 +168,9 @@ > > int value = 65536 * 2; > m_pSocket->SetOption(SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)); >+ >+ if (m_bActive) >+ TriggerPostponedEvents(); > } > > void CTransferSocket::OnReceive() >@@ -175,11 +178,15 @@ > m_pControlSocket->LogMessage(::Debug_Debug, _T("CTransferSocket::OnReceive(), m_transferMode=%d"), m_transferMode); > > if (!m_pBackend) >+ { >+ m_pControlSocket->LogMessage(::Debug_Verbose, _T("Postponing receive, m_pBackend was false.")); >+ m_postponedReceive = true; > return; >+ } > > if (!m_bActive) > { >- m_pControlSocket->LogMessage(::Debug_Verbose, _T("Postponing receive")); >+ m_pControlSocket->LogMessage(::Debug_Verbose, _T("Postponing receive, m_bActive was false.")); > m_postponedReceive = true; > return; > } >@@ -332,7 +339,7 @@ > > if (m_transferMode == upload) > { >- if (m_shutdown) >+ if (m_shutdown && m_pTlsSocket) > { > m_pTlsSocket->Shutdown(); > if (m_pTlsSocket->Error()) >@@ -426,20 +433,7 @@ > > m_bActive = true; > if (m_pSocket && m_pSocket->IsConnected()) >- { >- if (m_postponedReceive) >- { >- m_pControlSocket->LogMessage(::Debug_Verbose, _T("Executing postponed receive")); >- m_postponedReceive = false; >- OnReceive(); >- } >- if (m_postponedSend) >- { >- m_pControlSocket->LogMessage(::Debug_Verbose, _T("Executing postponed send")); >- m_postponedSend = false; >- OnSend(); >- } >- } >+ TriggerPostponedEvents(); > } > > void CTransferSocket::TransferEnd(int reason) >@@ -656,3 +650,21 @@ > > return true; > } >+ >+void CTransferSocket::TriggerPostponedEvents() >+{ >+ wxASSERT(m_bActive); >+ >+ if (m_postponedReceive) >+ { >+ m_pControlSocket->LogMessage(::Debug_Verbose, _T("Executing postponed receive")); >+ m_postponedReceive = false; >+ OnReceive(); >+ } >+ if (m_postponedSend) >+ { >+ m_pControlSocket->LogMessage(::Debug_Verbose, _T("Executing postponed send")); >+ m_postponedSend = false; >+ OnSend(); >+ } >+} >diff -ur filezilla-3.0.0-beta5.2/src/engine/transfersocket.h filezilla-3.0.0-beta5.1/src/engine/transfersocket.h >--- filezilla-3.0.0-beta5.2/src/engine/transfersocket.h 2007-01-12 03:35:36.000000000 +1030 >+++ filezilla-3.0.0-beta5.1/src/engine/transfersocket.h 2007-01-27 08:13:47.000000000 +1030 >@@ -78,6 +78,7 @@ > > bool m_postponedReceive; > bool m_postponedSend; >+ void TriggerPostponedEvents(); > > CBackend* m_pBackend; >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 89290
:
100565
|
105298
|
105301
|
105306
|
105307
|
105309
|
105310
|
105332
|
106618
|
108241
|
108242
|
109941
|
109942
|
109946
|
109958
|
110743
|
114687
|
114695
|
115185
|
115187
|
119426
|
121212
|
123219
|
123703
|
125718
|
128417
|
130781
|
133155
|
133341
|
134093
|
135941
|
136034
|
136514
|
136515
|
137100
|
150692