Source Format Enforcement (#763)

[thirdparty/squid.git] / src / HttpReply.h

diff --git a/src/HttpReply.h b/src/HttpReply.h
index 6f0be1ee9bab4569ea564eefc69f6774cbbd7592..cfbf4d21db5640d62f5499d3bdb39e8f4578f7e2 100644 (file)
--- a/src/HttpReply.h
+++ b/src/HttpReply.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2019 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -72,7 +72,9 @@ public:
 
     virtual bool inheritProperties(const Http::Message *);
 
-    bool updateOnNotModified(HttpReply const *other);
+    /// \returns nil (if no updates are necessary)
+    /// \returns a new reply combining this reply with 304 updates (otherwise)
+    Pointer recreateOnNotModified(const HttpReply &reply304) const;
 
     /** set commonly used info with one call */
     void setHeaders(Http::StatusCode status,
@@ -81,8 +83,11 @@ public:
     /** \return a ready to use mem buffer with a packed reply */
     MemBuf *pack() const;
 
+    /// construct and return an HTTP/200 (Connection Established) response
+    static HttpReplyPointer MakeConnectionEstablished();
+
     /** construct a 304 reply and return it */
-    HttpReply *make304() const;
+    HttpReplyPointer make304() const;
 
     void redirect(Http::StatusCode, const char *);
 
@@ -107,7 +112,7 @@ public:
     void packHeadersUsingSlowPacker(Packable &p) const;
 
     /** Clone this reply.
-     *  Could be done as a copy-contructor but we do not want to accidently copy a HttpReply..
+     *  Could be done as a copy-contructor but we do not want to accidentally copy a HttpReply..
      */
     HttpReply *clone() const;