Security-54.1.9.tar.gz

[apple/security.git] / Network / http-protocol.h

diff --git a/Network/http-protocol.h b/Network/http-protocol.h
index 09ffd3bd63bceae304a97ae6e50243e3be3c7e24..6e53321ef43266f4c698bab0ac37f696aaab3b2b 100644 (file)
--- a/Network/http-protocol.h
+++ b/Network/http-protocol.h
@@ -40,8 +40,8 @@ namespace Network {
 // The Protocol object for the HTTP protocol
 //
 class HTTPProtocol : public Protocol {
 // The Protocol object for the HTTP protocol
 //
 class HTTPProtocol : public Protocol {

-    class HTTPTransfer;

 public:
 public:

+    class HTTPTransfer;

     static const IPPort defaultHttpPort = 80;
 
     HTTPProtocol(Manager &mgr, const char *scheme = "http");
     static const IPPort defaultHttpPort = 80;
 
     HTTPProtocol(Manager &mgr, const char *scheme = "http");


@@ -55,11 +55,12 @@ private:
         void merge(string key, string &old, string newValue);
     };
 
         void merge(string key, string &old, string newValue);
     };
 

-private:
+protected:

     //
     // Our persistent connection object
     //
     class HTTPConnection : public TCPConnection {
     //
     // Our persistent connection object
     //
     class HTTPConnection : public TCPConnection {

+        static const int defaultSubVersion = 1;        // default to HTTP/1.1

     public:
         HTTPConnection(Protocol &proto, const HostTarget &tgt);
     
     public:
         HTTPConnection(Protocol &proto, const HostTarget &tgt);
     


@@ -106,6 +107,7 @@ private:
         void chooseRetain();
 
     protected:
         void chooseRetain();
 
     protected:

+        int subVersion;                                                // HTTP/1.x sub-protocol version

         State state;                                           // master state machine switch
         bool deferSendRequest;                         // allows a subclass to interrupt state machine
         string mOperation;                                     // requested HTTP operation
         State state;                                           // master state machine switch
         bool deferSendRequest;                         // allows a subclass to interrupt state machine
         string mOperation;                                     // requested HTTP operation


@@ -113,7 +115,7 @@ private:
         unsigned int httpVersionMinor;         // minor version of peer
     };
 
         unsigned int httpVersionMinor;         // minor version of peer
     };
 

-
+public:

     //
     // A generic Transfer object. All HTTP transfers are transactional (headers in, optional data in,
     // headers out, optional data out), so there's no reason to distinguish subclasses.
     //
     // A generic Transfer object. All HTTP transfers are transactional (headers in, optional data in,
     // headers out, optional data out), so there's no reason to distinguish subclasses.