Skip to content

Commit

Permalink
Remove squidclient (#1514)
Browse files Browse the repository at this point in the history
Since recent commit a4e35bd removed cache_object support, popular
clients like wget and curl can do everything squidclient can, with one
exception: They cannot expand `mgr:foo` macros into
`http://localhost:3128/squid-internal-mgr/foo` URLs. That single feature
is easily emulated and not worth keeping (fairly heavy) squidclient for,
especially since recent Squid security improvements often require
customizing squidclient commands with more and more options (to address
problems tracked in Squid bug 5283).
  • Loading branch information
kinkie authored and squid-anubis committed Oct 23, 2023
1 parent 3238ca5 commit 80cba6d
Show file tree
Hide file tree
Showing 18 changed files with 7 additions and 2,204 deletions.
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3092,7 +3092,6 @@ AC_CONFIG_FILES([
tools/apparmor/Makefile
tools/helper-mux/Makefile
tools/purge/Makefile
tools/squidclient/Makefile
tools/systemd/Makefile
tools/sysvinit/Makefile
])
Expand Down
5 changes: 5 additions & 0 deletions doc/release-notes/release-7.sgml.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ The Squid-@SQUID_RELEASE@ change history can be <url url="https://github.com/squ
<tag>cache_object URI</tag>
<p>Cache manager is no longer accessible by URIs with cache_object scheme.

<tag>cachemgr</tag>
<p>The 'cachemgr' tool is no longer supported and distributed with squid.
A plethora of tools, such as curl, wget, or any web browser,
can be used in its place

<tag>non_peers</tag>
<p>Removed the <em>mgr:non_peers</em> report. Squid still ignores
unexpected ICP responses but no longer remembers the details that comprised
Expand Down
2 changes: 1 addition & 1 deletion mksnapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ if (groff --help >/dev/null); then
if [ ! -d ${tmpdir}/doc/manuals ] ; then
mkdir -p ${tmpdir}/doc/manuals
fi
for f in `ls -1 ${tmpdir}/helpers/*/*/*.8 ${tmpdir}/src/*.8 ${tmpdir}/src/*/*.8 ${tmpdir}/tools/squidclient/*.1 ${tmpdir}/tools/*.8 ./helpers/*/*/*.8 2>/dev/null` ; do
for f in `ls -1 ${tmpdir}/helpers/*/*/*.8 ${tmpdir}/src/*.8 ${tmpdir}/src/*/*.8 ${tmpdir}/tools/*.8 ./helpers/*/*/*.8 2>/dev/null` ; do
cp $f ${tmpdir}/doc/manuals/
done
for f in `ls -1 ${tmpdir}/doc/manuals/*.1 ${tmpdir}/doc/manuals/*.8 2>/dev/null` ; do
Expand Down
2 changes: 0 additions & 2 deletions po4a.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,3 @@
[type: man] tools/cachemgr.cgi.8.in $lang:doc/manuals/$lang/cachemgr.cgi.8.in

[type: man] tools/purge/purge.1 $lang:doc/manuals/$lang/purge.1

[type: man] tools/squidclient/squidclient.1 $lang:doc/manuals/$lang/squidclient.1
1 change: 0 additions & 1 deletion src/squid.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ Report ideas for new improvements to the
.
.SH SEE ALSO
.if !'po4a'hide' .B cachemgr.cgi "(8), "
.if !'po4a'hide' .B squidclient "(1), "
.if !'po4a'hide' .B basic_pam_auth "(8), "
.if !'po4a'hide' .B basic_ldap_auth "(8), "
.if !'po4a'hide' .B ext_ldap_group_acl "(8), "
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am
## we need our local files too (but avoid -I. at all costs)
AM_CPPFLAGS += -I$(srcdir)

SUBDIRS= apparmor helper-mux purge squidclient systemd sysvinit
SUBDIRS= apparmor helper-mux purge systemd sysvinit
EXTRA_DIST=
man_MANS=
DISTCLEANFILES=
Expand Down
1 change: 0 additions & 1 deletion tools/cachemgr.cgi.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,3 @@ Report ideas for new improvements to the
.
.SH SEE ALSO
.if !'po4a'hide' .BR squid "(8), "
.if !'po4a'hide' .BR squidclient "(1)"
1 change: 0 additions & 1 deletion tools/purge/purge.1
Original file line number Diff line number Diff line change
Expand Up @@ -285,5 +285,4 @@ Report ideas for new improvements to the
.
.SH SEE ALSO
.if !'po4a'hide' .BR squid "(8), "
.if !'po4a'hide' .BR squidclient "(1)"
.if !'po4a'hide' .BR cachemgr.cgi "(8)"
68 changes: 0 additions & 68 deletions tools/squidclient/Makefile.am

This file was deleted.

38 changes: 0 additions & 38 deletions tools/squidclient/Parameters.h

This file was deleted.

217 changes: 0 additions & 217 deletions tools/squidclient/Ping.cc

This file was deleted.

Loading

0 comments on commit 80cba6d

Please sign in to comment.