projects / people / ummeegge / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6313697 MF |
1 | ------------------------------------------------------------ |
| 2 | revno: 14155 | |
| 3 | revision-id: squid3@treenet.co.nz-20170504061416-ks61dfut8wyml2qu | |
| 4 | parent: squid3@treenet.co.nz-20170402121452-ox6d8ttzlmbov3xm | |
| 5 | fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4682 | |
| 6 | author: Christos Tsantilas <chtsanti@users.sourceforge.net> | |
| 7 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
| 8 | branch nick: 3.5 | |
| 9 | timestamp: Thu 2017-05-04 18:14:16 +1200 | |
| 10 | message: | |
| 11 | Bug 4682: Fix ssl_bump "bump" action documentation | |
| 12 | ||
| 13 | Fixes squid documentation to correctly describe the squid behavior when the | |
| 14 | "bump" action is selected on step SslBump1. In this case squid selects | |
| 15 | the client-first bumping mode. | |
| 16 | ||
| 17 | This is a Measurement Factory project | |
| 18 | ------------------------------------------------------------ | |
| 19 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
| 20 | # revision_id: squid3@treenet.co.nz-20170504061416-ks61dfut8wyml2qu | |
| 21 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 22 | # testament_sha1: f3b4861a085e069948da25398782237609037c5f | |
| 23 | # timestamp: 2017-05-04 06:16:54 +0000 | |
| 24 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 25 | # base_revision_id: squid3@treenet.co.nz-20170402121452-\ | |
| 26 | # ox6d8ttzlmbov3xm | |
| 27 | # | |
| 28 | # Begin patch | |
| 29 | === modified file 'src/cf.data.pre' | |
| 30 | --- src/cf.data.pre 2017-03-31 23:38:31 +0000 | |
| 31 | +++ src/cf.data.pre 2017-05-04 06:14:16 +0000 | |
| 32 | @@ -2669,8 +2669,11 @@ | |
| 33 | This is the default action. | |
| 34 | ||
| 35 | bump | |
| 36 | - Establish a secure connection with the server and, using a | |
| 37 | - mimicked server certificate, with the client. | |
| 38 | + When used on step SslBump1, establishes a secure connection | |
| 39 | + with the client first, then connect to the server. | |
| 40 | + When used on step SslBump2 or SslBump3, establishes a secure | |
| 41 | + connection with the server and, using a mimicked server | |
| 42 | + certificate, with the client. | |
| 43 | ||
| 44 | peek | |
| 45 | Receive client (step SslBump1) or server (step SslBump2) | |
| 46 |