Bug 501898 – [PATCH] net-proxy/squid-3.4.3: fix automagic, make esi optional

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Nikoli 2014-02-20 14:29:27 UTC]

Created attachment 370882 [details, diff]
patch for ebuild

Now net-proxy/squid-3.4.3 ebuild has automagic, /usr/sbin/squid links to libexpat.so.1 and libxml2.so.2, both libs are used for esi only:

squid-3.4.3 $ ./configure --help
...
  --enable-esi            Enable ESI for accelerators. Benefits from expat or
                          libxml2. Enabling ESI will cause squid reverse
                          proxies to be capable of the Edge Acceleration
                          Specification (www.esi.org).
...

squid-3.4.3 $ grep -R -e expat -e libxml src/*
src/cf.data.pre:COMMENT: libxml2|expat|custom
src/esi/Module.cc:    prLibxml = new ESIParser::Register("libxml2", &ESILibxml2Parser::NewParser);
src/esi/Module.cc:    prExpat = new ESIParser::Register("expat", &ESIExpatParser::NewParser);
src/esi/Esi.cc:        /* waiting for expat to finish the buffer we gave it */
src/esi/Esi.cc:        /* waiting for expat to finish the buffer we gave it */
src/esi/Libxml2Parser.h:// parser.h from libxml2 without errors
src/esi/Libxml2Parser.h:#include <libxml/parser.h>
src/esi/Libxml2Parser.h:#include <libxml/HTMLparser.h>
src/esi/Libxml2Parser.h:#include <libxml/HTMLtree.h>
src/esi/ExpatParser.h:#include <expat.h>
src/esi/Context.h:        int parsing:1; /* libexpat is not reentrant on the same context */

Attached patch fixes automagic and makes esi optional, please commit.

[Comment 1 Eray Aslan 2014-03-11 21:03:25 UTC]

Added to squid-3.4.4.  Thanks for the report.