- More cleanup relating to reduced error code set. protostart() doesn't

  really need ERR_NOT_IMPLEMENTED.
- Start working on VM_WINDOW code, removed/replaced old DONT_USE_VM defines
- Replaced !DONT_USE_VM defines with USE_ICP_HIT_OBJ.

diff --git a/src/http.cc b/src/http.cc
index b04c4ff8ab211424084e856aa0b943a4a2074690..00c071ed5ca01380b6add8b3d9a0382ee150e618 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.188 1997/10/13 22:09:11 kostas Exp $
+ * $Id: http.cc,v 1.189 1997/10/14 18:31:24 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1015,11 +1015,7 @@ httpStart(request_t * request, StoreEntry * entry, peer * e)
        RequestMethodStr[request->method], entry->url);
     if (e) {
        if (e->options & NEIGHBOR_PROXY_ONLY)
-#if DONT_USE_VM
            storeReleaseRequest(entry);
-#else
-           storeStartDeleteBehind(entry);
-#endif
        if ((fd = pconnPop(e->host, e->http_port)) >= 0) {
            debug(11, 3) ("httpStart: reusing pconn FD %d\n", fd);
            httpState = httpBuildState(fd, entry, request, e);

diff --git a/src/structs.h b/src/structs.h
index 49ae3c336e1ee86105e722026c2636d1bed190d5..a6086941d149f215d2201786471f5341f2d73ea8 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -721,12 +721,16 @@ struct _stmem_stats {
 
 /* keep track each client receiving data from that particular StoreEntry */
 struct _store_client {
+#if VM_WINDOW
+    int swapin_fd;
+#else
     off_t copy_offset;
     off_t seen_offset;
     size_t copy_size;
     char *copy_buf;
     STCB *callback;
     void *callback_data;
+#endif
 };
 
 
@@ -741,7 +745,9 @@ struct _MemObject {
     struct _store_client *clients;
     int nclients;
     off_t swap_offset;
+#if !VM_WINDOW
     short swapin_fd;
+#endif
     short swapout_fd;
     struct _http_reply *reply;
     request_t *request;

diff --git a/src/wais.cc b/src/wais.cc
index a4b8536a909ad07d93d55250dfa27f2e7df26357..0cf694a2397da858002225f509605c5325d1988c 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.81 1997/10/13 22:09:26 kostas Exp $
+ * $Id: wais.cc,v 1.82 1997/10/14 18:31:28 wessels Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -171,7 +171,6 @@ waisReadReply(int fd, void *data)
     }
     if (entry->flag & DELETE_BEHIND && !storeClientWaiting(entry)) {
        /* we can terminate connection right now */
-       assert(!ERR_NO_CLIENTS);
        storeAbort(entry, 0);
        comm_close(fd);
        return;