------------------------------------------------------------ revno: 14002 revision-id: squidadm@squid-cache.org-20160315181415-zqh4v3mv1k9h80fs parent: chtsanti@users.sourceforge.net-20160315173314-axlaq4gt0w3q037u committer: Source Maintenance branch nick: 3.5 timestamp: Tue 2016-03-15 18:14:15 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20160315181415-\ # zqh4v3mv1k9h80fs # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: c8c355d681c918f80ae30e8278969136fb454027 # timestamp: 2016-03-15 18:50:54 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: chtsanti@users.sourceforge.net-20160315173314-\ # axlaq4gt0w3q037u # # Begin patch === modified file 'src/servers/FtpServer.cc' --- src/servers/FtpServer.cc 2016-03-15 17:33:14 +0000 +++ src/servers/FtpServer.cc 2016-03-15 18:14:15 +0000 @@ -1734,7 +1734,7 @@ 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 === modified file 'src/servers/FtpServer.h' --- src/servers/FtpServer.h 2016-03-15 17:33:14 +0000 +++ src/servers/FtpServer.h 2016-03-15 18:14:15 +0000 @@ -41,7 +41,7 @@ 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