SourceFormat Enforcement

[thirdparty/squid.git] / src / client_side_request.cci

diff --git a/src/client_side_request.cci b/src/client_side_request.cci
index 141036bf446eb62f545350bd1393ff93110e250f..51710fd9539014e6c7310b8efb624191667aa7c8 100644 (file)
--- a/src/client_side_request.cci
+++ b/src/client_side_request.cci
@@ -1,39 +1,15 @@
-
 /*
- * $Id: client_side_request.cci,v 1.5 2006/05/11 21:29:02 wessels Exp $
- *
- * DEBUG: section 85    Client-side Request Routines
- * AUTHOR: Robert Collins 
- *
- * 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.
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
- *  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) 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.
  */
 
+/* DEBUG: section 85    Client-side Request Routines */
+
+#include "Store.h"
+
 StoreEntry *
 ClientHttpRequest::storeEntry() const
 {
@@ -49,23 +25,24 @@ ClientHttpRequest::memObject() const
     return NULL;
 }
 
-ConnStateData::Pointer
-ClientHttpRequest::getConn()
-{
-    return conn_;
-}
-
-ConnStateData::Pointer const
+ConnStateData *
 ClientHttpRequest::getConn() const
 {
+    if (!cbdataReferenceValid(conn_))
+        return NULL;
+
     return conn_;
 }
 
 void
-ClientHttpRequest::setConn(ConnStateData::Pointer aConn)
+ClientHttpRequest::setConn(ConnStateData * aConn)
 {
     assert (conn_ == NULL || aConn == NULL);
-    conn_ = aConn;
+
+    if (conn_)
+        cbdataReferenceDone(conn_);
+
+    conn_ = cbdataReference(aConn);
 }
 
 StoreEntry *
@@ -73,3 +50,4 @@ ClientHttpRequest::loggingEntry() const
 {
     return loggingEntry_;
 }
+