From: Amos Jeffries Date: Mon, 25 Aug 2014 15:47:04 +0000 (-0700) Subject: Boilerplate: update copyright licenses on include/ sources X-Git-Tag: SQUID_3_5_0_1~94 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c193dec98688f2766381c01b636de5cf3ac2a69;p=thirdparty%2Fsquid.git Boilerplate: update copyright licenses on include/ sources * add Squid Software Foundation blurb * update CONTRIBUTORS with missing authors * update CREDITS with missing license and copyright statements It looks a bit messy, but Carnegie Mellon Univeristy license requires that several very similar but unique copyright and license blurbs be documented unabreviated. --- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0bf9ce13f8..8cae36d9da 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -182,6 +182,7 @@ Thank you! Niall Doherty Nick Rogers Nikolai Gorchilov + Olivier Montanuy Oskar Pearson Paul Z Pawel Worach diff --git a/CREDITS b/CREDITS index 0a8ba3ffb1..c263cda4ad 100644 --- a/CREDITS +++ b/CREDITS @@ -540,24 +540,23 @@ compat/xstrto.cc: ============================================================================== -lib/base64.c::base64_encode(): - -Adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c. -Modified to work with strings instead of files. - -============================================================================== +include/asn1.h, +include/snmp_api_error.h, +include/snmp_api_util.h, +include/snmp_coexist.h, +include/snmp_error.h, +include/snmp-internal.h, +include/snmp-mib.h, +include/snmp_msg.h, +include/snmp_pdu.h, +include/snmp_session.h, +include/snmp_vars.h, +include/snmp.h: -lib/snmplib/*: -include/{asn1.h,parse.h,snmp*}: - -The SNMP library code is developed by Carnegie Mellon University. - -/*************************************************************************** - * * Copyright 1997 by Carnegie Mellon University - * + * * All Rights Reserved - * + * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appear in all copies and that @@ -565,7 +564,7 @@ The SNMP library code is developed by Carnegie Mellon University. * supporting documentation, and that the name of CMU not be * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. - * + * * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -573,49 +572,55 @@ The SNMP library code is developed by Carnegie Mellon University. * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. - * - ***************************************************************************/ ============================================================================== +include/heap.h, +lib/heap.cc: + + * Copyright (C) 1999 by Hewlett Packard + +============================================================================== + +include/md5.h, lib/md5.c: -/* - * This code implements the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was * written by Colin Plumb in 1993, no copyright is claimed. * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * SquidMD5Context structure, pass it to SquidMD5Init, call - * SquidMD5Update as needed on buffers full of bytes, and then call - * SquidMD5Final, which will fill a supplied 16-byte array with the - * digest. - * - * Changed so as no longer to depend on Colin Plumb's `usual.h' header - * definitions; now uses stuff from dpkg's config.h. - * - Ian Jackson . - * Still in the public domain. - * - * Changed SquidMD5Update to take a void * for easier use and some - * other minor cleanup. - Henrik Nordstrom . - * Still in the public domain. - * - * Prefixed all symbols with "Squid" so they don't collide with - * other libraries. Duane Wessels . - * Still in the public domain. - */ ============================================================================== +include/parse.h, +include/snmp_api.h: + +/*********************************************************** + Copyright 1989 by Carnegie Mellon University + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of CMU not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. +******************************************************************/ + +============================================================================== + +include/radix.h, lib/radix.c: -/* * Copyright (c) 1988, 1989, 1993 * The Regents of the University of California. All rights reserved. * @@ -642,9 +647,84 @@ lib/radix.c: * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + +============================================================================== + +include/rfc2617.h: + + * The source in this file is derived from the reference implementation + * in RFC 2617. + * RFC 2617 is Copyright (C) The Internet Society (1999). All Rights Reserved. + +============================================================================== + +include/snmp_client.h, +include/snmp_impl.h: + +/*********************************************************** + Copyright 1988, 1989 by Carnegie Mellon University + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of CMU not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. +******************************************************************/ + +============================================================================== + +include/snmp_util.h: + + * Copyright (c) 1997 FT/CNET/DES/GRL Olivier Montanuy + +============================================================================== + +lib/base64.c::base64_encode(): + +Adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c. +Modified to work with strings instead of files. + +============================================================================== + +lib/snmplib/*: + +The SNMP library code is developed by Carnegie Mellon University. + +/*************************************************************************** * - * @(#)radix.c 8.4 (Berkeley) 11/2/94 - */ + * Copyright 1997 by Carnegie Mellon University + * + * All Rights Reserved + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appear in all copies and that + * both that copyright notice and this permission notice appear in + * supporting documentation, and that the name of CMU not be + * used in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * + ***************************************************************************/ ============================================================================== diff --git a/include/CbDataList.h b/include/CbDataList.h index 822fa303f6..67964f7014 100644 --- a/include/CbDataList.h +++ b/include/CbDataList.h @@ -1,30 +1,9 @@ /* - * 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-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 SQUID_LIST_H diff --git a/include/MemPool.h b/include/MemPool.h index 2ce211ca49..b99902e0c9 100644 --- a/include/MemPool.h +++ b/include/MemPool.h @@ -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. + */ + #ifndef _MEM_POOL_H_ #define _MEM_POOL_H_ diff --git a/include/MemPoolChunked.h b/include/MemPoolChunked.h index 7ef4a95acf..0e5896748d 100644 --- a/include/MemPoolChunked.h +++ b/include/MemPoolChunked.h @@ -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. + */ + #ifndef _MEM_POOL_CHUNKED_H_ #define _MEM_POOL_CHUNKED_H_ diff --git a/include/MemPoolMalloc.h b/include/MemPoolMalloc.h index 43064203ea..8d1364ec71 100644 --- a/include/MemPoolMalloc.h +++ b/include/MemPoolMalloc.h @@ -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. + */ + #ifndef _MEM_POOL_MALLOC_H_ #define _MEM_POOL_MALLOC_H_ diff --git a/include/Range.h b/include/Range.h index 812f86c34f..74238d0426 100644 --- a/include/Range.h +++ b/include/Range.h @@ -1,31 +1,9 @@ /* + * Copyright (C) 1996-2014 The Squid Software Foundation and contributors * - * 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. - * + * 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_RANGE_H diff --git a/include/SquidNew.h b/include/SquidNew.h index 0321a8819a..3ebc169136 100644 --- a/include/SquidNew.h +++ b/include/SquidNew.h @@ -1,33 +1,11 @@ /* - * AUTHOR: Harvest Derived - * - * 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-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 SQUID_NEW_H #define SQUID_NEW_H diff --git a/include/asn1.h b/include/asn1.h index 576ee32f17..9b028d67ba 100644 --- a/include/asn1.h +++ b/include/asn1.h @@ -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. + */ + #ifndef SQUID_SNMP_ASN1_H #define SQUID_SNMP_ASN1_H diff --git a/include/base64.h b/include/base64.h index f9cac49f07..c387026814 100644 --- a/include/base64.h +++ b/include/base64.h @@ -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. + */ + #ifndef _SQUID_BASE64_H #define _SQUID_BASE64_H diff --git a/include/cache_snmp.h b/include/cache_snmp.h index ffdea6759d..a62f7ac4c6 100644 --- a/include/cache_snmp.h +++ b/include/cache_snmp.h @@ -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. + */ + #ifndef SQUID_CACHE_SNMP_H #define SQUID_CACHE_SNMP_H diff --git a/include/charset.h b/include/charset.h index 5d385b2108..b734a37629 100644 --- a/include/charset.h +++ b/include/charset.h @@ -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. + */ + #ifndef _SQUID_CHARSET_H #define _SQUID_CHARSET_H diff --git a/include/getfullhostname.h b/include/getfullhostname.h index 575afd8809..3ee692e1d9 100644 --- a/include/getfullhostname.h +++ b/include/getfullhostname.h @@ -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. + */ + #ifndef _SQUID_GETFULLHOSTNAME_H #define _SQUID_GETFULLHOSTNAME_H diff --git a/include/hash.h b/include/hash.h index 2e87c593f4..1e31fbdf98 100644 --- a/include/hash.h +++ b/include/hash.h @@ -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. + */ + #ifndef SQUID_HASH_H #define SQUID_HASH_H diff --git a/include/heap.h b/include/heap.h index d37cc80273..43a40bc9e9 100644 --- a/include/heap.h +++ b/include/heap.h @@ -1,32 +1,13 @@ /* - * AUTHOR: John Dilley, Hewlett Packard - * - * 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-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. + */ + +/* + * AUTHOR: John Dilley, Hewlett Packard */ /**************************************************************************** diff --git a/include/html_quote.h b/include/html_quote.h index 4ad42ed7df..2258894e80 100644 --- a/include/html_quote.h +++ b/include/html_quote.h @@ -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. + */ + #ifndef _SQUID_HTML_QUOTE_H #define _SQUID_HTML_QUOTE_H diff --git a/include/leakcheck.h b/include/leakcheck.h index acb05efd05..eca3a28e6b 100644 --- a/include/leakcheck.h +++ b/include/leakcheck.h @@ -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. + */ + #ifndef _SQUID_LEAKCHECK_H #define _SQUID_LEAKCHECK_H diff --git a/include/md5.h b/include/md5.h index 4bc5e69197..c9a4b30712 100644 --- a/include/md5.h +++ b/include/md5.h @@ -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. + */ + #ifndef SQUID_MD5_H #define SQUID_MD5_H diff --git a/include/memMeter.h b/include/memMeter.h index 612e951df4..f765b12fe6 100644 --- a/include/memMeter.h +++ b/include/memMeter.h @@ -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. + */ + #ifndef _MEM_METER_H_ #define _MEM_METER_H_ diff --git a/include/parse.h b/include/parse.h index 4da4545746..b178232820 100644 --- a/include/parse.h +++ b/include/parse.h @@ -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. + */ + #ifndef SQUID_PARSE_H #define SQUID_PARSE_H diff --git a/include/radix.h b/include/radix.h index debc324743..5f81b42d50 100644 --- a/include/radix.h +++ b/include/radix.h @@ -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. + */ + #ifndef SQUID_RADIX_H #define SQUID_RADIX_H diff --git a/include/rfc1035.h b/include/rfc1035.h index 75e922635b..19b5f85240 100644 --- a/include/rfc1035.h +++ b/include/rfc1035.h @@ -1,33 +1,15 @@ /* - * AUTHOR: Duane Wessels - * - * 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-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. */ + +/* + * AUTHOR: Duane Wessels + */ + #ifndef SQUID_RFC1035_H #define SQUID_RFC1035_H diff --git a/include/rfc1123.h b/include/rfc1123.h index a61451f2d4..394eddb360 100644 --- a/include/rfc1123.h +++ b/include/rfc1123.h @@ -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. + */ + #ifndef _SQUID_RFC1123_H #define _SQUID_RFC1123_H diff --git a/include/rfc1738.h b/include/rfc1738.h index 187d5c36e6..9a8da76545 100644 --- a/include/rfc1738.h +++ b/include/rfc1738.h @@ -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. + */ + #ifndef _SQUID_INCLUDE_RFC1738_H #define _SQUID_INCLUDE_RFC1738_H diff --git a/include/rfc2181.h b/include/rfc2181.h index cac8090072..ff627bfdb4 100644 --- a/include/rfc2181.h +++ b/include/rfc2181.h @@ -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. + */ + #ifndef _SQUID_INCLUDE_RFC1123_H #define _SQUID_INCLUDE_RFC1123_H diff --git a/include/rfc2617.h b/include/rfc2617.h index 3a4bbea485..b3c830f43f 100644 --- a/include/rfc2617.h +++ b/include/rfc2617.h @@ -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. + */ + /* The source in this file is derived from the reference implementation * in RFC 2617. * RFC 2617 is Copyright (C) The Internet Society (1999). All Rights Reserved. @@ -13,36 +21,9 @@ */ /* - * DEBUG: * AUTHOR: RFC 2617 & Robert Collins - * - * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ - * ---------------------------------------------------------- - * - * Squid is the result of efforts by numerous individuals from the - * Internet community. Development is led by Duane Wessels of the - * National Laboratory for Applied Network Research and funded by the - * National Science Foundation. Squid is Copyrighted (C) 1998 by - * the Regents of the University of California. Please see the - * COPYRIGHT file for full details. Squid incorporates software - * developed and/or copyrighted by other sources. Please 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. - * */ + #ifndef SQUID_RFC2617_H #define SQUID_RFC2617_H diff --git a/include/rfc2671.h b/include/rfc2671.h index f983575f5f..3ecf675253 100644 --- a/include/rfc2671.h +++ b/include/rfc2671.h @@ -1,36 +1,9 @@ /* - * AUTHOR: Amos Jeffries - * - * 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 code is copyright (C) 2007 by Treehouse Networks Ltd of - * New Zealand. It is published and Lisenced as an extension of - * squid under the same conditions as the main squid application. - * - * 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-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 SQUID_RFC2671_H diff --git a/include/rfc3596.h b/include/rfc3596.h index eadf14a463..3bad604563 100644 --- a/include/rfc3596.h +++ b/include/rfc3596.h @@ -1,36 +1,9 @@ /* - * AUTHOR: Amos Jeffries, Rafael Martinez Torres - * - * 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 code is copyright (C) 2007 by Treehouse Networks Ltd of - * New Zealand. It is published and Lisenced as an extension of - * squid under the same conditions as the main squid application. - * - * 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-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 SQUID_RFC3596_H diff --git a/include/snmp-internal.h b/include/snmp-internal.h index 88fc1f112c..1006a1899e 100644 --- a/include/snmp-internal.h +++ b/include/snmp-internal.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_INTERNAL_H #define SQUID_SNMP_INTERNAL_H diff --git a/include/snmp-mib.h b/include/snmp-mib.h index c03b55e562..8a43e30623 100644 --- a/include/snmp-mib.h +++ b/include/snmp-mib.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_MIB_H #define SQUID_SNMP_MIB_H diff --git a/include/snmp.h b/include/snmp.h index e042315618..aa51ea3a69 100644 --- a/include/snmp.h +++ b/include/snmp.h @@ -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. + */ + #ifndef SQUID_SNMP_H #define SQUID_SNMP_H diff --git a/include/snmp_api.h b/include/snmp_api.h index 3c8517ef3f..3bbcd1c83a 100644 --- a/include/snmp_api.h +++ b/include/snmp_api.h @@ -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. + */ + #ifndef SQUID_SNMP_API_H #define SQUID_SNMP_API_H diff --git a/include/snmp_api_error.h b/include/snmp_api_error.h index 6e57da83f4..475ab0ae96 100644 --- a/include/snmp_api_error.h +++ b/include/snmp_api_error.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_API_ERROR_H #define SQUID_SNMP_API_ERROR_H diff --git a/include/snmp_api_util.h b/include/snmp_api_util.h index 5e7811229b..db67b4e53f 100644 --- a/include/snmp_api_util.h +++ b/include/snmp_api_util.h @@ -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. + */ + #ifndef SQUID_SNMP_API_UTIL_H #define SQUID_SNMP_API_UTIL_H diff --git a/include/snmp_client.h b/include/snmp_client.h index 7b974dc4d4..80ed13fcd7 100644 --- a/include/snmp_client.h +++ b/include/snmp_client.h @@ -1,9 +1,14 @@ +/* + * 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 SQUID_SNMP_CLIENT_H #define SQUID_SNMP_CLIENT_H -/* - * snmp_client.h - */ /*********************************************************** Copyright 1988, 1989 by Carnegie Mellon University diff --git a/include/snmp_coexist.h b/include/snmp_coexist.h index f37a6b3730..48881e46b6 100644 --- a/include/snmp_coexist.h +++ b/include/snmp_coexist.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_COEXISTANCE_H #define SQUID_SNMP_COEXISTANCE_H @@ -39,4 +46,4 @@ extern "C" { } #endif -#endif /* SQUID_SNMP_COEXISTANCE_H */ +#endif /* SQUID_SNMP_COEXISTANCE_H */ diff --git a/include/snmp_debug.h b/include/snmp_debug.h index 8fa6351add..0d39e43d6d 100644 --- a/include/snmp_debug.h +++ b/include/snmp_debug.h @@ -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. + */ + #ifndef SQUID_SNMP_DEBUG_H #define SQUID_SNMP_DEBUG_H diff --git a/include/snmp_error.h b/include/snmp_error.h index c76afc33e3..24f415f9fc 100644 --- a/include/snmp_error.h +++ b/include/snmp_error.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_ERROR_H #define SQUID_SNMP_ERROR_H diff --git a/include/snmp_impl.h b/include/snmp_impl.h index 124e93e3df..ca4f78f008 100644 --- a/include/snmp_impl.h +++ b/include/snmp_impl.h @@ -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. + */ + #ifndef SQUID_SNMP_IMPL_H #define SQUID_SNMP_IMPL_H diff --git a/include/snmp_msg.h b/include/snmp_msg.h index eba5c98c5d..385b74d384 100644 --- a/include/snmp_msg.h +++ b/include/snmp_msg.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_MSG_H #define SQUID_SNMP_MSG_H diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h index 732aa88b66..524c4b3d66 100644 --- a/include/snmp_pdu.h +++ b/include/snmp_pdu.h @@ -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. + */ + #ifndef SQUID_SNMP_PDU_H #define SQUID_SNMP_PDU_H @@ -5,7 +13,6 @@ #include "asn1.h" #if HAVE_NETINET_IN_H -/* required for sockaddr_in definition */ #include #endif diff --git a/include/snmp_session.h b/include/snmp_session.h index 1c31a45cd9..17ee4c8f3a 100644 --- a/include/snmp_session.h +++ b/include/snmp_session.h @@ -1,4 +1,11 @@ -/* -*- c++ -*- */ +/* + * 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 SQUID_SNMP_SESSION_H #define SQUID_SNMP_SESSION_H diff --git a/include/snmp_util.h b/include/snmp_util.h index 5a77bdc211..36f4261857 100644 --- a/include/snmp_util.h +++ b/include/snmp_util.h @@ -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. + */ + #ifndef SQUID_SNMP_UTIL_H #define SQUID_SNMP_UTIL_H diff --git a/include/snmp_vars.h b/include/snmp_vars.h index d293ec9805..d98c4a9538 100644 --- a/include/snmp_vars.h +++ b/include/snmp_vars.h @@ -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. + */ + #ifndef SQUID_SNMP_VARS_H #define SQUID_SNMP_VARS_H diff --git a/include/splay.h b/include/splay.h index c955514203..eae7380d33 100644 --- a/include/splay.h +++ b/include/splay.h @@ -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. + */ + #ifndef SQUID_SPLAY_H #define SQUID_SPLAY_H diff --git a/include/squid.h b/include/squid.h index 306abd1948..d7f439a557 100644 --- a/include/squid.h +++ b/include/squid.h @@ -1,32 +1,9 @@ /* - * AUTHOR: Duane Wessels - * - * 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-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 SQUID_CONFIG_H diff --git a/include/squid_endian.h b/include/squid_endian.h index 13c8f309ea..2261409a32 100644 --- a/include/squid_endian.h +++ b/include/squid_endian.h @@ -1,32 +1,13 @@ /* - * AUTHOR: Alan Barrett - * - * 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-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. + */ + +/* + * AUTHOR: Alan Barrett */ #ifndef SQUID_ENDIAN_H diff --git a/include/sspwin32.h b/include/sspwin32.h index 8e7a2ec688..f3083e8fbf 100644 --- a/include/sspwin32.h +++ b/include/sspwin32.h @@ -1,34 +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. + */ + /* * AUTHOR: Guido Serassio * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran - * - * 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. - * */ + #ifndef _LIBSSPWIN32_H_ #define _LIBSSPWIN32_H_ diff --git a/include/util.h b/include/util.h index e941ca8d8b..fe8ecf9412 100644 --- a/include/util.h +++ b/include/util.h @@ -1,32 +1,9 @@ /* - * AUTHOR: Harvest Derived - * - * 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-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 SQUID_UTIL_H diff --git a/include/uudecode.h b/include/uudecode.h index e5e46ea14b..0dc1638b1e 100644 --- a/include/uudecode.h +++ b/include/uudecode.h @@ -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. + */ + #ifndef _SQUID_UUDECODE_H #define _SQUID_UUDECODE_H diff --git a/include/version.h b/include/version.h index 8c6a1610b9..b5004467e4 100644 --- a/include/version.h +++ b/include/version.h @@ -1,15 +1,20 @@ /* - * SQUID_VERSION - String for version id of this distribution - */ - -/* - * SQUID_VERSION is now the automake "VERSION" string. + * 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 SQUID_RELEASE_TIME #define SQUID_RELEASE_TIME squid_curtime #endif +/* + * String for version id of this distribution + * is now the automake "VERSION" string. + */ + #ifndef APP_SHORTNAME #define APP_SHORTNAME "squid" #endif diff --git a/include/xusleep.h b/include/xusleep.h index df3853a759..efbae83a34 100644 --- a/include/xusleep.h +++ b/include/xusleep.h @@ -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. + */ + #ifndef _INC_XUSLEEP_H #define _INC_XUSLEEP_H