View | Details | Raw Unified | Return to bug 42027
Collapse All | Expand All

(-)server/core.c (-2 / +2 lines)
Lines 389-395 Link Here
389
        conf->etag_add =
389
        conf->etag_add =
390
            (conf->etag_add & (~ new->etag_remove)) | new->etag_add;
390
            (conf->etag_add & (~ new->etag_remove)) | new->etag_add;
391
        conf->etag_remove =
391
        conf->etag_remove =
392
            (conf->opts_remove & (~ new->etag_add)) | new->etag_remove;
392
            (conf->etag_remove & (~ new->etag_add)) | new->etag_remove;
393
        conf->etag_bits =
393
        conf->etag_bits =
394
            (conf->etag_bits & (~ conf->etag_remove)) | conf->etag_add;
394
            (conf->etag_bits & (~ conf->etag_remove)) | conf->etag_add;
395
    }
395
    }
Lines 1596-1602 Link Here
1596
    if (explicit) {
1596
    if (explicit) {
1597
        cfg->etag_bits &= (~ ETAG_UNSET);
1597
        cfg->etag_bits &= (~ ETAG_UNSET);
1598
1598
1599
        if ((cfg->etag_bits & ETAG_NONE) != ETAG_NONE) {
1599
        if (cfg->etag_bits != ETAG_NONE) {
1600
            cfg->etag_bits &= (~ ETAG_NONE);
1600
            cfg->etag_bits &= (~ ETAG_NONE);
1601
        }
1601
        }
1602
    }
1602
    }
(-)modules/http/http_etag.c (-1 / +2 lines)
Lines 72-78 Link Here
72
72
73
    cfg = (core_dir_config *)ap_get_module_config(r->per_dir_config,
73
    cfg = (core_dir_config *)ap_get_module_config(r->per_dir_config,
74
                                                  &core_module);
74
                                                  &core_module);
75
    etag_bits = (cfg->etag_bits & (~ cfg->etag_remove)) | cfg->etag_add;
75
    etag_bits = cfg->etag_bits;
76
76
77
    /*
77
    /*
78
     * If it's a file (or we wouldn't be here) and no ETags
78
     * If it's a file (or we wouldn't be here) and no ETags
Lines 87-92 Link Here
87
    if (etag_bits == ETAG_UNSET) {
87
    if (etag_bits == ETAG_UNSET) {
88
        etag_bits = ETAG_BACKWARD;
88
        etag_bits = ETAG_BACKWARD;
89
    }
89
    }
90
    etag_bits = (etag_bits & (~ cfg->etag_remove)) | cfg->etag_add;
90
    /*
91
    /*
91
     * Make an ETag header out of various pieces of information. We use
92
     * Make an ETag header out of various pieces of information. We use
92
     * the last-modified date and, if we have a real file, the
93
     * the last-modified date and, if we have a real file, the

Return to bug 42027