From: Amos Jeffries Date: Thu, 28 Aug 2014 16:10:38 +0000 (-0700) Subject: Boilerplate: update copyright blurbs on libmisc* libraries X-Git-Tag: SQUID_3_5_0_1~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0545caaadb2810aed8e5d7a00a8b3a36def748b1;p=thirdparty%2Fsquid.git Boilerplate: update copyright blurbs on libmisc* libraries * add Squid Software Foundation blurbs * update CONTRIBUTORS with missing authors * update CREDITS to match current reality --- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 397a94f6d0..157841cea5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -124,6 +124,7 @@ Thank you! Jerry Murdock Joachim Bauch Joao Alves Neto + Jochen Obalek Jochen Voss Joe Ramey John Dilley diff --git a/CREDITS b/CREDITS index ea518b2cd5..f670ddedfb 100644 --- a/CREDITS +++ b/CREDITS @@ -689,6 +689,8 @@ lib/snmplib/snmp_vars.c, include/heap.h, lib/heap.cc: + * AUTHOR: John Dilley, Hewlett Packard + * Copyright (C) 1999 by Hewlett Packard ============================================================================== @@ -762,7 +764,8 @@ lib/radix.c: ============================================================================== -include/rfc2617.h: +include/rfc2617.h, +lib/rfc2617.c: * The source in this file is derived from the reference implementation * in RFC 2617. @@ -833,15 +836,51 @@ Modified to work with strings instead of files. ============================================================================== -lib/drand48.c: +lib/dirent.c: -From Linux libc-5.4.46. +/* + * Implement dirent-style opendir(), readdir(), closedir(), rewinddir(), + * seekdir() and telldir on Windows - Based on mingw-runtime package sources. + * AUTHOR: Guido Serassio + */ + +/* + * Original file info follow: + * + * dirent.c + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * Derived from DIRLIB.C by Matt J. Weinstein + * This note appears in the DIRLIB.H + * DIRLIB.H by M. J. Weinstein Released to public domain 1-Jan-89 + * + * Updated by Jeremy Bettis + * Significantly revised and rewinddir, seekdir and telldir added by Colin + * Peters + * + */ ============================================================================== -mcast_encode() in src/access_log.c is derived from Mark Atkinson's -(mark_a@cix.compulink.co.uk) "Tiny Encryption Algorithm". -http://www.io.com/~paulhart/game/algorithms/tea.html +lib/encrypt.c: + + * Copyright (C) 1991 Jochen Obalek + * + * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA. ============================================================================== @@ -876,7 +915,31 @@ lib/getopt.c: * SUCH DAMAGE. */ -static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; +============================================================================== + +lib/drand48.c: + +From Linux libc-5.4.46. + +============================================================================== + +lib/radix.c: + + * Adapted from HTSUtils.c in CERN httpd 3.0 (http://info.cern.ch/httpd/) + * by Darren Hardy , November 1994. + +============================================================================== + +lib/Splay.cc: + + * based on ftp://ftp.cs.cmu.edu/user/sleator/splaying/top-down-splay.c + * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl + +============================================================================== + +mcast_encode() in src/access_log.c is derived from Mark Atkinson's +(mark_a@cix.compulink.co.uk) "Tiny Encryption Algorithm". +http://www.io.com/~paulhart/game/algorithms/tea.html ============================================================================== @@ -900,29 +963,6 @@ helpers/external_acl/wbinfo_group/wbinfo_group.pl: ============================================================================== -lib/libTrie/*: - -/* - * Copyright (c) 2002,2003 Robert Collins - * - * 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. - * - */ - -============================================================================== - helpers/ defines.h: helpers/basic_auth/fake/ fake.cc: helpers/url_rewrite/fake/ fake.cc, url_fake_rewrite.sh: diff --git a/lib/Makefile.am b/lib/Makefile.am index 3fab3f4d90..dce561a6a4 100644 --- a/lib/Makefile.am +++ b/lib/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. +## + include $(top_srcdir)/src/Common.am DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib diff --git a/lib/MemPool.cc b/lib/MemPool.cc index 6922bbc25f..31be72e2d7 100644 --- a/lib/MemPool.cc +++ b/lib/MemPool.cc @@ -1,34 +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. + */ /* * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, 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. - * */ #include "squid.h" diff --git a/lib/MemPoolChunked.cc b/lib/MemPoolChunked.cc index 14d8f2e2c7..2c882327c2 100644 --- a/lib/MemPoolChunked.cc +++ b/lib/MemPoolChunked.cc @@ -1,36 +1,26 @@ +/* + * 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. + */ /* * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, 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. - * */ +#include "squid.h" + +#include + +#include "MemPoolChunked.h" + +#define MEM_MAX_MMAP_CHUNKS 2048 + +#include + /* * Old way: * xmalloc each item separately, upon free stack into idle pool array. @@ -76,19 +66,8 @@ * badly fragmentation is spread across all chunks. * * Andres Kroonmaa. - * Copyright (c) 2003, Robert Collins */ -#include "squid.h" - -#include - -#include "MemPoolChunked.h" - -#define MEM_MAX_MMAP_CHUNKS 2048 - -#include - /* * XXX This is a boundary violation between lib and src.. would be good * if it could be solved otherwise, but left for now. diff --git a/lib/MemPoolMalloc.cc b/lib/MemPoolMalloc.cc index f0fe52fe98..c761c0e8ee 100644 --- a/lib/MemPoolMalloc.cc +++ b/lib/MemPoolMalloc.cc @@ -1,34 +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. + */ /* * DEBUG: section 63 Low Level Memory Pool Management * AUTHOR: Alex Rousskov, Andres Kroonmaa, Robert Collins, Henrik Nordstrom - * - * 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. - * */ #include "squid.h" diff --git a/lib/Splay.cc b/lib/Splay.cc index 220a2f9eee..ae38e35791 100644 --- a/lib/Splay.cc +++ b/lib/Splay.cc @@ -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. + */ + /* * based on ftp://ftp.cs.cmu.edu/user/sleator/splaying/top-down-splay.c * http://bobo.link.cs.cmu.edu/cgi-bin/splay/splay-cgi.pl diff --git a/lib/base64.c b/lib/base64.c index 70e7fb2ae6..adcea426af 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -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. + */ + /* * AUTHOR: Markus Moeller * diff --git a/lib/charset.c b/lib/charset.c index 82b7f7bbf2..a0ce11be5c 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -1,26 +1,9 @@ /* - * DEBUG: - * AUTHOR: Henrik Nordstrom - * - * Copyright (C) 2008 Henrik Nordstrom - * - * SQUID Web Proxy Cache http://www.squid-cache.org/ - * ---------------------------------------------------------- - * - * 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. */ #include "squid.h" diff --git a/lib/dirent.c b/lib/dirent.c index 83d82aa6d2..ba8f7c6d97 100644 --- a/lib/dirent.c +++ b/lib/dirent.c @@ -1,34 +1,18 @@ +/* + * 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. + */ + /* * Implement dirent-style opendir(), readdir(), closedir(), rewinddir(), * seekdir() and telldir on Windows - Based on mingw-runtime package sources. * AUTHOR: Guido Serassio - * - * 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. - * + */ + +/* * Original file info follow: * * dirent.c diff --git a/lib/encrypt.c b/lib/encrypt.c index c66b1c549d..bee1ea63c4 100644 --- a/lib/encrypt.c +++ b/lib/encrypt.c @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * 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. + */ /* encrypt.c - providing 56 bit DES encryption * Copyright (C) 1991 Jochen Obalek @@ -17,6 +23,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" + #include #include #include diff --git a/lib/getfullhostname.c b/lib/getfullhostname.c index 0c3a7ee6db..9c575400ab 100644 --- a/lib/getfullhostname.c +++ b/lib/getfullhostname.c @@ -1,34 +1,11 @@ /* - * DEBUG: - * 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. */ + #include "squid.h" #include "getfullhostname.h" diff --git a/lib/getopt.c b/lib/getopt.c index 6249719459..4cd6bad32c 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * 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. + */ /* * Copyright (c) 1987, 1993, 1994 @@ -29,6 +35,8 @@ * SUCH DAMAGE. */ +#include "squid.h" + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ diff --git a/lib/hash.cc b/lib/hash.cc index d764bdfc82..af10dde639 100644 --- a/lib/hash.cc +++ b/lib/hash.cc @@ -1,36 +1,13 @@ - /* - * DEBUG: section 00 Hash Tables - * 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. */ +/* DEBUG: section 00 Hash Tables */ + #include "squid.h" #include "hash.h" #include "profiler/Profiler.h" diff --git a/lib/heap.c b/lib/heap.c index c2681ff7b3..8e6a21ee11 100644 --- a/lib/heap.c +++ b/lib/heap.c @@ -1,33 +1,13 @@ +/* + * 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 - * - * 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. - * */ /**************************************************************************** diff --git a/lib/html_quote.c b/lib/html_quote.c index 17b5f5adda..cab09acbec 100644 --- a/lib/html_quote.c +++ b/lib/html_quote.c @@ -1,33 +1,9 @@ /* - * DEBUG: - * 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. - * - * 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. */ #include "squid.h" diff --git a/lib/iso3307.c b/lib/iso3307.c index 00be05fa33..d423470618 100644 --- a/lib/iso3307.c +++ b/lib/iso3307.c @@ -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. + */ + #include "squid.h" #include "util.h" diff --git a/lib/md5-test.c b/lib/md5-test.c index 23b1f25e7b..20155170a2 100644 --- a/lib/md5-test.c +++ b/lib/md5-test.c @@ -1,11 +1,13 @@ /* - * COMPILE WITH: - * gcc -Wall md5-test.c -I../include md5.o + * 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. */ #include "squid.h" #include "md5.h" -//#include "stdio.h" // ??? static void MDPrint(unsigned char digest[16]); static void MDString(char *string); diff --git a/lib/md5.c b/lib/md5.c index c89e042571..44365a3f1a 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -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. + */ + /* * This code implements the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was diff --git a/lib/radix.c b/lib/radix.c index 0ad361c882..df521fd309 100644 --- a/lib/radix.c +++ b/lib/radix.c @@ -1,33 +1,9 @@ /* - * DEBUG: section 53 Radix Tree data structure implementation - * AUTHOR: NetBSD 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. */ /* @@ -61,6 +37,10 @@ * @(#)radix.c 8.4 (Berkeley) 11/2/94 */ +/* + * DEBUG: section 53 Radix Tree data structure implementation + */ + #include "squid.h" #include "radix.h" #include "util.h" diff --git a/lib/rfc1035.c b/lib/rfc1035.c index 4a22436a7e..21f580df34 100644 --- a/lib/rfc1035.c +++ b/lib/rfc1035.c @@ -1,36 +1,14 @@ /* - * Low level DNS protocol routines - * 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. */ /* + * Low level DNS protocol routines + * * KNOWN BUGS: * * UDP replies with TC set should be retried via TCP diff --git a/lib/rfc1123.c b/lib/rfc1123.c index f54f6eec7d..4e55701001 100644 --- a/lib/rfc1123.c +++ b/lib/rfc1123.c @@ -1,33 +1,9 @@ /* - * DEBUG: - * 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. */ #include "squid.h" diff --git a/lib/rfc1738.c b/lib/rfc1738.c index 03d90a5d60..7540d74be8 100644 --- a/lib/rfc1738.c +++ b/lib/rfc1738.c @@ -1,33 +1,9 @@ /* - * DEBUG: - * 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. */ #include "squid.h" diff --git a/lib/rfc2617.c b/lib/rfc2617.c index c586c23430..44cdf90286 100644 --- a/lib/rfc2617.c +++ b/lib/rfc2617.c @@ -1,8 +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. + */ + /* 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. * - * The following copyright and licence statement covers all changes made to the + * The Squid copyright and licence statement covers all changes made to the * reference implementation. * * Key changes were: alteration to a plain C layout. @@ -11,38 +19,6 @@ * to prevent squid knowing the users password (idea suggested in RFC 2617). */ -/* - * 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. - * - */ - #include "squid.h" #include #include "md5.h" diff --git a/lib/rfc2671.c b/lib/rfc2671.c index 06af87b4b7..d9d31208b0 100644 --- a/lib/rfc2671.c +++ b/lib/rfc2671.c @@ -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. + */ + #include "squid.h" #include "rfc1035.h" #include "rfc2671.h" diff --git a/lib/rfc3596.c b/lib/rfc3596.c index c80673b451..8fd6460d87 100644 --- a/lib/rfc3596.c +++ b/lib/rfc3596.c @@ -1,56 +1,9 @@ /* - * Low level DNS protocol routines - * 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. - * - */ - -/* - * KNOWN BUGS: - * - * UDP replies with TC set should be retried via TCP - */ - -/** - * April 2007 - * - * Provides RFC3596 functions to handle purely IPv6 DNS. - * Adds AAAA and IPv6 PTR records. - * Other IPv6 records are not mentioned by this RFC. - * - * IPv4 equivalents are taken care of by the RFC1035 library. - * Where one protocol lookup must be followed by another, the caller - * is resposible for the order and handling of the lookups. + * 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. */ #include "squid.h" @@ -80,6 +33,22 @@ #error RFC3596 Library depends on RFC1035 #endif +/* + * Low level DNS protocol routines + * + * Provides RFC3596 functions to handle purely IPv6 DNS. + * Adds AAAA and IPv6 PTR records. + * Other IPv6 records are not mentioned by this RFC. + * + * IPv4 equivalents are taken care of by the RFC1035 library. + * Where one protocol lookup must be followed by another, the caller + * is resposible for the order and handling of the lookups. + * + * KNOWN BUGS: + * + * UDP replies with TC set should be retried via TCP + */ + /** * Builds a message buffer with a QUESTION to lookup records * for a hostname. Caller must allocate 'buf' which should diff --git a/lib/sspwin32.cc b/lib/sspwin32.cc index ee857b688a..46e4bb1349 100644 --- a/lib/sspwin32.cc +++ b/lib/sspwin32.cc @@ -1,34 +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. + */ /* * AUTHOR: Guido Serassio - * inspired by previous work by Robert Collins, Francesco Chemolli. - * - * 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. - * + * Inspired by previous work by Robert Collins, Francesco Chemolli. */ #include "squid.h" diff --git a/lib/stub_memaccount.c b/lib/stub_memaccount.c index 1f9390c144..b3491d2d68 100644 --- a/lib/stub_memaccount.c +++ b/lib/stub_memaccount.c @@ -1,6 +1,15 @@ +/* + * 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. + */ + /* Stub function for programs not implementing statMemoryAccounted */ #include "squid.h" #include "util.h" + int statMemoryAccounted(void) { diff --git a/lib/tests/testMain.cc b/lib/tests/testMain.cc index 08626df9a2..590f7b8304 100644 --- a/lib/tests/testMain.cc +++ b/lib/tests/testMain.cc @@ -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. + */ + #include "squid.h" #include diff --git a/lib/tests/testRFC1035.cc b/lib/tests/testRFC1035.cc index e7a2fd8210..1fed7a3099 100644 --- a/lib/tests/testRFC1035.cc +++ b/lib/tests/testRFC1035.cc @@ -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. + */ + #include "squid.h" #include "testRFC1035.h" diff --git a/lib/tests/testRFC1035.h b/lib/tests/testRFC1035.h index e67ea08572..d6d895be53 100644 --- a/lib/tests/testRFC1035.h +++ b/lib/tests/testRFC1035.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_SRC_TEST_RFC1035_H #define SQUID_SRC_TEST_RFC1035_H diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc index 426aa992ed..0013246207 100644 --- a/lib/tests/testRFC1738.cc +++ b/lib/tests/testRFC1738.cc @@ -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. + */ + #include "squid.h" #include "testRFC1738.h" diff --git a/lib/tests/testRFC1738.h b/lib/tests/testRFC1738.h index 3099029ac9..3138167ccd 100644 --- a/lib/tests/testRFC1738.h +++ b/lib/tests/testRFC1738.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_LIB_TEST_RFC1738_H #define SQUID_LIB_TEST_RFC1738_H diff --git a/lib/util.c b/lib/util.c index febabe5620..8ee7bd8879 100644 --- a/lib/util.c +++ b/lib/util.c @@ -1,33 +1,9 @@ /* - * DEBUG: - * 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. */ #define _etext etext diff --git a/lib/uudecode.c b/lib/uudecode.c index af84a8e939..f5c6f4691f 100644 --- a/lib/uudecode.c +++ b/lib/uudecode.c @@ -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. + */ + #include "squid.h" #include "uudecode.h" diff --git a/lib/xusleep.c b/lib/xusleep.c index d383f57375..1cf17a37b7 100644 --- a/lib/xusleep.c +++ b/lib/xusleep.c @@ -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. + */ + #include "squid.h" #include "xusleep.h"