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 su...@apache.org on 2004/01/01 13:15:16 UTC
cvs commit: ws-axis/c/vc/server/handlers/custom/echoStringHeaderHandler echoStringHeaderHandler.plg
susantha 2004/01/01 04:15:16
Modified: c/include/axis/client/transport/axis Tag:
Release-2003_10_26-bugfixes_branch
HttpTransport.hpp Transport.hpp
c/src/client/samples/interoptests/base Tag:
Release-2003_10_26-bugfixes_branch
InteropBaseClient.cpp InteropTestPortType.cpp
c/src/client/transport/axis Tag:
Release-2003_10_26-bugfixes_branch Channel.cpp
HttpTransport.cpp
c/vc/client/samples/interoptests/groupB Tag:
Release-2003_10_26-bugfixes_branch groupB.dsp
c/vc/server/apache1_3 Tag:
Release-2003_10_26-bugfixes_branch Apache1_3.dsp
c/vc/server/apache2_0 Tag:
Release-2003_10_26-bugfixes_branch Apache2_0.dsp
c/vc/server/handlers/custom/echoStringHeaderHandler Tag:
Release-2003_10_26-bugfixes_branch
echoStringHeaderHandler.plg
Log:
Fixed the problem in the transport layer which caused error when receiving large http messages
Revision Changes Path
No revision
No revision
1.2.2.2 +2 -3 ws-axis/c/include/axis/client/transport/axis/HttpTransport.hpp
Index: HttpTransport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/transport/axis/HttpTransport.hpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- HttpTransport.hpp 12 Dec 2003 13:49:19 -0000 1.2.2.1
+++ HttpTransport.hpp 1 Jan 2004 12:15:15 -0000 1.2.2.2
@@ -91,10 +91,10 @@
enum Type{POST, MPOST};
/// Create HTTP transport with provided URL as remote address, set HTTP category default to POST
- HttpTransport(Url url) : m_Typ(POST) {m_Url = url;}
+ HttpTransport(Url url) : m_Typ(POST) {m_Url = url; m_Length = 0;}
/// Create HTTP transport with provided remote address as URL-string, set HTTP category default to POST
- HttpTransport(std::string& strUrl) : m_Typ(POST) {m_Url = Url(strUrl); m_strUrl = strUrl;}
+ HttpTransport(std::string& strUrl) : m_Typ(POST) {m_Url = Url(strUrl); m_strUrl = strUrl; m_Length = 0;}
~HttpTransport();
/// Initialize HTTP transport by establishing a channel to the remote end.
@@ -139,7 +139,6 @@
std::ostringstream m_OutMsg; ///< Holds outgoing HTTP packet
std::istringstream m_InMsg; ///< Holds incoming HTTP packet
- std::string m_PayLoad; ///< Holds the payload
Header_t m_AdditionalHeader; ///< Additional Header fields as name value pairs
private:
Channel m_Channel;
1.2.2.2 +3 -2 ws-axis/c/include/axis/client/transport/axis/Transport.hpp
Index: Transport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/transport/axis/Transport.hpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Transport.hpp 12 Dec 2003 13:49:19 -0000 1.2.2.1
+++ Transport.hpp 1 Jan 2004 12:15:15 -0000 1.2.2.2
@@ -97,11 +97,12 @@
protected:
-
Url m_Url;
std::string m_strUrl;
bool m_bStatus;
-
+public:
+ int m_Length;
+ std::string m_PayLoad; ///< Holds the payload
};
#endif // _AXIS_TRANSPORT_HPP
No revision
No revision
1.4.2.2 +111 -128 ws-axis/c/src/client/samples/interoptests/base/InteropBaseClient.cpp
Index: InteropBaseClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/InteropBaseClient.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- InteropBaseClient.cpp 27 Oct 2003 06:30:21 -0000 1.4.2.1
+++ InteropBaseClient.cpp 1 Jan 2004 12:15:16 -0000 1.4.2.2
@@ -1,139 +1,122 @@
-// InteropBaseClient.cpp : Defines the entry point for the console application.
-//
-
#include "InteropTestPortType.h"
-#define ARRAYSIZE 2
+#include <time.h>
+#include <stdlib.h>
+#include <Winsock2.h>
+
+#define MAX_LINE_LEN 1024
+#define NUM_TEST_RUNS 2
+#define STRING_DATA_FILE "stringdata.txt"
-int main(int argc, char* argv[])
+string *
+gettestdata(char *filename, int size)
{
- int x;
- char buffer[100];
+ FILE *s = fopen(filename, "rt");
+
+ if (s) {
+ int ii = 0;
+ char buffer[MAX_LINE_LEN] = "";
+ string *testdata = new string[size];
+ if (!testdata)
+ return NULL;
+
+ while (ii < size && fgets(buffer, MAX_LINE_LEN, s)) {
+ int len = strlen(buffer);
+ buffer[len-1] = 0;
+
+ testdata[ii] = buffer;
+ ii++;
+ }
+
+ fclose(s);
- InteropTestPortType ws;
- printf("invoking echoString...\n");
- //testing echoString
- if (ws.echoString("hello world") == "hello world")
- printf("successful\n");
- else
- printf("failed\n");
- // testing echoStringArray
- ArrayOfstring arrstr;
- arrstr.m_Array = new string[ARRAYSIZE];
- arrstr.m_Size = ARRAYSIZE;
- for (x=0;x<ARRAYSIZE;x++)
- {
- sprintf(buffer, "%dth element of string array", x);
- arrstr.m_Array[x] = buffer;
+ return testdata;
}
- printf("invoking echoStringArray...\n");
- if (ws.echoStringArray(arrstr).m_Array != NULL)
- printf("successful\n");
- else
- printf("failed\n");
- // testing echoInteger
- printf("invoking echoInteger...\n");
- if (ws.echoInteger(56) == 56)
- printf("successful\n");
- else
- printf("failed\n");
- // testing echoIntegerArray
- ArrayOfint arrint;
- arrint.m_Array = new int[ARRAYSIZE];
- arrint.m_Size = ARRAYSIZE;
- for (x=0;x<ARRAYSIZE;x++)
- {
- arrint.m_Array[x] = x;
+
+ perror("Error");
+
+ return NULL;
+}
+
+
+int diff_time(struct timeval *time2, struct timeval *time1)
+{
+ return 1000000 * (time2->tv_sec - time1->tv_sec)
+ + time2->tv_usec - time1->tv_usec;
+}
+
+
+int *dotest(int array_sz)
+{
+ ArrayOfstring arrstr;
+ arrstr.m_Size = array_sz;
+
+/* struct timeval time1, time2;
+ timezone zone;
+ zone.tz_minuteswest = 0;
+ zone.tz_dsttime = 0;
+*/
+ InteropTestPortType ws;
+ int *tst_res = (int *)malloc(sizeof(int) * NUM_TEST_RUNS);
+ if (!(arrstr.m_Array
+ = gettestdata(STRING_DATA_FILE, array_sz)))
+ return NULL;
+ printf("\nStarting... (microseconds)");
+ for (int ii = 0; ii < NUM_TEST_RUNS; ii++) {
+// gettimeofday(&time1, &zone);
+
+ if (!(ws.echoStringArray(arrstr).m_Array))
+ {
+ printf("Error: Service failed.\n");
+ return NULL;
+ }
+// gettimeofday(&time2, &zone);
+
+// tst_res[ii] = diff_time(&time2, &time1);
+
+// printf("\n\t%5d) %10d", ii, tst_res[ii]);
+ printf("\niteration : %d\n", ii);
+ }
+
+ printf("\nDone.");
+ return tst_res;
+}
+
+/*
+int save_res(char *save_as, int *tst_res, char *desc)
+{
+ FILE *s = fopen(save_as, "wt");
+ if (s) {
+ fprintf(s, "%s\n", desc);
+ for (int ii = 0; ii < NUM_TEST_RUNS; ii++)
+ fprintf(s, "%d\n", tst_res[ii]);
+
+ fclose(s);
+
+ return 0;
}
- printf("invoking echoIntegerArray...\n");
- if (ws.echoIntegerArray(arrint).m_Array != NULL)
- printf("successful\n");
else
- printf("failed\n");
- // testing echoFloat
- printf("invoking echoFloat...\n");
- if (ws.echoFloat(1.4214) > 1.42)
- printf("successful\n");
- else
- printf("failed\n");
- // testing echoFloat
- ArrayOffloat arrfloat;
- arrfloat.m_Array = new float[ARRAYSIZE];
- arrfloat.m_Size = ARRAYSIZE;
- for (x=0;x<ARRAYSIZE;x++)
- {
- arrfloat.m_Array[x] = 1.1111*x;
+ perror("Error");
+
+ return -1;
+}
+*/
+
+
+int main(int argc, char **argv)
+{
+ if (2 == argc) {
+ // FIXME:
+ int temp = strtol(argv[1], NULL, 10);
+ int *tst_res = dotest(temp);
+ if (tst_res);
+// save_res("test-1.dat", tst_res, "#\ttest data set1");
+
+ return 0;
}
- printf("invoking echoFloatArray...\n");
- if (ws.echoFloatArray(arrfloat).m_Array != NULL)
- printf("successful\n");
- else
- printf("failed\n");
- // testing echo Struct
- SOAPStruct stct;
- stct.varFloat = 12345.7346345;
- stct.varInt = 5000;
- stct.varString = "This is string in SOAPStruct";
- printf("invoking echoStruct...\n");
- if (ws.echoStruct(&stct) != NULL)
- printf("successful\n");
- else
- printf("failed\n");
- //testing echo Array of Struct
- ArrayOfSOAPStruct arrstct;
- arrstct.m_Array = new SOAPStruct[ARRAYSIZE];
- arrstct.m_Size = ARRAYSIZE;
- for (x=0;x<ARRAYSIZE;x++)
- {
- arrstct.m_Array[x].varFloat = 1.1111*x;
- arrstct.m_Array[x].varInt = x;
- sprintf(buffer, "varString of %dth element of SOAPStruct array", x);
- arrstct.m_Array[x].varString = buffer;
+ else {
+ printf("Incorrect number of arguments in call to...");
+
+ return -1;
}
- //testing echo Struct Array
- printf("invoking echoStructArray...\n");
- if (ws.echoStructArray(arrstct).m_Array != NULL)
- printf("successful\n");
- else
- printf("failed\n");
- //testing echo void
- printf("invoking echoVoid...\n");
- ws.echoVoid();
- printf("successful\n");
- //testing echo base 64 binary
- printf("invoking echoBase64...\n");
- if (ws.echoBase64("BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG") ==
- "BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG")
- printf("successful\n");
- else
- printf("failed\n");
- time_t tim;
- time(&tim);
- tm* lt = gmtime(&tim);
- printf("invoking echoDate...\n");
- if (memcmp(&ws.echoDate(*lt), lt, sizeof(tm)) == 0)
- printf("successful\n");
- else
- printf("failed\n");
- //testing echo hex binary
- printf("invoking echoHexBinary...\n");
- if (ws.echoHexBinary("CCCFFA46552BC7D5A09BC5F23DE9E0FE7862AD45BC87D02FEE") ==
- "CCCFFA46552BC7D5A09BC5F23DE9E0FE7862AD45BC87D02FEE")
- printf("successful\n");
- else
- printf("failed\n");
- //testing echo decimal
- printf("invoking echoDecimal...\n");
- if (ws.echoDecimal(1234.567890) > 1234.56)
- printf("successful\n");
- else
- printf("failed\n");
- //testing echo boolean
- printf("invoking echoBoolean...\n");
- if (ws.echoBoolean(1) == 1)
- printf("successful\n");
- else
- printf("failed\n");
- getchar();
- return 0;
}
1.8.2.5 +1 -1 ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp
Index: InteropTestPortType.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- InteropTestPortType.cpp 30 Nov 2003 10:43:31 -0000 1.8.2.4
+++ InteropTestPortType.cpp 1 Jan 2004 12:15:16 -0000 1.8.2.5
@@ -19,7 +19,7 @@
m_pCall = new Call();
m_pCall->SetProtocol(APTHTTP);
m_pCall->SetHeader("SOAPAction", "InteropBase");
- m_pCall->SetEndpointURI("http://localhost/axis/InteropBase");
+ m_pCall->SetEndpointURI("http://192.168.101.4/axis/InteropBase");
}
InteropTestPortType::~InteropTestPortType()
No revision
No revision
1.2.2.2 +37 -9 ws-axis/c/src/client/transport/axis/Channel.cpp
Index: Channel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Channel.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Channel.cpp 12 Dec 2003 13:49:20 -0000 1.2.2.1
+++ Channel.cpp 1 Jan 2004 12:15:16 -0000 1.2.2.2
@@ -241,10 +241,12 @@
throw ChannelException("Input streaming error on undefined channel; please open the channel first");
}
+ int nToRead;
int nByteRecv = 0;
- const int BUF_SIZE = 4096;
+ const int BUF_SIZE = 64;
char buf[BUF_SIZE];
+ // read socket until we reach to the body
do // Manage multiple chuncks of the message
{
if ((nByteRecv = recv(m_Sock, (char *) &buf, BUF_SIZE - 1, 0)) == SOCKET_ERROR)
@@ -253,22 +255,48 @@
CloseChannel();
throw ChannelException("Input streaming error on Channel while getting data");
}
-
+
if(nByteRecv)
{
- buf[nByteRecv + 1] = '\0'; // got a part of the message, so add it to form
+ buf[nByteRecv] = '\0'; // got a part of the message, so add it to form
msg += buf; // the whole message
- //Validate according to the transport; check whether we are in a position to return.
- if (!m_pTransportHandler->GetStatus(msg))
- break;
}
else
- break; // we have the whole message or an error has occured
+ return *this;
+
}
- while (true);
+ while (msg.find("\r\n\r\n") == std::string::npos);
+ if (!m_pTransportHandler->GetStatus(msg))
+ {
+ msg = "";
+ return *this;
+ }
+
+ nToRead = m_pTransportHandler->m_Length - m_pTransportHandler->m_PayLoad.length();
+
+ do // Manage multiple chuncks of the message
+ {
+ if ((nByteRecv = recv(m_Sock, (char *) &buf, BUF_SIZE - 1, 0)) == SOCKET_ERROR)
+ {
+ Error("Channel error while getting data.");
+ CloseChannel();
+ throw ChannelException("Input streaming error on Channel while getting data");
+ }
+
+ if(nByteRecv)
+ {
+ nToRead -= nByteRecv;
+ buf[nByteRecv] = '\0'; // got a part of the message, so add it to form
+ m_pTransportHandler->m_PayLoad += buf; // the whole message
- return *this;
+ }
+ else
+ break; // we have the whole message or an error has occured
+ }
+ while (nToRead > 0);
+ //Validate according to the transport; check whether we are in a position to return.
+ return *this;
}
/**
1.7.2.2 +3 -6 ws-axis/c/src/client/transport/axis/HttpTransport.cpp
Index: HttpTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/HttpTransport.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- HttpTransport.cpp 12 Dec 2003 13:49:20 -0000 1.7.2.1
+++ HttpTransport.cpp 1 Jan 2004 12:15:16 -0000 1.7.2.2
@@ -313,8 +313,7 @@
{
std::string::size_type pos, nxtpos;
std::string strLine;
- int len=0;
-
+ m_Length=0;
// process rest of the HTTP packet
while (true)
{
@@ -328,7 +327,7 @@
// Get the payload size from the header.
if((pos = strLine.find("Content-Length:")) != std::string::npos)
- len = atoi(strLine.substr(pos + strlen("Content-Length: ")).c_str());
+ m_Length = atoi(strLine.substr(pos + strlen("Content-Length: ")).c_str());
}
m_PayLoad = p_HttpPacket.substr(offset);
@@ -340,13 +339,11 @@
//nxtpos = m_PayLoad.find("1df");
//if(std::string::npos != nxtpos && '\n' == m_PayLoad[nxtpos+4])
{
- m_bStatus = false; // we have the payload
// Extract the SOAP message
m_PayLoad = m_PayLoad.substr(m_PayLoad.find('<'));
- m_PayLoad = m_PayLoad.substr(0, m_PayLoad.rfind('>') + 1);
+ // m_PayLoad = m_PayLoad.substr(0, m_PayLoad.rfind('>') + 1);
}
}
-
#ifdef _DEBUG
std::cout << "Payload:\n" << m_PayLoad << std::endl;
#endif
No revision
No revision
1.4.2.1 +1 -1 ws-axis/c/vc/client/samples/interoptests/groupB/groupB.dsp
Index: groupB.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/client/samples/interoptests/groupB/groupB.dsp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- groupB.dsp 26 Oct 2003 09:45:47 -0000 1.4
+++ groupB.dsp 1 Jan 2004 12:15:16 -0000 1.4.2.1
@@ -50,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib client.lib Ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../../lib/axis" /libpath:"../../../../../lib/xerces-c"
+# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib client.lib Ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"../../../../../release/win32/groupB.exe" /libpath:"../../../../../lib/axis" /libpath:"../../../../../lib/xerces-c"
!ELSEIF "$(CFG)" == "groupB - Win32 Debug"
No revision
No revision
1.13.2.5 +2 -2 ws-axis/c/vc/server/apache1_3/Apache1_3.dsp
Index: Apache1_3.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache1_3/Apache1_3.dsp,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -u -r1.13.2.4 -r1.13.2.5
--- Apache1_3.dsp 11 Dec 2003 14:04:26 -0000 1.13.2.4
+++ Apache1_3.dsp 1 Jan 2004 12:15:16 -0000 1.13.2.5
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache1_3"
+# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib ApacheCore.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache1_3"
# SUBTRACT LINK32 /profile
!ELSEIF "$(CFG)" == "Apache1_3 - Win32 Debug"
@@ -81,7 +81,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules\mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache1_3"
+# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib ApacheCore.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache1_3"
# SUBTRACT LINK32 /profile
!ENDIF
No revision
No revision
1.6.2.4 +2 -2 ws-axis/c/vc/server/apache2_0/Apache2_0.dsp
Index: Apache2_0.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/apache2_0/Apache2_0.dsp,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- Apache2_0.dsp 30 Nov 2003 08:29:53 -0000 1.6.2.3
+++ Apache2_0.dsp 1 Jan 2004 12:15:16 -0000 1.6.2.4
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib libapr.lib libhttpd.lib Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib libapr.lib libhttpd.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0"
+# ADD LINK32 Common.lib Soap.lib wsdd.lib Engine.lib xerces-c_2.lib libapr.lib libhttpd.lib /nologo /dll /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0"
!ELSEIF "$(CFG)" == "Apache2_0 - Win32 Debug"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib libapr.lib libhttpd.lib apr.lib aprutil.lib libaprutil.lib libapriconv.lib Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache2\modules\mod_axis.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc" /libpath:"../../../lib/win32/apache2_0"
+# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib libapr.lib libhttpd.lib apr.lib aprutil.lib libaprutil.lib libapriconv.lib Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib xerces-c_2D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../release/win32/mod_axis2.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/xerces-c" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/win32/axis" /libpath:"../../../lib/win32/xercesc" /libpath:"../../../lib/win32/apache2_0"
!ENDIF
No revision
No revision
1.3.2.2 +12 -12 ws-axis/c/vc/server/handlers/custom/echoStringHeaderHandler/echoStringHeaderHandler.plg
Index: echoStringHeaderHandler.plg
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/handlers/custom/echoStringHeaderHandler/echoStringHeaderHandler.plg,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- echoStringHeaderHandler.plg 28 Nov 2003 13:59:08 -0000 1.3.2.1
+++ echoStringHeaderHandler.plg 1 Jan 2004 12:15:16 -0000 1.3.2.2
@@ -6,20 +6,20 @@
--------------------Configuration: loghandler - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP160.tmp" with contents
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPFE.tmp" with contents
[
/nologo /MT /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LOGHANDLER_EXPORTS" /Fp"../../../../../bin/win32/handlers/custom/loghandler/loghandler.pch" /YX /Fo"../../../../../bin/win32/handlers/custom/loghandler/" /Fd"../../../../../bin/win32/handlers/custom/loghandler/" /FD /c
"C:\susantha\ws-axis\cbfb\src\server\handlers\custom\loghandler\LogAccessCount.cpp"
"C:\susantha\ws-axis\cbfb\src\server\handlers\custom\loghandler\LogHandler.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP160.tmp"
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP161.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPFE.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPFF.tmp" with contents
[
/nologo /dll /incremental:no /pdb:"../../../../../release/win32/loghandler.pdb" /machine:I386 /out:"../../../../../release/win32/loghandler.dll" /implib:"../../../../../release/win32/loghandler.lib"
"\susantha\ws-axis\cbfb\bin\win32\handlers\custom\loghandler\LogAccessCount.obj"
"\susantha\ws-axis\cbfb\bin\win32\handlers\custom\loghandler\LogHandler.obj"
]
-Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP161.tmp"
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPFF.tmp"
<h3>Output Window</h3>
Compiling...
LogAccessCount.cpp
@@ -35,20 +35,20 @@
--------------------Configuration: testhandler1 - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP165.tmp" with contents
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP103.tmp" with contents
[
/nologo /MT /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TESTHANDLER1_EXPORTS" /Fp"../../../../../bin/win32/handlers/global/testhandler1/testhandler1.pch" /YX /Fo"../../../../../bin/win32/handlers/global/testhandler1/" /Fd"../../../../../bin/win32/handlers/global/testhandler1/" /FD /c
"C:\susantha\ws-axis\cbfb\src\server\handlers\global\testhandler1\TestGlobal.cpp"
"C:\susantha\ws-axis\cbfb\src\server\handlers\global\testhandler1\TestHandler1.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP165.tmp"
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP166.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP103.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP104.tmp" with contents
[
/nologo /dll /incremental:no /pdb:"../../../../../release/win32/testhandler1.pdb" /machine:I386 /out:"../../../../../release/win32/testhandler1.dll" /implib:"../../../../../release/win32/testhandler1.lib"
"\susantha\ws-axis\cbfb\bin\win32\handlers\global\testhandler1\TestGlobal.obj"
"\susantha\ws-axis\cbfb\bin\win32\handlers\global\testhandler1\TestHandler1.obj"
]
-Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP166.tmp"
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP104.tmp"
<h3>Output Window</h3>
Compiling...
TestGlobal.cpp
@@ -64,20 +64,20 @@
--------------------Configuration: testhandler2 - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP16A.tmp" with contents
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP108.tmp" with contents
[
/nologo /MT /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TESTHANDLER2_EXPORTS" /Fp"../../../../../bin/win32/handlers/transport/testhandler2/testhandler2.pch" /YX /Fo"../../../../../bin/win32/handlers/transport/testhandler2/" /Fd"../../../../../bin/win32/handlers/transport/testhandler2/" /FD /c
"C:\susantha\ws-axis\cbfb\src\server\handlers\transport\testhandler2\TestHandler2.cpp"
"C:\susantha\ws-axis\cbfb\src\server\handlers\transport\testhandler2\TestTransport.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP16A.tmp"
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP16B.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP108.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP109.tmp" with contents
[
/nologo /dll /incremental:no /pdb:"../../../../../release/win32/testhandler2.pdb" /machine:I386 /out:"../../../../../release/win32/testhandler2.dll" /implib:"../../../../../release/win32/testhandler2.lib"
"\susantha\ws-axis\cbfb\bin\win32\handlers\transport\testhandler2\TestHandler2.obj"
"\susantha\ws-axis\cbfb\bin\win32\handlers\transport\testhandler2\TestTransport.obj"
]
-Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP16B.tmp"
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSP109.tmp"
<h3>Output Window</h3>
Compiling...
TestHandler2.cpp