Review updates

doc/Programming-Guide/03_MajorComponents.dox

@@ -338,11 +338,4 @@ TODO: get RFCs linked from ietf
 	see (http://squid.nlanr.net/Squid/urn-support.html) URN Support in Squid
 	.
 
-\section ESI ESI
-\par
-	ESI is an implementation of Edge Side Includes (http://www.esi.org).
-	ESI is implemented as a client side stream and a small
-	modification to client_side_reply.c to check whether
-	ESI should be inserted into the reply stream or not.
-
  */

src/HttpHeader.cc

@@ -945,7 +945,7 @@ void
 HttpHeader::addVia(const AnyP::ProtocolVersion &ver, const HttpHeader *from)
 {
     // TODO: do not add Via header for messages where Squid itself
-    // generated the message (i.e., Downloader or ESI) there should be no Via header added at all.
+    // generated the message (i.e., Downloader) there should be no Via header added at all.
 
     if (Config.onoff.via) {
         SBuf buf;

src/XactionInitiator.cc

@@ -22,7 +22,6 @@ XactionInitiator::ParseInitiators(const char *name)
         {"client", initClient},
         {"peer-pool", initPeerPool},
         {"certificate-fetching", initCertFetcher},
-        {"esi", initEsi},
         {"cache-digest", initCacheDigest},
         {"server", initServer},
         {"htcp", initHtcp},

src/XactionInitiator.h

@@ -18,7 +18,6 @@ class XactionInitiator {
         initClient = 1 << 0, ///< HTTP or FTP client
         initPeerPool = 1 << 1, ///< PeerPool manager
         initCertFetcher = 1 << 2, ///< Missing intermediate certificates fetching code
-        initEsi = 1 << 3, ///< ESI processing code
         initCacheDigest = 1 << 4, ///< Cache Digest fetching code
         initHtcp = 1<< 5, ///< HTCP client
         initIcp = 1 << 6, ///< the ICP/neighbors subsystem
@@ -48,7 +47,7 @@ class XactionInitiator {
 
     /// internally generated requests
     static Initiators InternalInitiators() {
-        return initPeerPool | initCertFetcher | initEsi | initCacheDigest | initIcp | initIcmp | initIpc | initAdaptation | initIcon | initPeerMcast;
+        return initPeerPool | initCertFetcher | initCacheDigest | initIcp | initIcmp | initIpc | initAdaptation | initIcon | initPeerMcast;
     }
 
     /// all initiators

src/cf.data.pre

@@ -1499,7 +1499,6 @@ ENDIF
 	  # Matches transaction's initiator [fast]
 	  #
 	  # Supported initiators are:
-	  #  esi: matches transactions fetching ESI resources
 	  #  certificate-fetching: matches transactions fetching
 	  #     a missing intermediate TLS certificate
 	  #  cache-digest: matches transactions fetching Cache Digests
@@ -4978,7 +4977,7 @@ DOC_START
 			as a forwarding attempt. Pure cache hits log zero, but cache hits
 			that triggered HTTP cache revalidation log the number of attempts
 			made when sending an internal revalidation request. DNS, ICMP,
-			ICP, HTCP, ESI, ICAP, eCAP, helper, and other secondary requests
+			ICP, HTCP, ICAP, eCAP, helper, and other secondary requests
 			sent by Squid as a part of a master transaction do not increment
 			the counter logged for the received request.
 
@@ -6739,9 +6738,6 @@ DOC_START
 	In reverse proxy environments it might be desirable to honor
 	shorter object lifetimes. It is most likely better to make
 	your server return a meaningful Last-Modified header however.
-
-	In ESI environments where page fragments often have short
-	lifetimes, this will often be best set to 0.
 DOC_END
 
 NAME: store_avg_object_size

src/client_side_request.cc

@@ -924,9 +924,7 @@ clientCheckPinning(ClientHttpRequest * http)
     HttpHeader *req_hdr = &request->header;
     ConnStateData *http_conn = http->getConn();
 
-    /* Internal requests such as those from ESI includes may be without
-     * a client connection
-     */
+    // Internal requests may be without a client connection
     if (!http_conn)
         return;
 

src/http/RegisteredHeaders.h

@@ -109,8 +109,8 @@ enum HdrType {
     X_SQUID_ERROR,                  /**< Squid custom header on generated error responses */
     HDR_X_ACCELERATOR_VARY,             /**< obsolete Squid custom header. */
     X_NEXT_SERVICES,                /**< Squid custom ICAP header */
-    SURROGATE_CAPABILITY,           /**< Edge Side Includes (ESI) header */
-    SURROGATE_CONTROL,              /**< Edge Side Includes (ESI) header */
+    SURROGATE_CAPABILITY,           /**< W3C Edge Architecture Specification */
+    SURROGATE_CONTROL,              /**< W3C Edge Architecture Specification */
     FRONT_END_HTTPS,                /**< MS Exchange custom header we may have to add */
     FTP_COMMAND,                    /**< Internal header for FTP command */
     FTP_ARGUMENTS,                  /**< Internal header for FTP command arguments */