SourceFormat Enforcement

[thirdparty/squid.git] / src / adaptation / icap / Config.cc

diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc
index 06abc33356342f64e0baa48db2bf73120a5a73cf..37f54916a7c4cd97b1e2050cb82964923246be7a 100644 (file)
--- a/src/adaptation/icap/Config.cc
+++ b/src/adaptation/icap/Config.cc
@@ -1,63 +1,39 @@
-
 /*
- * $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.
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- *  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) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #include "squid.h"
-
-#include "ConfigParser.h"
-#include "Store.h"
-#include "Array.h"     // really Vector
 #include "adaptation/icap/Config.h"
 #include "adaptation/icap/ServiceRep.h"
-#include "HttpRequest.h"
+#include "ConfigParser.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
+#include "SquidConfig.h"
+#include "Store.h"
 #include "wordlist.h"
 
 Adaptation::Icap::Config Adaptation::Icap::TheConfig;
 
-Adaptation::Icap::Config::Config(): preview_enable(0), preview_size(0),
-        connect_timeout_raw(0), io_timeout_raw(0), reuse_connections(0),
-        client_username_header(NULL), client_username_encode(0), repeat(NULL)
+Adaptation::Icap::Config::Config() :
+    default_options_ttl(0),
+    preview_enable(0), preview_size(0), allow206_enable(0),
+    connect_timeout_raw(0), io_timeout_raw(0), reuse_connections(0),
+    client_username_header(NULL), client_username_encode(0), repeat(NULL),
+    repeat_limit(0)
 {
 }
 
 Adaptation::Icap::Config::~Config()
 {
-    // TODO: delete client_username_header?
+    // no need to free client_username_header, it's done in cf_parser.cci:free_all
 }
 
 Adaptation::ServicePointer
-Adaptation::Icap::Config::createService(const Adaptation::ServiceConfig &cfg)
+Adaptation::Icap::Config::createService(const ServiceConfigPointer &cfg)
 {
     return new Adaptation::Icap::ServiceRep(cfg);
 }
@@ -78,3 +54,4 @@ time_t Adaptation::Icap::Config::io_timeout(bool) const
     // can still be bypassed
     return ::Config.Timeout.read;
 }
+