| Index: trunk/debs/squid/debian/patches/26-vary_options.dpatch |
| — | — | @@ -359,10 +359,8 @@ |
| 360 | 360 | storeSetPublicKey(state->e); |
| 361 | 361 | if (!state->oe) { |
| 362 | 362 | /* New entry, create new unique ID */ |
| 363 | | -@@ -1071,20 +1076,8 @@ |
| 364 | | - } |
| 365 | | - newkey = storeKeyPublicByRequest(mem->request); |
| 366 | | - if (mem->vary_headers && !EBIT_TEST(e->flags, KEY_EARLY_PUBLIC)) { |
| | 363 | +@@ -1077,15 +1077,3 @@ |
| | 364 | + if (mem->vary_headers && !EBIT_TEST(e->flags, KEY_EARLY_PUBLIC)) { |
| 367 | 365 | - String vary = StringNull; |
| 368 | 366 | vary_id_t vary_id; |
| 369 | 367 | - String varyhdr; |
| — | — | @@ -378,6 +376,4 @@ |
| 379 | 377 | - stringClean(&varyhdr); |
| 380 | 378 | -#endif |
| 381 | 379 | + String vary = httpHeaderGetVary(&mem->reply->header); |
| 382 | | - /* Create or update the vary object */ |
| 383 | | - vary_id = storeAddVary(mem->store_url, mem->url, mem->method, newkey, httpHeaderGetStr(&mem->reply->header, HDR_ETAG), strBuf(vary), mem->vary_headers, mem->vary_encoding); |
| 384 | | - if (vary_id.create_time) { |
| | 380 | + |