diff -u -r -N squid-3.4.12/ChangeLog squid-3.4.13/ChangeLog --- squid-3.4.12/ChangeLog 2015-02-18 03:05:44.000000000 -0800 +++ squid-3.4.13/ChangeLog 2015-05-01 03:05:19.000000000 -0700 @@ -1,3 +1,9 @@ +Changes to squid-3.4.13 (01 May 2015): + + - Bug 4212: ssl_crtd crashes with corrupt database + - ... and some documentation updates + - ... and all fixes from squid 3.3.14 + Changes to squid-3.4.12 (18 Feb 2015): - Bug 4066: Digest auth nonce indefinite rollover @@ -216,6 +222,12 @@ - ... and many documentation changes - ... and much code cleanup and polishing +Changes to squid-3.3.14 (01 May 2015): + + - Bug 4093: source-maintenance.sh errors and warnings due to wrong tools/options + - ... and some documentation updates + - ... and all fixes from squid 3.2.14 + Changes to squid-3.3.13 (28 Aug 2014): - Fix segmentation fault setting up server SSL connnection @@ -401,6 +413,12 @@ - ... and many compile error fixes - ... and a very large amount of code polish for faster compilation +Changes to squid-3.2.14 (01 May 2015): + + - Fix 'access_log none' to prevent following logs being used + - Fix X509 server certificate domain matching + - ... some documentation updates + Changes to squid-3.2.13 (13 Jul 2013): - Bug 3869: assertion failed: MemBuf.cc:272: size < capacity diff -u -r -N squid-3.4.12/compat/Makefile.in squid-3.4.13/compat/Makefile.in --- squid-3.4.12/compat/Makefile.in 2015-02-18 03:06:43.000000000 -0800 +++ squid-3.4.13/compat/Makefile.in 2015-05-01 03:06:22.000000000 -0700 @@ -83,9 +83,9 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(top_srcdir)/src/Common.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am inet_ntop.c getnameinfo.c drand48.c \ - psignal.c strerror.c inet_pton.c tempnam.c strtoll.c \ - initgroups.c getaddrinfo.c $(top_srcdir)/cfgaux/depcomp \ + $(srcdir)/Makefile.am inet_pton.c strerror.c psignal.c \ + inet_ntop.c getnameinfo.c tempnam.c getaddrinfo.c initgroups.c \ + strtoll.c drand48.c $(top_srcdir)/cfgaux/depcomp \ $(top_srcdir)/cfgaux/test-driver check_PROGRAMS = testPreCompiler$(EXEEXT) TESTS = testPreCompiler$(EXEEXT) testHeaders diff -u -r -N squid-3.4.12/configure squid-3.4.13/configure --- squid-3.4.12/configure 2015-02-18 03:07:32.000000000 -0800 +++ squid-3.4.13/configure 2015-05-01 03:07:10.000000000 -0700 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.4.12. +# Generated by GNU Autoconf 2.69 for Squid Web Proxy 3.4.13. # # Report bugs to . # @@ -595,8 +595,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.4.12' -PACKAGE_STRING='Squid Web Proxy 3.4.12' +PACKAGE_VERSION='3.4.13' +PACKAGE_STRING='Squid Web Proxy 3.4.13' PACKAGE_BUGREPORT='http://bugs.squid-cache.org/' PACKAGE_URL='' @@ -1605,7 +1605,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 3.4.12 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.4.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1675,7 +1675,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.4.12:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.4.13:";; esac cat <<\_ACEOF @@ -2071,7 +2071,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.4.12 +Squid Web Proxy configure 3.4.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3175,7 +3175,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 3.4.12, which was +It was created by Squid Web Proxy $as_me 3.4.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4042,7 +4042,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.4.12' + VERSION='3.4.13' cat >>confdefs.h <<_ACEOF @@ -34378,7 +34378,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 3.4.12, which was +This file was extended by Squid Web Proxy $as_me 3.4.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34444,7 +34444,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Squid Web Proxy config.status 3.4.12 +Squid Web Proxy config.status 3.4.13 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -u -r -N squid-3.4.12/configure.ac squid-3.4.13/configure.ac --- squid-3.4.12/configure.ac 2015-02-18 03:07:32.000000000 -0800 +++ squid-3.4.13/configure.ac 2015-05-01 03:07:10.000000000 -0700 @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.4.12],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.4.13],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff -u -r -N squid-3.4.12/CONTRIBUTORS squid-3.4.13/CONTRIBUTORS --- squid-3.4.12/CONTRIBUTORS 2015-02-18 03:05:44.000000000 -0800 +++ squid-3.4.13/CONTRIBUTORS 2015-05-01 03:05:19.000000000 -0700 @@ -1,62 +1,93 @@ Special thanks go to people who have volunteered their time, effort, and ideas to make this software available. - 'noloader' Adam Ciarcinski Adrian Chadd + Aecio F. Alan Mizrahi - Alex Rousskov + Alan Nastac + Aleksa + Aleksa ??u??uli?? Alexander B. Demenshin Alexander Komyagin + Alexander Lukyanov Alexander Lukyanov Alexandre Chappaz + Alexandre SIMON Alexey Veselovsky Alexis Robert + Alex Rousskov + Alex Rousskov Alin Nastac Alter Amos Jeffries Amos Jeffries + Amos Anatoli Andrea Gagliardi Andreas Jaeger Andreas Lamprecht Andres Kroonmaa + Andrew Balabohin Andrew Beverley + Andrew Evdokimov Andrew Hoying Andrey Shorin + Anonymous Pootle User Anonymous Ansgar Hockmann Anthony Baxter Arjan de Vet Arkin + Arthur + Arthur Arthur Tumanyan Assar Westerlund Automatic source maintenance Axel Westerhold + Barry Dobyns Benjamin Kerensa + Benno Rice Benno Rice + Bernard Bertrand Jacquin Bojan Smojver Brad Smith - Brian + Bratislav Brian Degenhardt Brian Denehy + Brian Bruce Murphy Carson Gaspar (carson@lehman.com, carson@cs.columbia.edu) + Cephas + Chad E. Naugle + Chad Naugle Changming + Chao Chris Hills + Christian Wittmer + Christophe Saout + Christos Tsantilas Christos Tsantilas Cloyce + Clytie Siddall + Colin Coe Constantin Rack Cord Beermann Daniel Beschorner Daniel O'Callaghan + Daniel Walter + Dan Searle + David Hill David Isaacs David Luyer + David Parks + Declan White Dennis Glatting - Dhaval Varia + Dhaval Varia Diego Woitasen - Dmitry Kurochkin + D Kazarov + Dmitry Kurochkin Don Hopkins Doug Dixon Doug Urner @@ -64,6 +95,7 @@ Duane Wessels Dustin J. Mitchell Ed Knowles + Edward Chernenko Edward Moy Eliezer Croitoru Elmar Vonlanthen @@ -73,59 +105,92 @@ Eric Stern Eugene Gladchenko Evan Jones + Evgeni Eygene Ryabinkin + Fabian Hugelshofer + fancyrabbit Felix Meschberger + Feshchuk Yuriy Finn Thain Flavio Pescuma + Florent + folkert Francesco Chemolli + Francesco Francesco Salvestrini Francis Daly Francois Cami Frank Balluffi Frank Schmirler Frederic Bourgeois + Fred + F Wolff + Fyodor Geoff Keating George Michaelson Georgy Salnikov Gerben Wierda + Gergely Gilles Espinasse + gkeeling Glen Gibb Glenn Chisholm Golub Mikhail Gonzalo Arana Graham Keeling + Guido Serassio Guido Serassio + Gustavo Zacarias + Guy Helmer + Hank Hampel Hasso Tepper - Henrik Nordstr?m + helix84 Henrik Nordstrom Henrik Nordstrom Hide Nagaoka + HONDA Hirofumi Ian Castle Ian Turner Igor Vinokurov + IIDA Yosiaki + isaac Isnard - JPP + Ivan Mas??r Jakob Bohm Jakub Wilk + James Bowe James Brotchie James R Grinter + Jan Klemkow Jan Niehusmann Jan Sievers Jean-Francois Micouleau Jean-Gabriel Dick Jean-Philippe Menil + Jens-S. V?ckler Jerry Murdock + Jiri Skala + Jiri Skala Joachim Bauch Joao Alves Neto Jochen Voss + Joe Crayne Joe Ramey + Joerg Lehrke + Johnathan Conley John Dilley John Saunders John Xue - Johnathan Conley - Jon Thackray Jonathan Larmour + Jonathan Wolfe + Jon Thackray + Jorge Ivan Burgos Aguilar + Jose-Marcio Martins da Cruz Joshua Root + JPP + Juan + Julien Pinon + Karl Benoit Kieran Whitbread Klaubert Herr Klaus Singvogel @@ -134,91 +199,131 @@ Lab10 Laszlo Attilla Toth Leeann Bent + Leonid Evdokimov + libit Luigi Gangitano + Luis Daniel Lucio Quiroz + Lukas B??gelei Luke Howard Lutz Donnerhacke Manu Garg + Marcello Romani + Marcin Wisnicki + Marco Beck + Marcus Kool Marin Stavrev Marios Makassikis Mark Bergsma Mark Nottingham - Mark Treacy Marko + Mark Treacy Markus Gyger Markus Moeller + Markus Moeller (markus_moeller at compuserve.com) Markus Rietzler Markus Stumpf Martin Hamilton + Martin Huter Martin Huter Martin Stolle Masashi Fujita Massimo Zito + Mathias Fischer Matthew Morgan Matthias Pitzl + Matthias "Silamael" Max Okumoto Michael Lupp Michael Mansour Michael O'Reilly Michael Pelletier Michael van Elst + Michael Weiser Michal Luscon Miguel A.L. Paraz Mike Groeneweg + Mike Mitchell Mike Mitchell Mikio Kishi + Milen Pankov Ming Fu Miquel van Smoorenburg Moez Mahfoudh + Mohsen Saeedi + Mrcus Kool Mukaigawa Shin'ichi Nathan Hoad Neil Murray + nglnx - Rosetta Project Niall Doherty Nick Rogers Nikolai Gorchilov + 'noloader' + Ole Christensen + Oliver Dumschat + Olivier W. + OpenSolaris Project Oskar Pearson Paul Z + Pavel Timofeev Pawel Worach Pedro Lineu Orso Pedro Ribeiro Pete Bentley Peter Hidas + Peter Payne Peter Pramberger Philip Allison Philippe Lantin + Phil Oester Pierangelo Masarati - Pierre-Louis Brenac + Pierre LALET + Pierre-Louis BRENAC Priyanka Gupta Przemek Czerkas + Rafael Martinez Rafael Martinez Torres Rafal Ramocki Rajiv Desai Ralf Wildenhues Ralph Loader Regardt van de Vyver + Reinhard Posmyk Reinhard Sojka Rene Geile + Ren? Geile Reuben Farrelly Richard Huveneers Richard Wall Robert Collins + Robert Robert Forster - Rodrigo Campos + Robert Walsh + Rodrigo Campos (rodrigo@geekbunker.org) Ron Gomes + R Phillips Russell Street Russell Vincent Ryan Troll + Santiago Garcia Mantinan + Scott James Remnant Scott Schram + Sean Critica + Sebastian Krahmer Sebastien Wenske + Sergey Merzlikin Sergio Rabellino Shigechika Aikawa Silamael Stefan Fritsch Stefano Cordibella Stephen R. van den Berg + Stephen Thorne Steve Bennett Steve Hill - Steve Snyder + Steven Lawrance Steven Wilton + Steve Snyder Stewart Forster Stuart Henderson Susant Sahani @@ -227,25 +332,37 @@ Taketo Kabe Thomas De Schampheleire Thomas Hozza + Thomas-Martin Seck Thomas Ristic Thomas Weber - Thomas-Martin Seck Tianyin Xu + Tilmann Bubeck + Tim Brown + Timo Teras Tim Starling Tomas Hozza Tony Lorimer - Unknown - NetBSD Project + Tsantilas Christos + Unknown Unknown FreeBSD Contributor + Unknown - NetBSD Project + Various + Various Translators + Victor Jose Hernandez Gomez Vincent Regnard + Vitaliy Matytsyn (main) Vitaliy Matytsyn + vollkommen + Walter + Wang DaQing + Warren Baker Wesha Will Roberts + Wojciech Zatorski Wojtek Sylwestrzak Wolfgang Breyha Wolfgang Nothdurft + Xavier Redon + yabuki + Yannick Bergeron Zhanpeng Chen - benno@jeamland.net - fancyrabbit - folkert - libit - vollkommen diff -u -r -N squid-3.4.12/helpers/basic_auth/DB/basic_db_auth.8 squid-3.4.13/helpers/basic_auth/DB/basic_db_auth.8 --- squid-3.4.12/helpers/basic_auth/DB/basic_db_auth.8 2015-02-18 03:43:16.000000000 -0800 +++ squid-3.4.13/helpers/basic_auth/DB/basic_db_auth.8 2015-05-01 03:51:54.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 1" -.TH BASIC_DB_AUTH 1 "2015-02-18" "perl v5.20.1" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 1 "2015-05-01" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -u -r -N squid-3.4.12/helpers/external_acl/SQL_session/ext_sql_session_acl.8 squid-3.4.13/helpers/external_acl/SQL_session/ext_sql_session_acl.8 --- squid-3.4.12/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2015-02-18 03:43:38.000000000 -0800 +++ squid-3.4.13/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2015-05-01 03:52:18.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_SQL_SESSION_ACL 1" -.TH EXT_SQL_SESSION_ACL 1 "2015-02-18" "perl v5.20.1" "User Contributed Perl Documentation" +.TH EXT_SQL_SESSION_ACL 1 "2015-05-01" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -u -r -N squid-3.4.12/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.4.13/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 --- squid-3.4.12/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2015-02-18 03:43:41.000000000 -0800 +++ squid-3.4.13/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2015-05-01 03:52:21.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1" -.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2015-02-18" "perl v5.20.1" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2015-05-01" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -u -r -N squid-3.4.12/helpers/log_daemon/DB/log_db_daemon.8 squid-3.4.13/helpers/log_daemon/DB/log_db_daemon.8 --- squid-3.4.12/helpers/log_daemon/DB/log_db_daemon.8 2015-02-18 03:43:43.000000000 -0800 +++ squid-3.4.13/helpers/log_daemon/DB/log_db_daemon.8 2015-05-01 03:52:23.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "LOG_DB_DAEMON 1" -.TH LOG_DB_DAEMON 1 "2015-02-18" "perl v5.20.1" "User Contributed Perl Documentation" +.TH LOG_DB_DAEMON 1 "2015-05-01" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -u -r -N squid-3.4.12/helpers/storeid_rewrite/file/storeid_file_rewrite.8 squid-3.4.13/helpers/storeid_rewrite/file/storeid_file_rewrite.8 --- squid-3.4.12/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2015-02-18 03:43:55.000000000 -0800 +++ squid-3.4.13/helpers/storeid_rewrite/file/storeid_file_rewrite.8 2015-05-01 03:52:35.000000000 -0700 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "STOREID_FILE_REWRITE 1" -.TH STOREID_FILE_REWRITE 1 "2015-02-18" "perl v5.20.1" "User Contributed Perl Documentation" +.TH STOREID_FILE_REWRITE 1 "2015-05-01" "perl v5.20.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -u -r -N squid-3.4.12/include/version.h squid-3.4.13/include/version.h --- squid-3.4.12/include/version.h 2015-02-18 03:07:32.000000000 -0800 +++ squid-3.4.13/include/version.h 2015-05-01 03:07:11.000000000 -0700 @@ -7,7 +7,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1424257536 +#define SQUID_RELEASE_TIME 1430474712 #endif #ifndef APP_SHORTNAME diff -u -r -N squid-3.4.12/RELEASENOTES.html squid-3.4.13/RELEASENOTES.html --- squid-3.4.12/RELEASENOTES.html 2015-02-18 03:44:52.000000000 -0800 +++ squid-3.4.13/RELEASENOTES.html 2015-05-01 03:53:35.000000000 -0700 @@ -2,10 +2,10 @@ - Squid 3.4.12 release notes + Squid 3.4.13 release notes -

