From: Source Maintenance Date: Tue, 15 Mar 2016 18:12:09 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_4_0_8~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8d1312d96ca0f0767ffe802e49e35cf72a59440;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc index 7409fd8a9a..7fd3cd0501 100644 --- a/src/servers/FtpServer.cc +++ b/src/servers/FtpServer.cc @@ -1753,7 +1753,7 @@ Ftp::Server::stopWaitingForOrigin(int originStatus) return; // completeDataDownload() could be waitingForOrigin in fssHandleDataRequest - // Depending on which side has finished downloading first, either trust + // Depending on which side has finished downloading first, either trust // master->userDataDone status or set originDataDownloadAbortedOnError: if (master->userDataDone) { // We finished downloading before Ftp::Client. Most likely, the diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h index aaf8d6e687..19f78eb7f5 100644 --- a/src/servers/FtpServer.h +++ b/src/servers/FtpServer.h @@ -41,7 +41,7 @@ class MasterState: public RefCountable public: typedef RefCount Pointer; -MasterState(): serverState(fssBegin), clientReadGreeting(false), userDataDone(0) {} + MasterState(): serverState(fssBegin), clientReadGreeting(false), userDataDone(0) {} Ip::Address clientDataAddr; ///< address of our FTP client data connection SBuf workingDir; ///< estimated current working directory for URI formation @@ -195,7 +195,7 @@ private: bool waitingForOrigin; /// whether the origin data transfer aborted bool originDataDownloadAbortedOnError; - + /// a response which writing was postponed until stopWaitingForOrigin() HttpReply::Pointer delayedReply; };