Branch: Tag:

2002-10-14

2002-10-14 09:08:02 by 0

Hopefully fix problem where id->misc->cachekey was unnecessarily destroyed.
(Backported from 3.3.)

Rev: server/base_server/roxen.pike:1.787
Rev: server/protocols/http.pike:1.355

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.786 2002/06/17 09:36:12 anders Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.787 2002/10/14 09:07:50 jonasw Exp $";      // The argument cache. Used by the image cache.   ArgCache argcache;
2989:    // Setting the cacheable flag is done in order to get headers sent which    // cause the image to be cached in the client even when using https    // sessions. However, this flag also controls whether the file should -  // be placed in the protocol-level cache, so we'll counter by destroying -  // the cache key if the request is authorized so this is avoided. +  // be placed in the protocol-level cache, so we'll counter by setting a +  // separate flag.    id->misc->cacheable = INITIAL_CACHEABLE; -  if (id->rawauth) -  id->misc->cachekey = 0; +  id->misc->no_proto_cache = 1;    return res;    }