------------------------------------------------------------ revno: 13599 revision-id: squid3@treenet.co.nz-20140922190619-bok4apomr77vo1vr parent: squid3@treenet.co.nz-20140922173941-u36a5o54t6l490fu committer: Amos Jeffries branch nick: trunk timestamp: Mon 2014-09-22 12:06:19 -0700 message: Cleanup: remove references to 'server-side' ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140922190619-bok4apomr77vo1vr # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 37db459706cecb0215fed04215861851c3381b68 # timestamp: 2014-09-25 05:53:39 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140922173941-\ # u36a5o54t6l490fu # # Begin patch === modified file 'src/FwdState.cc' --- src/FwdState.cc 2014-09-13 13:59:43 +0000 +++ src/FwdState.cc 2014-09-22 19:06:19 +0000 @@ -71,7 +71,7 @@ #define MAX_FWD_STATS_IDX 9 static int FwdReplyCodes[MAX_FWD_STATS_IDX + 1][Http::scInvalidHeader + 1]; -static PconnPool *fwdPconnPool = new PconnPool("server-side", NULL); +static PconnPool *fwdPconnPool = new PconnPool("server-peers", NULL); CBDATA_CLASS_INIT(FwdState); #if USE_OPENSSL @@ -447,7 +447,7 @@ serverConn = NULL; } -// Legacy method to be removed in favor of the above as soon as possible +// \deprecated use unregister(Comm::ConnectionPointer &conn) instead void FwdState::unregister(int fd) { @@ -457,7 +457,7 @@ } /** - * server-side modules call fwdComplete() when they are done + * FooClient modules call fwdComplete() when they are done * downloading an object. Then, we either 1) re-forward the * request somewhere else if needed, or 2) call storeComplete() * to finish it off @@ -532,7 +532,7 @@ * * Return TRUE if the request SHOULD be retried. This method is * called when the HTTP connection fails, or when the connection - * is closed before server-side read the end of HTTP headers. + * is closed before reading the end of HTTP headers from the server. */ bool FwdState::checkRetry() @@ -1017,7 +1017,7 @@ * * returns TRUE if the transaction SHOULD be re-forwarded to the * next choice in the serverDestinations list. This method is called when - * server-side communication completes normally, or experiences + * peer communication completes normally, or experiences * some error after receiving the end of HTTP headers. */ int === modified file 'src/HierarchyLogEntry.h' --- src/HierarchyLogEntry.h 2014-09-13 13:59:43 +0000 +++ src/HierarchyLogEntry.h 2014-09-22 19:06:19 +0000 @@ -55,7 +55,7 @@ Http::StatusCode peer_reply_status; ///< last HTTP status code received timeval peer_http_request_sent; ///< last peer finished writing req int64_t peer_response_time; ///< last peer response delay - Comm::ConnectionPointer tcpServer; ///< TCP/IP level details of the last server-side connection + Comm::ConnectionPointer tcpServer; ///< TCP/IP level details of the last peer/server connection int64_t bodyBytesRead; ///< number of body bytes received from the next hop or -1 private: === modified file 'src/adaptation/notes.dox' --- src/adaptation/notes.dox 2014-09-13 13:59:43 +0000 +++ src/adaptation/notes.dox 2014-09-22 19:06:19 +0000 @@ -67,8 +67,8 @@ Here is a typical adaptation code sequence: -- Master caller (client- or server-side): Checks ACL and starts - Adaptation::Iterator for the ACL-selected ServiceGroup. +- Master caller: Checks ACL and starts Adaptation::Iterator for the + ACL-selected ServiceGroup. - Adaptation::Iterator: Creates ServicePlan and executes it, launching one service adaptation per step. Abandons the original plan and builds a dynamic === modified file 'src/cf.data.pre' --- src/cf.data.pre 2014-09-02 01:08:58 +0000 +++ src/cf.data.pre 2014-09-22 19:06:19 +0000 @@ -4028,7 +4028,7 @@ [http::]expectedBodyTooLarge(*request)) { sendBodyIsTooLargeError(); return; } - // TODO: Should we check receivedBodyTooLarge on the server-side as well? + // TODO: Should we check receivedBodyTooLarge as well? if (!group) { debugs(11,3, HERE << "no adapation needed"); === modified file 'src/clients/Client.h' --- src/clients/Client.h 2014-09-22 17:39:41 +0000 +++ src/clients/Client.h 2014-09-22 19:06:19 +0000 @@ -23,11 +23,10 @@ class HttpReply; /** - * Client is a common base for server-side classes such as - * HttpStateData and FtpStateData. All such classes must be able to - * consume request bodies from the client-side or ICAP producer, adapt - * virgin responses using ICAP, and provide the client-side consumer with - * responses. + * Client is a common base for classes such as HttpStateData and FtpStateData. + * All such classes must be able to consume request bodies from a BodyPipe + * or ICAP producer, adapt virgin responses using ICAP, and provide a + * consumer with responses. */ class Client: #if USE_ADAPTATION === modified file 'src/err_detail_type.h' --- src/err_detail_type.h 2014-09-13 13:59:43 +0000 +++ src/err_detail_type.h 2014-09-22 19:06:19 +0000 @@ -12,10 +12,10 @@ typedef enum { ERR_DETAIL_NONE, ERR_DETAIL_START = 100000, // to avoid clashes with most OS error numbers - ERR_DETAIL_CLT_REQMOD_ABORT = ERR_DETAIL_START, // client-side detected transaction abort - ERR_DETAIL_CLT_REQMOD_REQ_BODY, // client-side detected REQMOD request body adaptation failure - ERR_DETAIL_CLT_REQMOD_RESP_BODY, // client-side detected REQMOD satisfaction reply body failure - ERR_DETAIL_SRV_REQMOD_REQ_BODY, // server-side detected REQMOD request body abort + ERR_DETAIL_CLT_REQMOD_ABORT = ERR_DETAIL_START, // client-facing code detected transaction abort + ERR_DETAIL_CLT_REQMOD_REQ_BODY, // client-facing code detected REQMOD request body adaptation failure + ERR_DETAIL_CLT_REQMOD_RESP_BODY, // client-facing code detected REQMOD satisfaction reply body failure + ERR_DETAIL_SRV_REQMOD_REQ_BODY, // server-facing code detected REQMOD request body abort ERR_DETAIL_ICAP_RESPMOD_EARLY, // RESPMOD failed w/o store entry ERR_DETAIL_ICAP_RESPMOD_LATE, // RESPMOD failed with a store entry ERR_DETAIL_REQMOD_BLOCK, // REQMOD denied client access === modified file 'src/http.cc' --- src/http.cc 2014-09-22 17:39:41 +0000 +++ src/http.cc 2014-09-22 19:06:19 +0000 @@ -1551,7 +1551,7 @@ /* * Set the read timeout here because it hasn't been set yet. * We only set the read timeout after the request has been - * fully written to the server-side. If we start the timeout + * fully written to the peer. If we start the timeout * after connection establishment, then we are likely to hit * the timeout for POST/PUT requests that have very large * request bodies. === modified file 'src/mgr/IoAction.h' --- src/mgr/IoAction.h 2014-09-13 13:59:43 +0000 +++ src/mgr/IoAction.h 2014-09-22 19:06:19 +0000 @@ -17,7 +17,7 @@ namespace Mgr { -/// store server-side network read() size histograms +/// store size histograms of network read() from peer server class IoActionData { public: === modified file 'src/ssl/ServerBump.h' --- src/ssl/ServerBump.h 2014-09-13 13:59:43 +0000 +++ src/ssl/ServerBump.h 2014-09-22 19:06:19 +0000 @@ -31,7 +31,7 @@ explicit ServerBump(HttpRequest *fakeRequest, StoreEntry *e = NULL, Ssl::BumpMode mode = Ssl::bumpServerFirst); ~ServerBump(); - /// faked, minimal request; required by server-side API + /// faked, minimal request; required by Client API HttpRequest::Pointer request; StoreEntry *entry; ///< for receiving Squid-generated error messages Ssl::X509_Pointer serverCert; ///< HTTPS server certificate === modified file 'src/store.cc' --- src/store.cc 2014-09-13 13:59:43 +0000 +++ src/store.cc 2014-09-22 19:06:19 +0000 @@ -1067,7 +1067,7 @@ /* * Someone wants to abort this transfer. Set the reason in the - * request structure, call the server-side callback and mark the + * request structure, call the callback and mark the * entry for releasing */ void === modified file 'src/store_client.cc' --- src/store_client.cc 2014-09-13 13:59:43 +0000 +++ src/store_client.cc 2014-09-22 19:06:19 +0000 @@ -299,8 +299,8 @@ /* * We used to check for ENTRY_ABORTED here. But there were some * problems. For example, we might have a slow client (or two) and - * the server-side is reading far ahead and swapping to disk. Even - * if the server-side aborts, we want to give the client(s) + * the peer server is reading far ahead and swapping to disk. Even + * if the peer aborts, we want to give the client(s) * everything we got before the abort condition occurred. */ /* Warning: doCopy may indirectly free itself in callbacks, === modified file 'src/store_swapout.cc' --- src/store_swapout.cc 2014-09-13 13:59:43 +0000 +++ src/store_swapout.cc 2014-09-22 19:06:19 +0000 @@ -233,7 +233,7 @@ /* * Wait until we are below the disk FD limit, only if the - * next server-side read won't be deferred. + * next read won't be deferred. */ if (storeTooManyDiskFilesOpen() && !checkDeferRead(-1)) return;