On [22/11/17] [02:33P], Stuart Henderson wrote:
; This is the *only* code change in the upstream code. (The only others are
; an additional test, and regen for new version number / commit ids in docs).
;
; diff -uNp -r varnish-5.2.0/bin/varnishd/cache/cache_fetch.c
varnish-5.2.1/bin/varnishd/cache/cache_fetch.c
; --- varnish-5.2.0/bin/varnishd/cache/cache_fetch.c Fri Sep 15 12:12:41 2017
; +++ varnish-5.2.1/bin/varnishd/cache/cache_fetch.c Tue Nov 14 13:39:35 2017
; @@ -899,6 +899,8 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
; l = ll;
; if (VFP_GetStorage(bo->vfc, &l, &ptr) != VFP_OK)
; break;
; + if (l > ll)
; + l = ll;
; memcpy(ptr, VSB_data(synth_body) + o, l);
; VFP_Extend(bo->vfc, l);
; ll -= l;
; diff -uNp -r varnish-5.2.0/bin/varnishd/cache/cache_session.c
varnish-5.2.1/bin/varnishd/cache/cache_session.c
; --- varnish-5.2.0/bin/varnishd/cache/cache_session.c Tue Sep 5 15:21:34 2017
; +++ varnish-5.2.1/bin/varnishd/cache/cache_session.c Tue Nov 14 13:39:35 2017
; @@ -289,7 +289,7 @@ HTC_RxStuff(struct http_conn *htc, htc_complete_f *fun
; WRONG("htc_status_e");
;
; tmo = tn - now;
; - if (!isnan(ti) && ti < tn)
; + if (!isnan(ti) && ti < tn && hs == HTC_S_EMPTY)
; tmo = ti - now;
; z = maxbytes - (htc->rxbuf_e - htc->rxbuf_b);
; assert(z >= 0);
;
; OK for this simple port update?
;
; Index: Makefile
; ===================================================================
; RCS file: /cvs/ports/www/varnish/Makefile,v
; retrieving revision 1.33
; diff -u -p -r1.33 Makefile
; --- Makefile 18 Sep 2017 14:09:53 -0000 1.33
; +++ Makefile 22 Nov 2017 14:31:14 -0000
; @@ -2,7 +2,7 @@
;
; COMMENT = high-performance HTTP accelerator
;
; -DISTNAME = varnish-5.2.0
; +DISTNAME = varnish-5.2.1
;
; CATEGORIES = www
;
; Index: distinfo
; ===================================================================
; RCS file: /cvs/ports/www/varnish/distinfo,v
; retrieving revision 1.17
; diff -u -p -r1.17 distinfo
; --- distinfo 18 Sep 2017 14:09:53 -0000 1.17
; +++ distinfo 22 Nov 2017 14:31:14 -0000
; @@ -1,2 +1,2 @@
; -SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
; -SIZE (varnish-5.2.0.tgz) = 2828867
; +SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
; +SIZE (varnish-5.2.1.tgz) = 2827676
; >
OK gonzalo@
--
Sending from my toaster.
