Bah, Helmut, your patch was slightly better, as closer to the spirit of the
spec. Therefore the 2nd fix.
Steve
Le 8 août 2012 20:27, "Helmut Grohne" <hel...@subdivi.de> a écrit :
> On Wed, Aug 08, 2012 at 12:24:28PM +0200, Holger Levsen wrote:
> > $ git show 29f4223
> > commit 29f422377e710dfb19cff5a29af2344ae6203203
> > Author: Christoph Biedl <munin.i...@manchmal.in-ulm.de>
> > Date: Tue Jul 3 17:44:04 2012 +0200
> >
> > fix bug that disabled gfx CGI caching
> >
> > Apache and lighttpd always set QUERY_STRING, even if it's empty.
> > This makes proper caching work again as expected.
> >
> > diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/
> munin-cgi-graph.in
> > index 95efbdd..754705d 100755
> > --- a/master/_bin/munin-cgi-graph.in
> > +++ b/master/_bin/munin-cgi-graph.in
> > @@ -159,7 +159,7 @@ while (new CGI::Fast) {
> > }
> >
> > # Having some QUERY_STRING disables the cache.
> > - if (defined($ENV{QUERY_STRING})) {
> > + if (defined($ENV{QUERY_STRING}) && $ENV{QUERY_STRING}) {
> > $no_cache = 1;
> > }
> >
> >
> >
> > As I understand it, this is different than the patch from Helmut and
> won't
> > work as expected. Helmut?
>
> I believe that both patches work. I only found the upstream fix after
> submitting my patch even though it was created earlier. Looking at
> upstream first would have saved me that work.
>
> Note that upstreams patch allowes QUERY_STRING=0 to be cached.
>
> Helmut
>
>
