Changeset 2080

Show
Ignore:
Timestamp:
02/26/2008 04:19:42 PM (5 months ago)
Author:
stbuehler
Message:

r2085@chromobil: stefan | 2008-02-26 16:14:50 +0100
Fix #1164: Reset conditional cache

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/lighttpd-1.4.x/src/connections.c

    r1985 r2080  
    835835        } 
    836836 
    837 #if COND_RESULT_UNSET 
    838         for (i = srv->config_context->used - 1; i >= 0; i --) { 
    839                 con->cond_cache[i].result = COND_RESULT_UNSET; 
    840                 con->cond_cache[i].patterncount = 0; 
    841         } 
    842 #else 
    843         memset(con->cond_cache, 0, sizeof(cond_cache_t) * srv->config_context->used); 
    844 #endif 
     837        /* The cond_cache gets reset in response.c */ 
     838//      config_cond_cache_reset(srv, con); 
    845839 
    846840#ifdef USE_OPENSSL 

  • branches/lighttpd-1.4.x/src/response.c

    r2034 r2080  
    2020#include "chunk.h" 
    2121 
     22#include "configfile.h" 
    2223#include "connections.h" 
    2324 
    …… 
    151152                 *  */ 
    152153 
     154                config_cond_cache_reset(srv, con); 
     155                config_setup_connection(srv, con); // Perhaps this could be removed at other places. 
     156 
    153157                if (con->conf.log_condition_handling) { 
    154158                        log_error_write(srv, __FILE__, __LINE__,  "s",  "run condition");