Boilerplate: add copyright blurbs on more files

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 0aca4150a0b3d051182146ea24fd10ec043b9494..1ee4ce9169c0a36afc9e81141175ec0c2cea97ad 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 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.
+##
+
 #
 # Makefile for installing Squid startup files on systems
 # using a SVR4-based startup mechanism/file system layout

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index ae203a6ca8137f252e2b2582b31e7f1eb3aaaec0..ad38f214528c5ad1b885ab3e4eb1e3f82c901b0a 100644 (file)
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (C) 1996-2014 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.
+ */
 
 section 00    Announcement Server
 section 00    Client Database

diff --git a/errors/alias-upgrade b/errors/alias-upgrade
index 92754c3a2d68bb142e909dfb954cec51aed557c2..cea11a8ebc8c93f05eda617eba45b0363aeeea4f 100644 (file)
--- a/errors/alias-upgrade
+++ b/errors/alias-upgrade
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 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.
+##
+
 # 3.0 Still published with the old language namings.
 # we leave these alone in case any are configured...
 az     Azerbaijani

diff --git a/errors/aliases b/errors/aliases
index faeed3a54ae48a1d50de4e79be9c92473be7fe8c..2829953bd7a5307907a463f968de19fbbe259657 100644 (file)
--- a/errors/aliases
+++ b/errors/aliases
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 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.
+##
+
 ar     ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye
 az     az-az
 bg     bg-bg

