]>
Commit | Line | Data |
---|---|---|
6edc270a MF |
1 | ------------------------------------------------------------ |
2 | revno: 14172 | |
3 | revision-id: squid3@treenet.co.nz-20170621195439-l63xfsad58ghhhfu | |
4 | parent: squidadm@squid-cache.org-20170615001633-wgrl5w8isv15o7gg | |
5 | fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4671 | |
6 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
7 | branch nick: 3.5 | |
8 | timestamp: Thu 2017-06-22 07:54:39 +1200 | |
9 | message: | |
10 | Bug 4671 pt2: GCC 7: raise FTP Gateway CTRL channel buffer to 16KB | |
11 | ||
12 | Fixes | |
13 | error: %s directive output may be truncated writing up to 8191 bytes | |
14 | into a region of size 1019 | |
15 | note: snprintf output between 8 and 8199 bytes into a destination of | |
16 | size 1024 | |
17 | ------------------------------------------------------------ | |
18 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
19 | # revision_id: squid3@treenet.co.nz-20170621195439-l63xfsad58ghhhfu | |
20 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
21 | # testament_sha1: eeb32b45efe5504eebeaae89088d4a81d807807c | |
22 | # timestamp: 2017-06-21 20:50:58 +0000 | |
23 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
24 | # base_revision_id: squidadm@squid-cache.org-20170615001633-\ | |
25 | # wgrl5w8isv15o7gg | |
26 | # | |
27 | # Begin patch | |
28 | === modified file 'src/clients/FtpGateway.cc' | |
29 | --- src/clients/FtpGateway.cc 2017-05-29 04:37:41 +0000 | |
30 | +++ src/clients/FtpGateway.cc 2017-06-21 19:54:39 +0000 | |
31 | @@ -192,7 +192,7 @@ | |
32 | ||
33 | #define FTP_LOGIN_NOT_ESCAPED 0 | |
34 | ||
35 | -#define CTRL_BUFLEN 1024 | |
36 | +#define CTRL_BUFLEN 16*1024 | |
37 | static char cbuf[CTRL_BUFLEN]; | |
38 | ||
39 | /* | |
40 |