httpBuildVersion() fixes from 2.4 branch, plus indent

diff --git a/src/ftp.cc b/src/ftp.cc
index 644494819ec2f9a3a4680b26fb2cf38a4f3848b5..32ac444bc55146fb060bccc6829c81bd2f9f7572 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.299 2000/11/13 21:45:48 adrian Exp $
+ * $Id: ftp.cc,v 1.300 2000/11/14 07:06:19 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -2494,13 +2494,13 @@ ftpAppendSuccessHeader(FtpStateData * ftpState)
        HttpHdrRangeSpec range_spec;
        range_spec.offset = ftpState->restarted_offset;
        range_spec.length = ftpState->size - ftpState->restarted_offset;
-        httpBuildVersion(&version,1,0);
+       httpBuildVersion(&version, 1, 0);
        httpReplySetHeaders(reply, version, HTTP_PARTIAL_CONTENT, "Gatewaying",
            mime_type, ftpState->size - ftpState->restarted_offset, ftpState->mdtm, -2);
        httpHeaderAddContRange(&reply->header, range_spec, ftpState->size);
     } else {
        /* Full reply */
-        httpBuildVersion(&version,1,0);
+       httpBuildVersion(&version, 1, 0);
        httpReplySetHeaders(reply, version, HTTP_OK, "Gatewaying",
            mime_type, ftpState->size, ftpState->mdtm, -2);
     }

diff --git a/src/store_digest.cc b/src/store_digest.cc
index 51e396ce38d744e7db2a68548849278d1729b080..0a5d7ac6f009d07a5cd8bf4b89f8c72f0c81b4f8 100644 (file)
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_digest.cc,v 1.43 2000/11/01 04:50:25 wessels Exp $
+ * $Id: store_digest.cc,v 1.44 2000/11/14 07:06:19 wessels Exp $
  *
  * DEBUG: section 71    Store Digest Manager
  * AUTHOR: Alex Rousskov
@@ -367,6 +367,7 @@ static void
 storeDigestRewriteResume(void)
 {
     StoreEntry *e = sd_state.rewrite_lock;
+    http_version_t version;
 
     assert(sd_state.rewrite_lock);
     assert(!sd_state.rebuild_lock);
@@ -376,7 +377,8 @@ storeDigestRewriteResume(void)
     storeSetPublicKey(e);
     /* fake reply */
     httpReplyReset(e->mem_obj->reply);
-    httpReplySetHeaders(e->mem_obj->reply, 1.0, 200, "Cache Digest OK",
+    httpBuildVersion(&version, 1, 0);
+    httpReplySetHeaders(e->mem_obj->reply, version, 200, "Cache Digest OK",
        "application/cache-digest", store_digest->mask_size + sizeof(sd_state.cblock),
        squid_curtime, squid_curtime + Config.digest.rewrite_period);
     debug(71, 3) ("storeDigestRewrite: entry expires on %d (%+d)\n",