diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-11-07 14:00:15 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-11-07 15:19:34 +0100 |
commit | b7686e41f1bbf655a4e3a5f142a5520faecfa6bc (patch) | |
tree | f680c135d60d86a76585673e11ce6c83e0fc583c /libcmis | |
parent | 192a0eb2beccee5349c3c7b60208aa95eb985f35 (diff) |
CMIS: fixed <wsse:Expires> output: c_str() on a temp string object isn't good
Change-Id: I7de9dd2372cd7b61a3bc03bdca0023a3bc7484bd
Diffstat (limited to 'libcmis')
-rw-r--r-- | libcmis/UnpackedTarball_cmis.mk | 1 | ||||
-rw-r--r-- | libcmis/libcmis-0.3.0.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk index 8739aa74fc5e..ce10efee0342 100644 --- a/libcmis/UnpackedTarball_cmis.mk +++ b/libcmis/UnpackedTarball_cmis.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ libcmis/libcmis-0.3.0-warnings.patch \ libcmis/libcmis-0.3.0-win.patch \ + libcmis/libcmis-0.3.0.patch \ )) ifeq ($(OS)$(COM),WNTMSC) diff --git a/libcmis/libcmis-0.3.0.patch b/libcmis/libcmis-0.3.0.patch new file mode 100644 index 000000000000..d9dc70f6a40d --- /dev/null +++ b/libcmis/libcmis-0.3.0.patch @@ -0,0 +1,22 @@ +diff --git src/libcmis/ws-soap.cxx src/libcmis/ws-soap.cxx +index e8efd67..decb79a 100644 +--- src/libcmis/ws-soap.cxx ++++ src/libcmis/ws-soap.cxx +@@ -279,7 +279,7 @@ string SoapRequest::createEnvelope( string& username, string& password ) + boost::posix_time::ptime expires( created ); + expires = expires + boost::gregorian::days( 1 ); + string createdStr = libcmis::writeDateTime( created ); +- xmlChar* expiresStr = BAD_CAST( libcmis::writeDateTime( expires ).c_str( ) ); ++ string expiresStr = libcmis::writeDateTime( expires ); + + xmlTextWriterStartElement( writer, BAD_CAST( "S:Envelope" ) ); + xmlTextWriterWriteAttribute( writer, BAD_CAST( "xmlns:S" ), BAD_CAST( NS_SOAP_ENV_URL ) ); +@@ -296,7 +296,7 @@ string SoapRequest::createEnvelope( string& username, string& password ) + xmlTextWriterWriteRaw( writer, BAD_CAST( createdStr.c_str( ) ) ); + xmlTextWriterEndElement( writer ); // End of Created + xmlTextWriterStartElement( writer, BAD_CAST( "wsse:Expires" ) ); +- xmlTextWriterWriteRaw( writer, expiresStr ); ++ xmlTextWriterWriteRaw( writer, BAD_CAST( expiresStr.c_str() ) ); + xmlTextWriterEndElement( writer ); // End of Expires + xmlTextWriterEndElement( writer ); // End of Timestamp + |