diff --git a/errors/errorpage.css b/errors/errorpage.css
index 8ecc4c8279bc25fd81ed7e05d8ecb24ea6e95483..b0639a03b62d08f34f2a62811dddb54b78ced602 100644 (file)
--- a/errors/errorpage.css
+++ b/errors/errorpage.css
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 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.
+ */
+
 /*
  Stylesheet for Squid Error pages
  Adapted from design by Free CSS Templates

diff --git a/helpers/log_daemon/DB/doc/date_day_column.sql b/helpers/log_daemon/DB/doc/date_day_column.sql
index b5067b27490c841d290f6b74cc31cefd1c08d760..7ea8e91a52107d03307b003a556b97793d160e84 100644 (file)
--- a/helpers/log_daemon/DB/doc/date_day_column.sql
+++ b/helpers/log_daemon/DB/doc/date_day_column.sql
@@ -1,3 +1,10 @@
+-- Copyright (C) 1996-2014 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.
+--
+
 -- we need a separate column to store the date and time of the request
 ALTER TABLE access_log ADD COLUMN date_day DATE;
 ALTER TABLE access_log ADD COLUMN date_time TIME;

diff --git a/helpers/log_daemon/DB/doc/views.sql b/helpers/log_daemon/DB/doc/views.sql
index b363c3b649b90b82e37d4906939ff33c60ac5894..1a9fd0b54b6fb92b952c279c86975c28fbf916c1 100644 (file)
--- a/helpers/log_daemon/DB/doc/views.sql
+++ b/helpers/log_daemon/DB/doc/views.sql
@@ -1,3 +1,10 @@
+-- Copyright (C) 1996-2014 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.
+--
+
 --
 -- Sample views
 --

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 9072b973646f43826ba0580f88db4bb452644bf8..63122d4af5bd886d7c287e03333e2209aabde600 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -5,11 +5,11 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-include $(top_srcdir)/icons/list
+include $(top_srcdir)/icons/icon.list
 
 icondir = $(datadir)/icons/silk
 icon_DATA = $(ICONS)
-EXTRA_DIST = $(ICONS) list SN.png
+EXTRA_DIST = $(ICONS) icon.list SN.png
 DISTCLEANFILES = 
 
 install-data-local: SN.png install-iconDATA

diff --git a/icons/list b/icons/icon.list
similarity index 100%
rename from icons/list
rename to icons/icon.list

diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h
index da0e36f52cc3877df7ba9c6cf5d110759ba86d44..e927d6960add99ea6a1ae8bf852073f22f3efec7 100644 (file)
--- a/lib/profiler/xprof_type.h
+++ b/lib/profiler/xprof_type.h
@@ -1,9 +1,16 @@
+/*
+ * Copyright (C) 1996-2014 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 _PROFILER_XPROF_TYPE_H_
 #define _PROFILER_XPROF_TYPE_H_
 /* AUTO-GENERATED FILE */
 #if USE_XPROF_STATS
 typedef enum {
-XPROF_PROF_UNACCOUNTED,
+  XPROF_PROF_UNACCOUNTED,
 XPROF_aclCheckFast,
 XPROF_ACL_matches,
 XPROF_calloc,
@@ -13,6 +20,7 @@ XPROF_comm_check_incoming,
 XPROF_comm_close,
 XPROF_comm_connect_addr,
 XPROF_comm_handle_ready_fd,
++XPROF_commHandleWrite,
 XPROF_commHandleWrite,
 XPROF_comm_open,
 XPROF_comm_poll_normal,

diff --git a/src/Comm.dox b/src/Comm.dox
index 4bf256a9457f443eb701dc783f8d766ed688fcbb..31a7deb23bf80dc5133071c48d8e9d472e7e78c3 100644 (file)
--- a/src/Comm.dox
+++ b/src/Comm.dox
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 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.
+ */
+
 /**
 \defgroup Comm Comm Module
 \ingroup Components

diff --git a/src/DiskIO/modules.sh b/src/DiskIO/modules.sh
index 6baebabd8c6c9e6bd0e45bef4d6773fa64191092..6c2306de45a89778e8ff0aa56437f3ee44364afc 100755 (executable)
--- a/src/DiskIO/modules.sh
+++ b/src/DiskIO/modules.sh
@@ -1,7 +1,16 @@
 #!/bin/sh
+#
+## Copyright (C) 1996-2014 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.
+##
+
 echo "/* automatically generated by $0 $*"
 echo " * do not edit"
 echo " */"
+cat `dirname $0`/../../scripts/boilerplate.h
 echo "#include \"squid.h\""
 echo "#include \"DiskIO/DiskIOModule.h\""
 for module in "$@"; do

diff --git a/src/base/AsyncCalls.dox b/src/base/AsyncCalls.dox
index a14008c5f8567a7f2b1247d3396ef70c8cada1cb..37d77f99dcc3cb891b4789bb9b8ea76c45244694 100644 (file)
--- a/src/base/AsyncCalls.dox
+++ b/src/base/AsyncCalls.dox
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 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.
+ */
+
 /**
 \defgroup AsyncCalls Asynchronous Calls
 \ingroup Components

diff --git a/src/base/AsyncJobs.dox b/src/base/AsyncJobs.dox
index c8f72c2d7ba79d0ebad2fc23579c6e82f0fd8ef4..fea946827aa474b4297fdf6ee0efb0e561005caf 100644 (file)
--- a/src/base/AsyncJobs.dox
+++ b/src/base/AsyncJobs.dox
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 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.
+ */
+
 /**
 \defgroup AsyncJobs Asynchronous Jobs
 \ingroup Components

diff --git a/src/mime.conf.default b/src/mime.conf.default
index 38f47a92fbbf7a504f2e4e43736bc12d66aa7e25..79cc9c56fefb4eac17a8f24382a637d253d70d94 100644 (file)
--- a/src/mime.conf.default
+++ b/src/mime.conf.default
@@ -1,16 +1,17 @@
-# This file associates filename extensions (for servers or services
-# that don't automatically include them - like ftp) with a mime type
-# and a graphical icon.
-#
-#
-# This file has the format :
-# regex content-type icon content-encoding transfer-mode
-#-----------------------------------------------------------------------------------
+## Copyright (C) 1996-2014 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.
+##
 #
+# This file associates URL patterns for servers or services
+# that don't automatically include Content-Type (like ftp) with a mime type
+# and a graphical icon.
 #
 # Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1)
 #
-#
+# This file has the format :
 #
 # regexp       content-type                    icon                            encoding mode   actions
 #--------------------------------------------------------------------------------------------------------
@@ -190,6 +191,6 @@ README              text/plain                      silk/information.png            -       ascii   +download
 \.xml$         text/xml                        silk/page_world.png             -       ascii   +download
 \.xsl$         text/xml                        silk/layout.png                 -       ascii   +download
 \.xyz$         chemical/x-xyz                  silk/chart_line.png             -       image   +download
-
+#
 # the default
 .              text/plain                      silk/bullet_red.png             -       image   +download +view

diff --git a/src/squid.8.in b/src/squid.8.in
index 0d48d788ac258daba731d82341b6e3239672ad60..8c759438ad2785f2dad5126e0f1ff66c552569c2 100644 (file)
--- a/src/squid.8.in
+++ b/src/squid.8.in
@@ -240,20 +240,11 @@ see CREDITS for a list of major code contributing copyright holders.
 .
 .SH COPYRIGHT
 .PP
-This software product, SQUID, is developed by a team of individuals,
-and copyrighted (C) 2001 by the Regents of the University of
-California, with all rights reserved.  UCSD administered the NLANR
-Cache grants, NCR 9616602 and NCR 9521745 under which most of this
-code was developed.
-.PP
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License (version 2) as
-published by the Free Software Foundation.  It 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.
-.PP
-see the CREDITS file for further copyright licensing of third-party code contributions.
+ * Copyright (C) 1996-2014 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.
 .
 .SH QUESTIONS
 Questions on the usage of this program can be sent to the

diff --git a/src/ssl/ssl_crtd.8 b/src/ssl/ssl_crtd.8
index 778f209f9283f67ac5421d5a69dc9754ffb00900..c50f0a58ac2d697f3777d9a904466d5cd53f8566 100644 (file)
--- a/src/ssl/ssl_crtd.8
+++ b/src/ssl/ssl_crtd.8
@@ -150,9 +150,12 @@ This manual was written by
 .if !'po4a'hide' .I Amos Jeffries <squid3@treenet.co.nz>
 .
 .SH COPYRIGHT
-This program and documentation is copyright to the authors named above.
 .PP
-Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+).
+ * Copyright (C) 1996-2014 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.
 .
 .SH QUESTIONS
 Questions on the usage of this program can be sent to the

diff --git a/tools/cachemgr.conf b/tools/cachemgr.conf
index 17805138b6347bb5406684f23fb2f534c9ed0b56..42f7d9a13bce58724e0785bcf64f89d08d71cfd6 100644 (file)
--- a/tools/cachemgr.conf
+++ b/tools/cachemgr.conf
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 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.
+##
+
 # This file controls which servers may be managed by
 # the cachemgr.cgi script
 #
@@ -10,4 +17,5 @@
 #
 # hostname is matched using shell filename matching, allowing
 # * and other shell wildcards.
+
 localhost