From 7146ba3112867f84afb7bf817f46d3e1263f90da Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Wed, 30 Mar 2005 16:31:27 +0000
Subject: [PATCH] Bug 282698 use application/soap+xml in nsHTTPSOAPTransport
 patch by bug@annevankesteren.nl r=doron sr=jst

---
 extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp | 2 +-
 extensions/webservices/soap/src/nsSOAPMessage.cpp       | 2 +-
 extensions/webservices/soap/tests/soapfault.cgi         | 2 +-
 extensions/webservices/soap/tests/soapsuccess.cgi       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp b/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
index 1f3b468bff2..d19e10bc346 100644
--- a/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
+++ b/extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
@@ -325,7 +325,7 @@ nsHTTPSOAPTransport::SetupRequest(nsISOAPCall* aCall, PRBool async,
   if (AStringIsNull(uri))
     return SOAP_EXCEPTION(NS_ERROR_NOT_INITIALIZED,"SOAP_TRANSPORT_URI", "No transport URI was specified.");
 
-  rv = request->OverrideMimeType(NS_LITERAL_CSTRING("text/xml"));
+  rv = request->OverrideMimeType(NS_LITERAL_CSTRING("application/xml"));
   if (NS_FAILED(rv))
     return rv;
 
diff --git a/extensions/webservices/soap/src/nsSOAPMessage.cpp b/extensions/webservices/soap/src/nsSOAPMessage.cpp
index 581c5151f80..d246ebff262 100644
--- a/extensions/webservices/soap/src/nsSOAPMessage.cpp
+++ b/extensions/webservices/soap/src/nsSOAPMessage.cpp
@@ -292,7 +292,7 @@ NS_IMETHODIMP
     return rv;
 
   rv = parser->ParseFromString(nsPromiseFlatString(*kEmptySOAPDocStr[aVersion]).get(),
-                               "text/xml", getter_AddRefs(mMessage));
+                               "application/xml", getter_AddRefs(mMessage));
   if (NS_FAILED(rv))
     return rv;
 
diff --git a/extensions/webservices/soap/tests/soapfault.cgi b/extensions/webservices/soap/tests/soapfault.cgi
index fc5fc4dd800..b26310bc97a 100644
--- a/extensions/webservices/soap/tests/soapfault.cgi
+++ b/extensions/webservices/soap/tests/soapfault.cgi
@@ -11,7 +11,7 @@ print LOGFILE $buffer;
 close LOGFILE;
 
 # Send the response
-print "Content-type: text/xml\n\n";
+print "Content-type: application/xml\n\n";
 print "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\">\n";
 print "<SOAP-ENV:Body>\n";
 print "  <SOAP-ENV:Fault>\n";
diff --git a/extensions/webservices/soap/tests/soapsuccess.cgi b/extensions/webservices/soap/tests/soapsuccess.cgi
index e52f035591b..63555a8a943 100644
--- a/extensions/webservices/soap/tests/soapsuccess.cgi
+++ b/extensions/webservices/soap/tests/soapsuccess.cgi
@@ -11,7 +11,7 @@ print LOGFILE $buffer;
 close LOGFILE;
 
 # Send the response
-print "Content-type: text/xml\n\n";
+print "Content-type: application/xml\n\n";
 print "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\">\n";
 print "<SOAP-ENV:Body>\n";
 print "<m:GetLastTradePriceResponse xmlns:m=\"uri:some-namespace\">\n";