Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Moeller committed Jan 14, 2020
2 parents a89e174 + 4740ea4 commit 462af12
Show file tree
Hide file tree
Showing 2,063 changed files with 2,905 additions and 2,595 deletions.
2 changes: 1 addition & 1 deletion INSTALL
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion QUICKSTART
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ typically have to modify something in a /etc/rc_something).
==============================================================================

/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SQUID Web Proxy Cache http://www.squid-cache.org/
------------------------------------------------------------------------

Copyright (C) 1996-2019 The Squid Software Foundation and contributors
Copyright (C) 1996-2020 The Squid Software Foundation and contributors

Squid software is distributed under GPLv2+ license and includes
contributions from numerous individuals and organizations.
Expand Down
5 changes: 5 additions & 0 deletions SPONSORS.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ Bloomberg L.P.
Bloomberg L.P. has funded development work towards stabilizing
Squid-4.

DigialOcean - https://www.digitalocean.com/

DigitalOcean has donated droplets from their cloud infrastructure
to host some of the project's continuous integration farm

LaunchPad - http://launchpad.net/

Provide Bazaar mirroring services and host the Squid-3+ developer
Expand Down
2 changes: 1 addition & 1 deletion acinclude/ax_cxx_0x_types.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/ax_cxx_compile_stdcxx_11.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/ax_with_prog.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/compiler-flags.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/init.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/krb5.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/lib-checks.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/os-deps.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/pam.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/pkg.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/squid-util.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion acinclude/tdb.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/GnuRegex.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/GnuRegex.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 1996-2019 The Squid Software Foundation and contributors
## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/assert.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
6 changes: 4 additions & 2 deletions compat/assert.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand All @@ -9,7 +9,9 @@
#ifndef SQUID_ASSERT_H
#define SQUID_ASSERT_H

#if defined(NODEBUG)
#if PURIFY
#define assert(EX) ((void)0)
#elif defined(NODEBUG)
#define assert(EX) ((void)0)
#elif STDC_HEADERS
#define assert(EX) ((EX)?((void)0):xassert( # EX , __FILE__, __LINE__))
Expand Down
2 changes: 1 addition & 1 deletion compat/cmsg.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/compat.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/compat.dox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/compat.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/compat_shared.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/cppunit.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/cpu.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/debug.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/debug.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/eui64_aton.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/eui64_aton.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/fdsetsize.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/getaddrinfo.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/getaddrinfo.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
10 changes: 5 additions & 5 deletions compat/getnameinfo.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down Expand Up @@ -203,12 +203,12 @@ xgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t host
if (sp) {
if (strlen(sp->s_name) + 1 > servlen)
return EAI_OVERFLOW;
strncpy(serv, sp->s_name, servlen);
xstrncpy(serv, sp->s_name, servlen);
} else {
snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
if (strlen(numserv) + 1 > servlen)
return EAI_OVERFLOW;
strncpy(serv, numserv, servlen);
xstrncpy(serv, numserv, servlen);
}
}

Expand Down Expand Up @@ -301,7 +301,7 @@ xgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t host
#endif
return EAI_OVERFLOW;
}
strncpy(host, hp->h_name, hostlen);
xstrncpy(host, hp->h_name, hostlen);
#if USE_GETIPNODEBY
freehostent(hp);
#endif
Expand Down Expand Up @@ -351,7 +351,7 @@ int flags;
numaddrlen = strlen(numaddr);
if (numaddrlen + 1 > hostlen) /* don't forget terminator */
return EAI_OVERFLOW;
strncpy(host, numaddr, hostlen);
xstrncpy(host, numaddr, hostlen);

if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
char zonebuf[SQUIDHOSTNAMELEN];
Expand Down
2 changes: 1 addition & 1 deletion compat/getnameinfo.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/inet_ntop.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/inet_ntop.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/inet_pton.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/inet_pton.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/initgroups.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/initgroups.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/memrchr.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/memrchr.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/mswindows.cc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/openssl.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/os/aix.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
2 changes: 1 addition & 1 deletion compat/os/android.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2019 The Squid Software Foundation and contributors
* Copyright (C) 1996-2020 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
Expand Down
Loading

0 comments on commit 462af12

Please sign in to comment.