You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2005/07/13 16:57:04 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/client/cpp AttDataHandlerExecuteClass.cpp AttDataHandlerImage.cpp AttDataHandlerText.cpp AttMultiAttachment.cpp AttMultiAttachmentFault.cpp AttMultiSameAttachment.cpp AttNillableAttachment.cpp AttPlainText.cpp
whitlock 2005/07/13 07:57:04
Modified: c/src/soap SoapSerializer.cpp
c/tests/auto_build/testcases/client/cpp
AttDataHandlerExecuteClass.cpp
AttDataHandlerImage.cpp AttDataHandlerText.cpp
AttMultiAttachment.cpp AttMultiAttachmentFault.cpp
AttMultiSameAttachment.cpp
AttNillableAttachment.cpp AttPlainText.cpp
Log:
In SoapSerializer ensure that we never have 2 Content-Type HTTP headers in a MIME message.
In the attachments testcases add in signal handlers so they don't create pop-up boxes on windows if they sigsegv.
Revision Changes Path
1.135 +2 -1 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- SoapSerializer.cpp 12 Jul 2005 07:07:37 -0000 1.134
+++ SoapSerializer.cpp 13 Jul 2005 14:57:03 -0000 1.135
@@ -332,7 +332,8 @@
ctype += "\"; start=\"<";
ctype += id;
ctype += ">\"";
- pStream->setTransportProperty( AXIS_CONTENT_TYPE, ctype.c_str());
+ pStream->deleteTransportProperty(AXIS_CONTENT_TYPE); // Never want 2 Content-Type HTTP headers
+ pStream->setTransportProperty(AXIS_CONTENT_TYPE, ctype.c_str());
serialize("\r\n--" MIMEBOUNDARY "\r\n", NULL);
serialize(AXIS_CONTENT_TYPE ": text/xml; charset=UTF-8\r\n", NULL);
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerExecuteClass.cpp
Index: AttDataHandlerExecuteClass.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerExecuteClass.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttDataHandlerExecuteClass.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttDataHandlerExecuteClass.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -23,6 +23,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -32,6 +35,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -108,3 +119,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerImage.cpp
Index: AttDataHandlerImage.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerImage.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttDataHandlerImage.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttDataHandlerImage.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -22,6 +22,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -31,6 +34,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -108,3 +119,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerText.cpp
Index: AttDataHandlerText.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttDataHandlerText.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttDataHandlerText.cpp 6 Jul 2005 11:09:19 -0000 1.1
+++ AttDataHandlerText.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -22,6 +22,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -31,6 +34,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -89,3 +100,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiAttachment.cpp
Index: AttMultiAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiAttachment.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttMultiAttachment.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttMultiAttachment.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -22,6 +22,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -31,6 +34,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -98,3 +109,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiAttachmentFault.cpp
Index: AttMultiAttachmentFault.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiAttachmentFault.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttMultiAttachmentFault.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttMultiAttachmentFault.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -25,6 +25,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -34,6 +37,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -102,3 +113,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiSameAttachment.cpp
Index: AttMultiSameAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttMultiSameAttachment.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttMultiSameAttachment.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttMultiSameAttachment.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -22,6 +22,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -31,6 +34,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -93,3 +104,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttNillableAttachment.cpp
Index: AttNillableAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttNillableAttachment.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttNillableAttachment.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttNillableAttachment.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -21,6 +21,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -30,6 +33,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -109,3 +120,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+
1.2 +17 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/AttPlainText.cpp
Index: AttPlainText.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AttPlainText.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttPlainText.cpp 12 Jul 2005 05:09:32 -0000 1.1
+++ AttPlainText.cpp 13 Jul 2005 14:57:04 -0000 1.2
@@ -24,6 +24,9 @@
#include <iostream>
#include <fstream>
#include <string.h>
+#include <signal.h>
+
+void sig_handler(int);
int main(int argc, char* argv[])
{
@@ -33,6 +36,14 @@
url = argv[1];
bool bSuccess = false;
int iRetryIterationCount = 3;
+
+ signal(SIGILL, sig_handler);
+ signal(SIGABRT, sig_handler);
+ signal(SIGSEGV, sig_handler);
+ //signal(SIGQUIT, sig_handler);
+ //signal(SIGBUS, sig_handler);
+ signal(SIGFPE, sig_handler);
+
do
{
try
@@ -88,3 +99,9 @@
return 0;
}
+void sig_handler(int sig) {
+ signal(sig, sig_handler);
+ cout << "SIGNAL RECEIVED " << sig << endl;
+ exit(1);
+}
+