Docs: Copyright updates for 2018 (#114)

[thirdparty/squid.git] / src / adaptation / icap / OptXact.h

diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h
index 3fe0ec834674f9b016967ed6f496f87721ec6ee6..0844a96660d52093923a398eb01ea271c2f92226 100644 (file)
--- a/src/adaptation/icap/OptXact.h
+++ b/src/adaptation/icap/OptXact.h
@@ -1,44 +1,21 @@
 /*
- * $Id$
- *
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2018 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_ICAPOPTXACT_H
 #define SQUID_ICAPOPTXACT_H
 
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/Xaction.h"
 
-
-namespace Adaptation {
-namespace Icap {
+namespace Adaptation
+{
+namespace Icap
+{
 
 /* OptXact sends an ICAP OPTIONS request to the ICAP service,
  * parses the ICAP response, and sends it to the initiator. A NULL response
@@ -47,9 +24,10 @@ namespace Icap {
 
 class OptXact: public Xaction
 {
+    CBDATA_CLASS(OptXact);
 
 public:
-    OptXact(Adaptation::Initiator *anInitiator, ServiceRep::Pointer &aService);
+    OptXact(ServiceRep::Pointer &aService);
 
 protected:
     virtual void start();
@@ -58,30 +36,34 @@ protected:
     virtual void handleCommRead(size_t size);
 
     void makeRequest(MemBuf &buf);
-    HttpMsg *parseResponse();
+    bool parseResponse();
 
     void startReading();
+    virtual bool doneReading() const { return commEof || readAll; }
+
+    virtual void swanSong();
 
 private:
-    CBDATA_CLASS2(OptXact);
+    virtual void finalizeLogInfo();
+
+    bool readAll; ///< read the entire OPTIONS response
 };
 
 // An Launcher that stores OptXact construction info and
 // creates OptXact when needed
 class OptXactLauncher: public Launcher
 {
+    CBDATA_CLASS(OptXactLauncher);
+
 public:
-    OptXactLauncher(Adaptation::Initiator *anInitiator, Adaptation::ServicePointer aService);
+    OptXactLauncher(Adaptation::ServicePointer aService);
 
 protected:
     virtual Xaction *createXaction();
-
-private:
-    CBDATA_CLASS2(OptXactLauncher);
 };
 
-
 } // namespace Icap
 } // namespace Adaptation
 
 #endif /* SQUID_ICAPOPTXACT_H */
+