Bugfix to make Vary processing a bit more robust

diff --git a/src/client_side.cc b/src/client_side.cc
index c0542fda8848765bad5623aa6c7fabe85651a35b..4fceb4611f5300b3436197611addf7f53af25f3d 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.584 2002/08/09 11:13:33 adrian Exp $
+ * $Id: client_side.cc,v 1.585 2002/08/15 18:11:48 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1735,28 +1735,28 @@ clientKeepaliveNextRequest(clientHttpRequest * http)
        if (0 == storeClientCopyPending(http->sc, entry, http)) {
            if (EBIT_TEST(entry->flags, ENTRY_ABORTED))
                debug(33, 0) ("clientKeepaliveNextRequest: ENTRY_ABORTED\n");
-            /* If we have any data in our reqbuf, use it */
+           /* If we have any data in our reqbuf, use it */
            if (http->reqsize > 0) {
                /*
-                 * We can pass in reqbuf/size here, since clientSendMoreData ignores what
-                 * is passed and uses them itself.. :-)
-                 * -- adrian
-                 */
-                clientSendMoreData(http, http->reqbuf, http->reqsize);
+                * We can pass in reqbuf/size here, since clientSendMoreData ignores what
+                * is passed and uses them itself.. :-)
+                * -- adrian
+                */
+               clientSendMoreData(http, http->reqbuf, http->reqsize);
            } else {
                assert(http->out.offset == 0);
-                /*
-                * here - have no data (don't ever think we get here..)
-                 * so lets start copying..
-                * -- adrian
-                */
-               storeClientCopy(http->sc, entry,
-                   http->out.offset,
+               /*
+                * here - have no data (don't ever think we get here..)
+                * so lets start copying..
+                * -- adrian
+                */
+               storeClientCopy(http->sc, entry,
+                   http->out.offset,
                    HTTP_REQBUF_SZ,
                    http->reqbuf,
                    clientSendMoreData,
                    http);
-            }
+           }
        }
     }
 }
@@ -3270,17 +3270,21 @@ varyEvaluateMatch(StoreEntry * entry, request_t * request)
        /* virtual "vary" object found. Calculate the vary key and
         * continue the search
         */
-       vary = request->vary_headers = xstrdup(httpMakeVaryMark(request, entry->mem_obj->reply));
-       if (vary)
+       vary = httpMakeVaryMark(request, entry->mem_obj->reply);
+       if (vary) {
+           request->vary_headers = xstrdup(vary);
            return VARY_OTHER;
-       else {
+       } else {
            /* Ouch.. we cannot handle this kind of variance */
            /* XXX This cannot really happen, but just to be complete */
            return VARY_CANCEL;
        }
     } else {
-       if (!vary)
-           vary = request->vary_headers = xstrdup(httpMakeVaryMark(request, entry->mem_obj->reply));
+       if (!vary) {
+           vary = httpMakeVaryMark(request, entry->mem_obj->reply);
+           if (vary)
+               request->vary_headers = xstrdup(vary);
+       }
        if (!vary) {
            /* Ouch.. we cannot handle this kind of variance */
            /* XXX This cannot really happen, but just to be complete */

diff --git a/src/store.cc b/src/store.cc
index 42b64a68b39661c08e59c0f2a8fa4f0f75f9f8f0..752eee1c1759f49fe463edc42b3222307136fbcd 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.544 2001/10/24 08:19:08 hno Exp $
+ * $Id: store.cc,v 1.545 2002/08/15 18:11:48 hno Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -416,8 +416,11 @@ storeSetPublicKey(StoreEntry * e)
                    storeRelease(pe);
            }
            /* Make sure the request knows the variance status */
-           if (!request->vary_headers)
-               request->vary_headers = xstrdup(httpMakeVaryMark(request, mem->reply));
+           if (!request->vary_headers) {
+               const char *vary = httpMakeVaryMark(request, mem->reply);
+               if (vary)
+                   request->vary_headers = xstrdup(vary);
+           }
        }
        if (mem->vary_headers && !storeGetPublic(mem->url, mem->method)) {
            /* Create "vary" base object */