[master] 51c0b18 Don't use libgzip internal #definery outside libgzip

Poul-Henning Kamp phk at FreeBSD.org
Mon May 18 21:37:04 CEST 2015


commit 51c0b18fef86b50cf81902fa4d9f820695c833e9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 18 19:36:39 2015 +0000

    Don't use libgzip internal #definery outside libgzip

diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 156b66f..8079e2b 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -64,7 +64,7 @@ struct vgz {
 	z_stream		vz;
 };
 
-static inline z_const char *
+static const char *
 vgz_msg(const struct vgz *vg)
 {
 	CHECK_OBJ_NOTNULL(vg, VGZ_MAGIC);
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index d3cbe4e..d3ab87c 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -141,6 +141,7 @@ vwp_main(void *priv)
 			vwp->hpoll--;
 		v = poll(vwp->pollfd, vwp->hpoll + 1, -1);
 		assert(v >= 0);
+usleep(1500000);
 		v2 = v;
 		now = VTIM_real();
 		idle = now - *vwp->waiter->tmo;



More information about the varnish-commit mailing list