1 ------------------------------------------------------------
3 revision-id: squid3@treenet.co.nz-20170701232253-3beaysa03xf5c67p
4 parent: squidadm@squid-cache.org-20170701121615-ktx76udds2mzmc6c
5 committer: Amos Jeffries <squid3@treenet.co.nz>
7 timestamp: Sun 2017-07-02 11:22:53 +1200
9 Fix build on FreeBSD after rev.14180
11 RefCount<> does not support assignment from nullptr with C++03
12 ------------------------------------------------------------
13 # Bazaar merge directive format 2 (Bazaar 0.90)
14 # revision_id: squid3@treenet.co.nz-20170701232253-3beaysa03xf5c67p
15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
16 # testament_sha1: d5ecf68c60c022783f69311e9049e546be8fa1a0
17 # timestamp: 2017-07-01 23:50:58 +0000
18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
19 # base_revision_id: squidadm@squid-cache.org-20170701121615-\
23 === modified file 'src/http.cc'
24 --- src/http.cc 2017-07-01 12:08:48 +0000
25 +++ src/http.cc 2017-07-01 23:22:53 +0000
28 Comm::ConnectionPointer serverConnectionSaved = serverConnection;
29 fwd->unregister(serverConnection);
30 - serverConnection = nullptr;
31 + serverConnection = NULL;
33 bool ispinned = false; // TODO: Rename to isOrShouldBePinned
34 if (request->flags.pinned) {