Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Date: 26 Jan 2005 14:15:29 -0000
Message-ID: <20050126141529.60052.qmail@minotaur.apache.org>
From: prestonf@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/c/src/transport/axis3 HTTPTransport.cpp
 HTTPTransport.hpp

prestonf    2005/01/26 06:15:29

  Modified:    c/src/transport/axis3 HTTPTransport.cpp HTTPTransport.hpp
  Log:
  Hi All,
  These are modifications needed for the draft of the new http transport implementation AXIS3 (see AXISCPP-361).
  Regards,
  Fred Preston.
  
  Revision  Changes    Path
  1.11      +21 -2     ws-axis/c/src/transport/axis3/HTTPTransport.cpp
  
  Index: HTTPTransport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HTTPTransport.cpp	25 Jan 2005 13:08:50 -0000	1.10
  +++ HTTPTransport.cpp	26 Jan 2005 14:15:29 -0000	1.11
  @@ -56,6 +56,11 @@
       m_bMimeTrue = false;
       m_viCurrentHeader = m_vHTTPHeaders.begin();
   	m_pszRxBuffer = new char [BUF_SIZE];
  +#ifdef WIN32
  +	m_lChannelTimeout = 10;
  +#else
  +	m_lChannelTimeout = 0;
  +#endif
   }
   
   /*
  @@ -164,6 +169,15 @@
   			}
   		}
       }
  +
  +// Need this code to set the channel timeout.  If the timeout was changed
  +// before the channel was created, then it may not have the correct timeout.
  +// By setting it here, the channel is sure to have the correct timeout value
  +// next time the channel is read.
  +	if( m_pActiveChannel != NULL)
  +	{
  +		m_pActiveChannel->setTimeout( m_lChannelTimeout);
  +	}
   }
   
   /*
  @@ -701,7 +715,7 @@
    * @param const char* Value is a NULL terminated character string containing
    * the value associated with the type.
    */
  -void HTTPTransport::setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type, const char *value) throw (HTTPTransportException)
  +void HTTPTransport::setTransportProperty( AXIS_TRANSPORT_INFORMATION_TYPE type, const char *value) throw (HTTPTransportException)
   {
       const char *key = NULL;
   
  @@ -990,7 +1004,12 @@
    */
   void HTTPTransport::setTimeout( const long lSeconds)
   {
  -    m_pActiveChannel->setTimeout (lSeconds);
  +	if( m_pActiveChannel != NULL)
  +	{
  +		m_pActiveChannel->setTimeout( lSeconds);
  +	}
  +
  +	m_lChannelTimeout = lSeconds;
   }
   
   /* HTTPTransport::getHTTPProtocol() Is a public method for retrieving the
  
  
  
  1.4       +2 -0      ws-axis/c/src/transport/axis3/HTTPTransport.hpp
  
  Index: HTTPTransport.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTTPTransport.hpp	21 Jan 2005 17:16:28 -0000	1.3
  +++ HTTPTransport.hpp	26 Jan 2005 14:15:29 -0000	1.4
  @@ -247,6 +247,8 @@
       ChannelFactory* m_pChannelFactory;
   
   	char *	m_pszRxBuffer;
  +
  +	long	m_lChannelTimeout;
   };
   
   #endif