| 1 |
jer 11/12/29 17:35:31 |
| 2 |
|
| 3 |
Added: squid-3.1.18-ecap.patch |
| 4 |
Log: |
| 5 |
Apply upstream patch by Adam Carter (bug #396163). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-proxy/squid/files/squid-3.1.18-ecap.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.18-ecap.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.18-ecap.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: squid-3.1.18-ecap.patch |
| 16 |
=================================================================== |
| 17 |
------------------------------------------------------------ |
| 18 |
revno: 10415 |
| 19 |
revision-id: squid3@××××××××××.nz-20111206123135-sm3zauds1twjh9ls |
| 20 |
parent: squid3@××××××××××.nz-20111203061825-aslncq2igkzd88hy |
| 21 |
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3440 |
| 22 |
author: Joshua Root <josh+squid@×××××××.au> |
| 23 |
committer: Amos Jeffries <squid3@××××××××××.nz> |
| 24 |
branch nick: SQUID_3_1 |
| 25 |
timestamp: Tue 2011-12-06 05:31:35 -0700 |
| 26 |
message: |
| 27 |
Bug 3440: compile error in Adaptation |
| 28 |
------------------------------------------------------------ |
| 29 |
# Bazaar merge directive format 2 (Bazaar 0.90) |
| 30 |
# revision_id: squid3@××××××××××.nz-20111206123135-sm3zauds1twjh9ls |
| 31 |
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ |
| 32 |
# /SQUID_3_1/ |
| 33 |
# testament_sha1: 42421665894427e4edfaa3f8bfcee9a9a3ce9dab |
| 34 |
# timestamp: 2011-12-06 12:33:05 +0000 |
| 35 |
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ |
| 36 |
# /SQUID_3_1 |
| 37 |
# base_revision_id: squid3@××××××××××.nz-20111203061825-\ |
| 38 |
# aslncq2igkzd88hy |
| 39 |
# |
| 40 |
# Begin patch |
| 41 |
=== modified file 'src/Store.h' |
| 42 |
--- a/src/Store.h 2011-12-02 12:17:07 +0000 |
| 43 |
+++ b/src/Store.h 2011-12-06 12:31:35 +0000 |
| 44 |
@@ -191,7 +191,7 @@ |
| 45 |
|
| 46 |
#if USE_ADAPTATION |
| 47 |
/// call back producer when more buffer space is available |
| 48 |
- void deferProducer(const AsyncCall::Pointer &producer); |
| 49 |
+ void deferProducer(AsyncCall::Pointer &producer); |
| 50 |
/// calls back producer registered with deferProducer |
| 51 |
void kickProducer(); |
| 52 |
#endif |
| 53 |
|
| 54 |
=== modified file 'src/store.cc' |
| 55 |
--- a/src/store.cc 2011-12-02 12:17:07 +0000 |
| 56 |
+++ b/src/store.cc 2011-12-06 12:31:35 +0000 |
| 57 |
@@ -368,7 +368,7 @@ |
| 58 |
|
| 59 |
#if USE_ADAPTATION |
| 60 |
void |
| 61 |
-StoreEntry::deferProducer(const AsyncCall::Pointer &producer) |
| 62 |
+StoreEntry::deferProducer(AsyncCall::Pointer &producer) |
| 63 |
{ |
| 64 |
if (!deferredProducer) |
| 65 |
deferredProducer = producer; |
Archives