]>
Commit | Line | Data |
---|---|---|
a5c0ef36 MF |
1 | ------------------------------------------------------------ |
2 | revno: 14145 | |
3 | revision-id: squid3@treenet.co.nz-20170226085009-tj3o81s5ybk8ly9s | |
4 | parent: squid3@treenet.co.nz-20170226084624-5tkl3bdrqz8nlp9g | |
5 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
6 | branch nick: 3.5 | |
7 | timestamp: Sun 2017-02-26 21:50:09 +1300 | |
8 | message: | |
9 | Fix missing CRLF on FTP timeout ABORT commands | |
10 | ------------------------------------------------------------ | |
11 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
12 | # revision_id: squid3@treenet.co.nz-20170226085009-tj3o81s5ybk8ly9s | |
13 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
14 | # testament_sha1: a290f77545e17012eea87e6315a9d375bff16752 | |
15 | # timestamp: 2017-02-26 08:51:05 +0000 | |
16 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
17 | # base_revision_id: squid3@treenet.co.nz-20170226084624-\ | |
18 | # 5tkl3bdrqz8nlp9g | |
19 | # | |
20 | # Begin patch | |
21 | === modified file 'src/clients/FtpGateway.cc' | |
22 | --- src/clients/FtpGateway.cc 2017-01-01 00:16:45 +0000 | |
23 | +++ src/clients/FtpGateway.cc 2017-02-26 08:50:09 +0000 | |
24 | @@ -1775,7 +1775,7 @@ | |
25 | ||
26 | // ABORT on timeouts. server may be waiting on a broken TCP link. | |
27 | if (io.xerrno == Comm::TIMEOUT) | |
28 | - writeCommand("ABOR"); | |
29 | + writeCommand("ABOR\r\n"); | |
30 | ||
31 | // try another connection attempt with some other method | |
32 | ftpSendPassive(this); | |
33 |