diff -ur squid-5.7/acinclude/ax_cxx_0x_types.m4 squid-5.9/acinclude/ax_cxx_0x_types.m4 --- squid-5.7/acinclude/ax_cxx_0x_types.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/ax_cxx_0x_types.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/ax_cxx_compile_stdcxx_11.m4 squid-5.9/acinclude/ax_cxx_compile_stdcxx_11.m4 --- squid-5.7/acinclude/ax_cxx_compile_stdcxx_11.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/ax_cxx_compile_stdcxx_11.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/ax_with_prog.m4 squid-5.9/acinclude/ax_with_prog.m4 --- squid-5.7/acinclude/ax_with_prog.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/ax_with_prog.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/compiler-flags.m4 squid-5.9/acinclude/compiler-flags.m4 --- squid-5.7/acinclude/compiler-flags.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/compiler-flags.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/init.m4 squid-5.9/acinclude/init.m4 --- squid-5.7/acinclude/init.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/init.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/krb5.m4 squid-5.9/acinclude/krb5.m4 --- squid-5.7/acinclude/krb5.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/krb5.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -192,7 +192,7 @@ return 0; } ]])], [ squid_cv_working_gssapi=yes ], [ squid_cv_working_gssapi=no ], [:])]) -if test "x$squid_cv_working_gssapi" = "xno" -a `echo $LIBS | grep -i -c "\-L"` -gt 0; then +if test "x$squid_cv_working_gssapi" = "xno" -a `echo $LIBS | grep -i -c "(-)L"` -gt 0; then AC_MSG_NOTICE([Check Runtime library path !]) fi ]) @@ -284,7 +284,7 @@ return 0; } ]])], [ squid_cv_working_krb5=yes ], [ squid_cv_working_krb5=no ],[:])]) -if test "x$squid_cv_working_krb5" = "xno" -a `echo $LIBS | grep -i -c "\-L"` -gt 0; then +if test "x$squid_cv_working_krb5" = "xno" -a `echo $LIBS | grep -i -c "(-)L"` -gt 0; then AC_MSG_NOTICE([Check Runtime library path !]) fi ]) diff -ur squid-5.7/acinclude/lib-checks.m4 squid-5.9/acinclude/lib-checks.m4 --- squid-5.7/acinclude/lib-checks.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/lib-checks.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/os-deps.m4 squid-5.9/acinclude/os-deps.m4 --- squid-5.7/acinclude/os-deps.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/os-deps.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -812,33 +812,6 @@ ) ]) -dnl check whether recv takes a char* or void* as a second argument -AC_DEFUN([SQUID_CHECK_RECV_ARG_TYPE],[ - AC_CACHE_CHECK([whether recv takes a pointer to void or char as second argument], - squid_cv_recv_second_arg_type, [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_WINSOCK2_H -#include -#elif HAVE_WINSOCK_H -#include -#endif -int main (int argc, char ** argv) { - void *buf; - recv(0,buf,0,0); -} -]])],[squid_cv_recv_second_arg_type=void], - [squid_cv_recv_second_arg_type=char]) - AC_MSG_RESULT($squid_cv_recv_second_arg_type*) - ]) - AC_DEFINE_UNQUOTED(RECV_ARG_TYPE,$squid_cv_recv_second_arg_type, - [Base type of the second argument to recv(2)]) -]) - - dnl check whether Solaris has broken IPFilter headers (Solaris 10 at least does) AC_DEFUN([SQUID_CHECK_BROKEN_SOLARIS_IPFILTER],[ if test "x$squid_cv_broken_ipfilter_minor_t" = "x"; then diff -ur squid-5.7/acinclude/pam.m4 squid-5.9/acinclude/pam.m4 --- squid-5.7/acinclude/pam.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/pam.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/pkg.m4 squid-5.9/acinclude/pkg.m4 --- squid-5.7/acinclude/pkg.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/pkg.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/squid-util.m4 squid-5.9/acinclude/squid-util.m4 --- squid-5.7/acinclude/squid-util.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/squid-util.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/acinclude/tdb.m4 squid-5.9/acinclude/tdb.m4 --- squid-5.7/acinclude/tdb.m4 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/acinclude/tdb.m4 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9: aclocal.m4 diff -ur squid-5.7/bootstrap.sh squid-5.9/bootstrap.sh --- squid-5.7/bootstrap.sh 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/bootstrap.sh 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -50,7 +50,7 @@ done if [ "x$found" = "xNOT_FOUND" ]; then echo "WARNING: Cannot find $tool version $versions" >&2 - echo "Trying `$tool --version | head -1`" >&2 + echo "Trying `$tool --version 2>&1 | head -1`" >&2 found="" fi echo $found @@ -72,7 +72,7 @@ if "$@"; then true # Everything OK else - echo "$1 failed" + echo "$1 failed" >&2 echo "Autotool bootstrapping failed. You will need to investigate and correct" ; echo "before you can develop on this source tree" exit 1 Только в squid-5.9: cfgaux diff -ur squid-5.7/ChangeLog squid-5.9/ChangeLog --- squid-5.7/ChangeLog 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/ChangeLog 2023-05-01 01:29:35.000000000 +0300 @@ -1,3 +1,19 @@ +Changes in squid-5.9 (30 Apr 2023): + + - Improve reply_body_max_size matching accuracy + - ... and some documentation changes + - ... and many portability fixes + +Changes in squid-5.8 (28 Feb 2023): + + - Bug 5162: mgr:index URL do not produce MGR_INDEX template + - Bug 5241: Block all non-localhost requests by default + - Bug 5241: Block to-localhost, to-link-local requests by default + - ext_kerberos_ldap_group_acl: Support -b with -D + - Fix ACL type typo in req_header, rep_header key-changing ERRORs + - ... and several compile fixes + - ... and some code cleanup and polishing + Changes in squid-5.7 (05 Sep 2022): - Regression Fix: Typo in manager ACL diff -ur squid-5.7/compat/assert.cc squid-5.9/compat/assert.cc --- squid-5.7/compat/assert.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/assert.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/assert.h squid-5.9/compat/assert.h --- squid-5.7/compat/assert.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/assert.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/cmsg.h squid-5.9/compat/cmsg.h --- squid-5.7/compat/cmsg.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/cmsg.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/compat.cc squid-5.9/compat/compat.cc --- squid-5.7/compat/compat.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/compat.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. Только в squid-5.7/compat: compat.dox diff -ur squid-5.7/compat/compat.h squid-5.9/compat/compat.h --- squid-5.7/compat/compat.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/compat.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/compat_shared.h squid-5.9/compat/compat_shared.h --- squid-5.7/compat/compat_shared.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/compat_shared.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/cppunit.h squid-5.9/compat/cppunit.h --- squid-5.7/compat/cppunit.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/cppunit.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/cpu.h squid-5.9/compat/cpu.h --- squid-5.7/compat/cpu.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/cpu.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/debug.cc squid-5.9/compat/debug.cc --- squid-5.7/compat/debug.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/debug.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/debug.h squid-5.9/compat/debug.h --- squid-5.7/compat/debug.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/debug.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/eui64_aton.c squid-5.9/compat/eui64_aton.c --- squid-5.7/compat/eui64_aton.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/eui64_aton.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/eui64_aton.h squid-5.9/compat/eui64_aton.h --- squid-5.7/compat/eui64_aton.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/eui64_aton.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/fdsetsize.h squid-5.9/compat/fdsetsize.h --- squid-5.7/compat/fdsetsize.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/fdsetsize.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/getaddrinfo.cc squid-5.9/compat/getaddrinfo.cc --- squid-5.7/compat/getaddrinfo.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/getaddrinfo.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/getaddrinfo.h squid-5.9/compat/getaddrinfo.h --- squid-5.7/compat/getaddrinfo.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/getaddrinfo.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/getnameinfo.cc squid-5.9/compat/getnameinfo.cc --- squid-5.7/compat/getnameinfo.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/getnameinfo.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/getnameinfo.h squid-5.9/compat/getnameinfo.h --- squid-5.7/compat/getnameinfo.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/getnameinfo.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/GnuRegex.c squid-5.9/compat/GnuRegex.c --- squid-5.7/compat/GnuRegex.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/GnuRegex.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -2297,14 +2297,8 @@ * the pattern buffer. * * Returns 0 if we succeed, -2 if an internal error. */ -#ifdef STDC_HEADERS int re_compile_fastmap(struct re_pattern_buffer *bufp) -#else -int -re_compile_fastmap(bufp) -struct re_pattern_buffer *bufp; -#endif { int j, k; fail_stack_type fail_stack; @@ -2531,11 +2525,7 @@ * doesn't let you say where to stop matching. */ static int -re_search(bufp, string, size, startpos, range, regs) -struct re_pattern_buffer *bufp; -const char *string; -int size, startpos, range; -struct re_registers *regs; +re_search(struct re_pattern_buffer *bufp, const char *string, int size, int startpos, int range, struct re_registers *regs) { return re_search_2(bufp, NULL, 0, string, size, startpos, range, regs, size); @@ -2563,14 +2553,7 @@ * stack overflow). */ static int -re_search_2(bufp, string1, size1, string2, size2, startpos, range, regs, stop) -struct re_pattern_buffer *bufp; -const char *string1, *string2; -int size1, size2; -int startpos; -int range; -struct re_registers *regs; -int stop; +re_search_2(struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int startpos, int range, struct re_registers *regs, int stop) { int val; register char *fastmap = bufp->fastmap; @@ -2821,13 +2804,7 @@ * matched substring. */ int -re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) -struct re_pattern_buffer *bufp; -const char *string1, *string2; -int size1, size2; -int pos; -struct re_registers *regs; -int stop; +re_match_2(struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int pos, struct re_registers *regs, int stop) { /* General temporaries. */ int mcnt; @@ -4124,10 +4101,7 @@ * the return codes and their meanings.) */ int -regcomp(preg, pattern, cflags) -regex_t *preg; -const char *pattern; -int cflags; +regcomp(regex_t *preg, const char *pattern, int cflags) { reg_errcode_t ret; unsigned syntax @@ -4195,12 +4169,7 @@ * We return 0 if we find a match and REG_NOMATCH if not. */ int -regexec(preg, string, nmatch, pmatch, eflags) -const regex_t *preg; -const char *string; -size_t nmatch; -regmatch_t pmatch[]; -int eflags; +regexec(const regex_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags) { int ret; struct re_registers regs; @@ -4287,8 +4256,7 @@ /* Free dynamically allocated space used by PREG. */ void -regfree(preg) -regex_t *preg; +regfree(regex_t * preg) { if (preg->buffer != NULL) free(preg->buffer); diff -ur squid-5.7/compat/GnuRegex.h squid-5.9/compat/GnuRegex.h --- squid-5.7/compat/GnuRegex.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/GnuRegex.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/inet_ntop.cc squid-5.9/compat/inet_ntop.cc --- squid-5.7/compat/inet_ntop.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/inet_ntop.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/inet_ntop.h squid-5.9/compat/inet_ntop.h --- squid-5.7/compat/inet_ntop.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/inet_ntop.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/inet_pton.cc squid-5.9/compat/inet_pton.cc --- squid-5.7/compat/inet_pton.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/inet_pton.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/inet_pton.h squid-5.9/compat/inet_pton.h --- squid-5.7/compat/inet_pton.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/inet_pton.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/initgroups.c squid-5.9/compat/initgroups.c --- squid-5.7/compat/initgroups.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/initgroups.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/initgroups.h squid-5.9/compat/initgroups.h --- squid-5.7/compat/initgroups.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/initgroups.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/Makefile.am squid-5.9/compat/Makefile.am --- squid-5.7/compat/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/compat: Makefile.in diff -ur squid-5.7/compat/memrchr.cc squid-5.9/compat/memrchr.cc --- squid-5.7/compat/memrchr.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/memrchr.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/memrchr.h squid-5.9/compat/memrchr.h --- squid-5.7/compat/memrchr.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/memrchr.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/mswindows.cc squid-5.9/compat/mswindows.cc --- squid-5.7/compat/mswindows.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/mswindows.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/openssl.h squid-5.9/compat/openssl.h --- squid-5.7/compat/openssl.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/openssl.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/aix.h squid-5.9/compat/os/aix.h --- squid-5.7/compat/os/aix.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/aix.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/android.h squid-5.9/compat/os/android.h --- squid-5.7/compat/os/android.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/android.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/dragonfly.h squid-5.9/compat/os/dragonfly.h --- squid-5.7/compat/os/dragonfly.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/dragonfly.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/freebsd.h squid-5.9/compat/os/freebsd.h --- squid-5.7/compat/os/freebsd.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/freebsd.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/hpux.h squid-5.9/compat/os/hpux.h --- squid-5.7/compat/os/hpux.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/hpux.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/linux.h squid-5.9/compat/os/linux.h --- squid-5.7/compat/os/linux.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/linux.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/macosx.h squid-5.9/compat/os/macosx.h --- squid-5.7/compat/os/macosx.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/macosx.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/mswindows.h squid-5.9/compat/os/mswindows.h --- squid-5.7/compat/os/mswindows.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/mswindows.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/netbsd.h squid-5.9/compat/os/netbsd.h --- squid-5.7/compat/os/netbsd.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/netbsd.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/next.h squid-5.9/compat/os/next.h --- squid-5.7/compat/os/next.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/next.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/openbsd.h squid-5.9/compat/os/openbsd.h --- squid-5.7/compat/os/openbsd.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/openbsd.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/opensolaris_10_netdb.h squid-5.9/compat/os/opensolaris_10_netdb.h --- squid-5.7/compat/os/opensolaris_10_netdb.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/opensolaris_10_netdb.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/os2.h squid-5.9/compat/os/os2.h --- squid-5.7/compat/os/os2.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/os2.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/qnx.h squid-5.9/compat/os/qnx.h --- squid-5.7/compat/os/qnx.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/qnx.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/sgi.h squid-5.9/compat/os/sgi.h --- squid-5.7/compat/os/sgi.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/sgi.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/solaris.h squid-5.9/compat/os/solaris.h --- squid-5.7/compat/os/solaris.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/solaris.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/os/sunos.h squid-5.9/compat/os/sunos.h --- squid-5.7/compat/os/sunos.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/os/sunos.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/osdetect.h squid-5.9/compat/osdetect.h --- squid-5.7/compat/osdetect.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/osdetect.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/psignal.c squid-5.9/compat/psignal.c --- squid-5.7/compat/psignal.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/psignal.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/psignal.h squid-5.9/compat/psignal.h --- squid-5.7/compat/psignal.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/psignal.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/shm.cc squid-5.9/compat/shm.cc --- squid-5.7/compat/shm.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/shm.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/shm.h squid-5.9/compat/shm.h --- squid-5.7/compat/shm.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/shm.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/statvfs.cc squid-5.9/compat/statvfs.cc --- squid-5.7/compat/statvfs.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/statvfs.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/statvfs.h squid-5.9/compat/statvfs.h --- squid-5.7/compat/statvfs.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/statvfs.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/stdio.h squid-5.9/compat/stdio.h --- squid-5.7/compat/stdio.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/stdio.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/stdvarargs.h squid-5.9/compat/stdvarargs.h --- squid-5.7/compat/stdvarargs.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/stdvarargs.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strerror.c squid-5.9/compat/strerror.c --- squid-5.7/compat/strerror.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strerror.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strnrchr.c squid-5.9/compat/strnrchr.c --- squid-5.7/compat/strnrchr.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strnrchr.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strnrchr.h squid-5.9/compat/strnrchr.h --- squid-5.7/compat/strnrchr.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strnrchr.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strnstr.cc squid-5.9/compat/strnstr.cc --- squid-5.7/compat/strnstr.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strnstr.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strtoll.c squid-5.9/compat/strtoll.c --- squid-5.7/compat/strtoll.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strtoll.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/strtoll.h squid-5.9/compat/strtoll.h --- squid-5.7/compat/strtoll.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/strtoll.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/tempnam.c squid-5.9/compat/tempnam.c --- squid-5.7/compat/tempnam.c 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/tempnam.c 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/tempnam.h squid-5.9/compat/tempnam.h --- squid-5.7/compat/tempnam.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/tempnam.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/testPreCompiler.cc squid-5.9/compat/testPreCompiler.cc --- squid-5.7/compat/testPreCompiler.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/testPreCompiler.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/testPreCompiler.h squid-5.9/compat/testPreCompiler.h --- squid-5.7/compat/testPreCompiler.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/testPreCompiler.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/types.h squid-5.9/compat/types.h --- squid-5.7/compat/types.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/types.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/valgrind.h squid-5.9/compat/valgrind.h --- squid-5.7/compat/valgrind.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/valgrind.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xalloc.cc squid-5.9/compat/xalloc.cc --- squid-5.7/compat/xalloc.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xalloc.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xalloc.h squid-5.9/compat/xalloc.h --- squid-5.7/compat/xalloc.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xalloc.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xis.h squid-5.9/compat/xis.h --- squid-5.7/compat/xis.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xis.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstrerror.cc squid-5.9/compat/xstrerror.cc --- squid-5.7/compat/xstrerror.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstrerror.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstrerror.h squid-5.9/compat/xstrerror.h --- squid-5.7/compat/xstrerror.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstrerror.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstring.cc squid-5.9/compat/xstring.cc --- squid-5.7/compat/xstring.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstring.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstring.h squid-5.9/compat/xstring.h --- squid-5.7/compat/xstring.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstring.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstrto.cc squid-5.9/compat/xstrto.cc --- squid-5.7/compat/xstrto.cc 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstrto.cc 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/compat/xstrto.h squid-5.9/compat/xstrto.h --- squid-5.7/compat/xstrto.h 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/compat/xstrto.h 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. Только в squid-5.9: configure diff -ur squid-5.7/configure.ac squid-5.9/configure.ac --- squid-5.7/configure.ac 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/configure.ac 2023-05-01 01:36:05.000000000 +0300 @@ -1,11 +1,11 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 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. ## -AC_INIT([Squid Web Proxy],[5.7-VCS],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[5.9],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) @@ -94,7 +94,7 @@ fi # If the user did not specify a C++ version. -user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "\-std="` +user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "(-)std="` if test "x$user_cxx" = "x"; then # Check for C++11 compiler support AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) @@ -1288,7 +1288,8 @@ ## by testing for a 3.4.0+ function which we use AC_CHECK_LIB(gnutls,gnutls_pcert_export_x509,[LIBGNUTLS_LIBS="-lgnutls"]) ]) - AC_CHECK_HEADERS(gnutls/gnutls.h gnutls/x509.h gnutls/abstract.h) + # if any of the required headers is not found, signal we can't support gnutls + AC_CHECK_HEADERS([gnutls/gnutls.h gnutls/x509.h gnutls/abstract.h], [], [LIBGNUTLS_LIBS=""]) SQUID_STATE_ROLLBACK(squid_gnutls_state) #de-pollute LIBS @@ -2820,7 +2821,7 @@ ]) AS_IF([test "x$with_cppunit" != "xno"],[ PKG_CHECK_MODULES([LIBCPPUNIT],[cppunit],[ - squid_cv_cppunit_version="`pkg-config cppunit --version`" + squid_cv_cppunit_version="`pkg-config --modversion cppunit`" AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version]) AS_UNSET(squid_cv_cppunit_version) @@ -3733,7 +3734,6 @@ SQUID_DETECT_TCP_SND_BUFSIZE SQUID_DETECT_TCP_RECV_BUFSIZE -SQUID_CHECK_RECV_ARG_TYPE SQUID_CHECK_NEED_SYS_ERRLIST SQUID_CHECK_MAXPATHLEN diff -ur squid-5.7/contrib/Makefile.am squid-5.9/contrib/Makefile.am --- squid-5.7/contrib/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/contrib/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/contrib: Makefile.in diff -ur squid-5.7/contrib/solaris/solaris-krb5-include.patch squid-5.9/contrib/solaris/solaris-krb5-include.patch --- squid-5.7/contrib/solaris/solaris-krb5-include.patch 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/contrib/solaris/solaris-krb5-include.patch 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff -ur squid-5.7/contrib/url-normalizer.pl squid-5.9/contrib/url-normalizer.pl --- squid-5.7/contrib/url-normalizer.pl 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/contrib/url-normalizer.pl 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -Tw # -# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2023 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff -ur squid-5.7/contrib/user-agents.pl squid-5.9/contrib/user-agents.pl --- squid-5.7/contrib/user-agents.pl 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/contrib/user-agents.pl 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2023 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff -ur squid-5.7/doc/debug-sections.txt squid-5.9/doc/debug-sections.txt --- squid-5.7/doc/debug-sections.txt 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/debug-sections.txt 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. Только в squid-5.7/doc: HTTP-codes.txt diff -ur squid-5.7/doc/Makefile.am squid-5.9/doc/Makefile.am --- squid-5.7/doc/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/doc: Makefile.in Только в squid-5.7/doc/manuals: ar.po Только в squid-5.7/doc/manuals: cs.po Только в squid-5.7/doc/manuals: de.po Только в squid-5.7/doc/manuals: en_AU.po Только в squid-5.7/doc/manuals: en.po Только в squid-5.7/doc/manuals: es.po Только в squid-5.7/doc/manuals: fr.po Только в squid-5.7/doc/manuals: it.po diff -ur squid-5.7/doc/manuals/language.am squid-5.9/doc/manuals/language.am --- squid-5.7/doc/manuals/language.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/manuals/language.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/doc/manuals/Makefile.am squid-5.9/doc/manuals/Makefile.am --- squid-5.7/doc/manuals/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/manuals/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/doc/manuals: Makefile.in Только в squid-5.7/doc/manuals: manuals.pot Только в squid-5.7/doc/manuals: oc.po Только в squid-5.7/doc/manuals: pt.po Только в squid-5.7/doc/manuals: ro.po Только в squid-5.7/doc/manuals: ru.po diff -ur squid-5.7/doc/manuals/Substitute.am squid-5.9/doc/manuals/Substitute.am --- squid-5.7/doc/manuals/Substitute.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/manuals/Substitute.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.7/doc: po4a.cnf Только в squid-5.7/doc: Programming-Guide diff -ur squid-5.7/doc/release-notes/Makefile.am squid-5.9/doc/release-notes/Makefile.am --- squid-5.7/doc/release-notes/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/doc/release-notes/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -19,6 +19,14 @@ # latex $(DOC).tex # +%.sgml: %.sgml.in + sed \ + -e "s%[@]SQUID_VERSION[@]%$(VERSION)%g" \ + -e "s%[@]SQUID_RELEASE[@]%$(SQUID_RELEASE)%g" \ + -e "s%[@]SQUID_RELEASE_OLD[@]%$$(( $(SQUID_RELEASE) - 1 ))%g" \ + < $< >$@ + test `grep -c "@SQUID" $@` -eq 0 + %.txt: %.sgml linuxdoc -B txt --filter $< Только в squid-5.9/doc/release-notes: Makefile.in Только в squid-5.7/doc/release-notes: release-3.0.sgml Только в squid-5.7/doc/release-notes: release-3.1.sgml Только в squid-5.7/doc/release-notes: release-3.2.sgml Только в squid-5.7/doc/release-notes: release-3.3.sgml Только в squid-5.7/doc/release-notes: release-3.4.sgml Только в squid-5.7/doc/release-notes: release-3.5.sgml Только в squid-5.7/doc/release-notes: release-4.sgml Только в squid-5.9/doc/release-notes: release-5.html Только в squid-5.7/doc/release-notes: release-5.sgml Только в squid-5.7/doc: rfc Только в squid-5.9/errors: af Только в squid-5.7/errors: af.po diff -ur squid-5.7/errors/aliases squid-5.9/errors/aliases --- squid-5.7/errors/aliases 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/aliases 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/errors/alias-link.sh squid-5.9/errors/alias-link.sh --- squid-5.7/errors/alias-link.sh 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/alias-link.sh 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/errors/alias-upgrade squid-5.9/errors/alias-upgrade --- squid-5.7/errors/alias-upgrade 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/alias-upgrade 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/errors: ar Только в squid-5.7/errors: ar.po Только в squid-5.9/errors: az Только в squid-5.7/errors: az.po Только в squid-5.9/errors: bg Только в squid-5.7/errors: bg.po Только в squid-5.9/errors: ca Только в squid-5.7/errors: ca.po diff -ur squid-5.7/errors/COPYRIGHT squid-5.9/errors/COPYRIGHT --- squid-5.7/errors/COPYRIGHT 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/COPYRIGHT 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ ============================================================================== - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. Только в squid-5.9/errors: cs Только в squid-5.7/errors: cs.po Только в squid-5.9/errors: da Только в squid-5.7/errors: da.po Только в squid-5.9/errors: de Только в squid-5.7/errors: de.po Только в squid-5.9/errors: el Только в squid-5.7/errors: el.po Только в squid-5.9/errors: en Только в squid-5.7/errors: en.po diff -ur squid-5.7/errors/errorpage.css squid-5.9/errors/errorpage.css --- squid-5.7/errors/errorpage.css 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/errorpage.css 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * Copyright (C) 1996-2023 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. Только в squid-5.7/errors: errpages.pot Только в squid-5.9/errors: es Только в squid-5.9/errors: es-mx Только в squid-5.7/errors: es-mx.po Только в squid-5.7/errors: es.po Только в squid-5.9/errors: et Только в squid-5.7/errors: et.po Только в squid-5.9/errors: fa Только в squid-5.7/errors: fa.po Только в squid-5.9/errors: fi Только в squid-5.7/errors: fi.po Только в squid-5.9/errors: fr Только в squid-5.7/errors: fr.po Только в squid-5.9/errors: he Только в squid-5.7/errors: he.po Только в squid-5.9/errors: hu Только в squid-5.7/errors: hu.po Только в squid-5.9/errors: hy Только в squid-5.7/errors: hy.po Только в squid-5.9/errors: id Только в squid-5.7/errors: id.po Только в squid-5.9/errors: it Только в squid-5.7/errors: it.po Только в squid-5.9/errors: ja Только в squid-5.7/errors: ja.po Только в squid-5.9/errors: ka Только в squid-5.7/errors: ka.po Только в squid-5.9/errors: ko Только в squid-5.7/errors: ko.po diff -ur squid-5.7/errors/language.am squid-5.9/errors/language.am --- squid-5.7/errors/language.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/language.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/errors: lt Только в squid-5.7/errors: lt.po Только в squid-5.9/errors: lv Только в squid-5.7/errors: lv.po diff -ur squid-5.7/errors/Makefile.am squid-5.9/errors/Makefile.am --- squid-5.7/errors/Makefile.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/Makefile.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. Только в squid-5.9/errors: Makefile.in Только в squid-5.9/errors: ms Только в squid-5.7/errors: ms.po Только в squid-5.9/errors: nl Только в squid-5.7/errors: nl.po Только в squid-5.9/errors: oc Только в squid-5.7/errors: oc.po Только в squid-5.9/errors: pl Только в squid-5.7/errors: pl.po Только в squid-5.9/errors: pt Только в squid-5.9/errors: pt-br Только в squid-5.7/errors: pt-br.po Только в squid-5.7/errors: pt.po Только в squid-5.9/errors: ro Только в squid-5.7/errors: ro.po Только в squid-5.9/errors: ru Только в squid-5.7/errors: ru.po Только в squid-5.9/errors: sk Только в squid-5.7/errors: sk.po Только в squid-5.9/errors: sl Только в squid-5.7/errors: sl.po Только в squid-5.9/errors: sr-cyrl Только в squid-5.7/errors: sr-cyrl.po Только в squid-5.9/errors: sr-latn Только в squid-5.7/errors: sr-latn.po Только в squid-5.9/errors: sv Только в squid-5.7/errors: sv.po diff -ur squid-5.7/errors/template.am squid-5.9/errors/template.am --- squid-5.7/errors/template.am 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/template.am 2023-05-01 01:29:35.000000000 +0300 @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2022 The Squid Software Foundation and contributors +## Copyright (C) 1996-2023 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff -ur squid-5.7/errors/templates/ERR_ACCESS_DENIED squid-5.9/errors/templates/ERR_ACCESS_DENIED --- squid-5.7/errors/templates/ERR_ACCESS_DENIED 2022-09-05 07:06:48.000000000 +0300 +++ squid-5.9/errors/templates/ERR_ACCESS_DENIED 2023-05-01 01:29:35.000000000 +0300 @@ -1,6 +1,6 @@ - + ERROR: The requested URL could not be retrieved