You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2005/01/20 20:36:12 UTC

cvs commit: ws-axis/c/src/transport/axis3/HTTPChannel HTTPChannelInstantiator.cpp HTTPChannel.cpp

prestonf    2005/01/20 11:36:12

  Modified:    c/src/transport/axis3/HTTPChannel
                        HTTPChannelInstantiator.cpp HTTPChannel.cpp
  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.8       +0 -3      ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannelInstantiator.cpp
  
  Index: HTTPChannelInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannelInstantiator.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HTTPChannelInstantiator.cpp	20 Jan 2005 11:23:18 -0000	1.7
  +++ HTTPChannelInstantiator.cpp	20 Jan 2005 19:36:12 -0000	1.8
  @@ -78,9 +78,6 @@
       STORAGE_CLASS_INFO void uninitializeLibrary (void)
       {
           // Do uninit actions
  -#ifdef ENABLE_AXISTRACE
  -        AxisTrace::deleteTraceEntrypoints();
  -#endif
       }
   }
   
  
  
  
  1.6       +4 -7      ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannel.cpp
  
  Index: HTTPChannel.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannel.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HTTPChannel.cpp	12 Jan 2005 11:57:22 -0000	1.5
  +++ HTTPChannel.cpp	20 Jan 2005 19:36:12 -0000	1.6
  @@ -2,8 +2,6 @@
   
   HTTPChannel::HTTPChannel()
   {
  -	memset( &m_URL, 0, sizeof( URL));
  -
   	m_LastError = "No Errors";
   
   	m_Sock = INVALID_SOCKET;
  @@ -104,7 +102,7 @@
   
       int		nByteRecv = 0;
       char	buf[BUF_SIZE];
  -	int		iBufSize = BUF_SIZE - 1;
  +	int		iBufSize = BUF_SIZE - 10;
   
       //assume timeout not set; set default tatus to OK
       int iTimeoutStatus = 1;
  @@ -143,7 +141,7 @@
   		// Recv SOCKET_ERROR, Channel error while getting data
   		m_LastError = "Channel error while getting data";
   
  -		/*CloseChannel();*/
  +		//CloseChannel();
   
   		throw HTTPTransportException( SERVER_TRANSPORT_INPUT_STREAMING_ERROR, 
   									  (char *) m_LastError.c_str());
  @@ -151,10 +149,9 @@
   
       if( nByteRecv)
       {
  -		/* printf("nByteRecv:%d\n", nByteRecv); */
   		buf[nByteRecv] = '\0';
  -		/* got a part of the message, so add to form */
  -		memcpy( (void *) msg, buf, nByteRecv);
  +		// got a part of the message, so add to form
  +		memcpy( (void *) msg, buf, nByteRecv + 1);
       }
   
   	return *this;