Ema has submitted this change and it was merged. Change subject: New WMF version: 4.1.1-1wm2 ......................................................................
New WMF version: 4.1.1-1wm2 Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic operations on real values. http://www.gossamer-threads.com/lists/varnish/dev/38798 Bug: T124279 Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6 --- M debian/changelog A debian/patches/0005-vcc-real-plus-real.patch M debian/patches/series 3 files changed, 29 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 35e5900..c39a685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +varnish (4.1.1-1wm2) jessie-wikimedia; urgency=medium + + * Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic + operations on real values. + + -- Emanuele Rocca <e...@wikimedia.org> Mon, 22 Feb 2016 15:24:16 +0100 + varnish (4.1.1-1wm1) jessie-wikimedia; urgency=medium * Local package (WMF). diff --git a/debian/patches/0005-vcc-real-plus-real.patch b/debian/patches/0005-vcc-real-plus-real.patch new file mode 100644 index 0000000..4226f81 --- /dev/null +++ b/debian/patches/0005-vcc-real-plus-real.patch @@ -0,0 +1,21 @@ +diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c +index 5989f07..af3b3e7 100644 +--- a/lib/libvcc/vcc_expr.c ++++ b/lib/libvcc/vcc_expr.c +@@ -942,6 +942,7 @@ vcc_expr_mul(struct vcc *tl, struct expr **e, enum var_type fmt) + case INT: f2 = INT; break; + case DURATION: f2 = REAL; break; + case BYTES: f2 = REAL; break; ++ case REAL: f2 = REAL; break; + default: + if (tl->t->tok != '*' && tl->t->tok != '/') + return; +@@ -1049,6 +1050,8 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum var_type fmt) + /* OK */ + } else if ((*e)->fmt == INT && e2->fmt == INT) { + /* OK */ ++ } else if ((*e)->fmt == REAL && e2->fmt == REAL) { ++ /* OK */ + } else if ((*e)->fmt == DURATION && e2->fmt == DURATION) { + /* OK */ + } else if (tk->tok == '+' && diff --git a/debian/patches/series b/debian/patches/series index 58c34d7..597c0c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-varnishd-persistent-fallocate.patch 0003-varnishd-nukelru.patch 0004-varnishd-persistent-mmap-exit.patch +0005-vcc-real-plus-real.patch -- To view, visit https://gerrit.wikimedia.org/r/272468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish4 Gerrit-Branch: debian-wmf Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