Squid 3.4.12 release notes

+

Squid 3.4.13 release notes

Squid Developers

@@ -57,7 +57,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.4.12.

+

The Squid Team are pleased to announce the release of Squid-3.4.13.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.4/ or the mirrors.

diff -u -r -N squid-3.4.12/src/log/access_log.cc squid-3.4.13/src/log/access_log.cc --- squid-3.4.12/src/log/access_log.cc 2015-02-18 03:05:44.000000000 -0800 +++ squid-3.4.13/src/log/access_log.cc 2015-05-01 03:05:19.000000000 -0700 @@ -118,6 +118,10 @@ if (log->aclList && checklist && checklist->fastCheck(log->aclList) != ACCESS_ALLOWED) continue; + // The special-case "none" type has no logfile object set + if (log->type == Log::Format::CLF_NONE) + return; + if (log->logfile) { logfileLineStart(log->logfile); @@ -153,9 +157,6 @@ break; #endif - case Log::Format::CLF_NONE: - return; // abort! - default: fatalf("Unknown log format %d\n", log->type); break; diff -u -r -N squid-3.4.12/src/ssl/certificate_db.cc squid-3.4.13/src/ssl/certificate_db.cc --- squid-3.4.12/src/ssl/certificate_db.cc 2015-02-18 03:05:44.000000000 -0800 +++ squid-3.4.13/src/ssl/certificate_db.cc 2015-05-01 03:05:19.000000000 -0700 @@ -54,8 +54,10 @@ #if _SQUID_WINDOWS_ if (!LockFile(hFile, 0, 0, 1, 0)) -#else +#elif _SQUID_SOLARIS_ if (lockf(fd, F_LOCK, 0) != 0) +#else + if (flock(fd, LOCK_EX) != 0) #endif throw std::runtime_error("Failed to get a lock of " + filename); } @@ -70,7 +72,11 @@ } #else if (fd != -1) { +#if _SQUID_SOLARIS_ lockf(fd, F_ULOCK, 0); +#else + flock(fd, LOCK_UN); +#endif close(fd); fd = -1; } diff -u -r -N squid-3.4.12/src/ssl/support.cc squid-3.4.13/src/ssl/support.cc --- squid-3.4.12/src/ssl/support.cc 2015-02-18 03:05:44.000000000 -0800 +++ squid-3.4.13/src/ssl/support.cc 2015-05-01 03:05:19.000000000 -0700 @@ -209,7 +209,13 @@ if (cn_data->length > (int)sizeof(cn) - 1) { return 1; //if does not fit our buffer just ignore } - memcpy(cn, cn_data->data, cn_data->length); + char *s = reinterpret_cast(cn_data->data); + char *d = cn; + for (int i = 0; i < cn_data->length; ++i, ++d, ++s) { + if (*s == '\0') + return 1; // always a domain mismatch. contains 0x00 + *d = *s; + } cn[cn_data->length] = '\0'; debugs(83, 4, "Verifying server domain " << server << " to certificate name/subjectAltName " << cn); return matchDomainName(server, cn[0] == '*' ? cn + 1 : cn);