* receive the HTTP body.
*/
-
class ChunkedCodingParser;
namespace Adaptation
{
-namespace Icap {
+namespace Icap
+{
// estimated future presence and size of something (e.g., HTTP body)
State theState;
};
-
// maintains preview-related sizes
class Preview
{
public:
- ModXact(Adaptation::Initiator *anInitiator, HttpMsg *virginHeader, HttpRequest *virginCause, ServiceRep::Pointer &s);
+ ModXact(HttpMsg *virginHeader, HttpRequest *virginCause, ServiceRep::Pointer &s);
+ virtual ~ModXact();
// BodyProducer methods
virtual void noteMoreBodySpaceAvailable(BodyPipe::Pointer);
// service waiting
void noteServiceReady();
+ void noteServiceAvailable();
public:
InOut virgin;
InOut adapted;
-protected:
// bypasses exceptions if needed and possible
virtual void callException(const std::exception &e);
+ /// record error detail in the virgin request if possible
+ virtual void detailError(int errDetail);
+ // Icap::Xaction API
+ virtual void clearError();
+
private:
virtual void start();
+ /// locates the request, either as a cause or as a virgin message itself
+ const HttpRequest &virginRequest() const; // Must always be available
+
void estimateVirginBody();
void makeAdaptedBodyPipe(const char *what);
void writePreviewBody();
void writePrimeBody();
void writeSomeBody(const char *label, size_t size);
+ void decideWritingAfterPreview(const char *previewKind);
void startReading();
void readMore();
bool virginBodyEndReached(const VirginBodyAct &act) const;
void makeRequestHeaders(MemBuf &buf);
+ void makeAllowHeader(MemBuf &buf);
void makeUsernameHeader(const HttpRequest *request, MemBuf &buf);
void addLastRequestChunk(MemBuf &buf);
void openChunk(MemBuf &buf, size_t chunkSize, bool ieof);
void decideOnPreview();
void decideOnRetries();
bool shouldAllow204();
+ bool shouldAllow206any();
+ bool shouldAllow206in();
+ bool shouldAllow206out();
bool canBackupEverything() const;
void prepBackup(size_t expectedSize);
bool validate200Ok();
void handle200Ok();
void handle204NoContent();
+ void handle206PartialContent();
void handleUnknownScode();
void bypassFailure();
void startSending();
- void disableBypass(const char *reason);
+ void disableBypass(const char *reason, bool includeGroupBypass);
void prepEchoing();
+ void prepPartialBodyEchoing(uint64_t pos);
void echoMore();
virtual bool doneAll() const;
bool gotEncapsulated(const char *section) const;
void checkConsuming();
-
- HttpReply *icapReply;
+ virtual void finalizeLogInfo();
SizedEstimate virginBody;
VirginBodyAct virginBodyWriting; // virgin body writing state
ChunkedCodingParser *bodyParser; // ICAP response body parser
bool canStartBypass; // enables bypass of transaction failures
+ bool protectGroupBypass; // protects ServiceGroup-wide bypass of failures
+
+ /**
+ * size of HTTP header in ICAP reply or -1 if there is not any encapsulated
+ * message data
+ */
+ int64_t replyHttpHeaderSize;
+ /**
+ * size of dechunked HTTP body in ICAP reply or -1 if there is not any
+ * encapsulated message data
+ */
+ int64_t replyHttpBodySize;
+
+ int adaptHistoryId; ///< adaptation history slot reservation
class State
{
bool serviceWaiting; // waiting for ICAP service options
bool allowedPostview204; // mmust handle 204 No Content outside preview
+ bool allowedPostview206; // must handle 206 Partial Content outside preview
+ bool allowedPreview206; // must handle 206 Partial Content inside preview
+ bool readyForUob; ///< got a 206 response and expect a use-origin-body
+ bool waitedForService; ///< true if was queued at least once
// will not write anything [else] to the ICAP server connection
bool doneWriting() const { return writing == writingReallyDone; }
// will not use virgin.body_pipe
bool doneConsumingVirgin() const {
return writing >= writingAlmostDone
- && (sending == sendingAdapted || sending == sendingDone);
+ && ((sending == sendingAdapted && !readyForUob) ||
+ sending == sendingDone);
}
// parsed entire ICAP response from the ICAP server
class ModXactLauncher: public Launcher
{
public:
- ModXactLauncher(Adaptation::Initiator *anInitiator, HttpMsg *virginHeader, HttpRequest *virginCause, Adaptation::ServicePointer s);
+ ModXactLauncher(HttpMsg *virginHeader, HttpRequest *virginCause, Adaptation::ServicePointer s);
protected:
virtual Xaction *createXaction();
+ virtual void swanSong();
+
+ /// starts or stops transaction accounting in ICAP history
+ void updateHistory(bool start);
+
InOut virgin;
private:
CBDATA_CLASS2(ModXactLauncher);
};
-
} // namespace Icap
} // namespace Adaptation