From fcfd9767cc9ac293a42e77b0b8ef4e55a82f9fe6 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 24 Dec 2021 11:24:50 +0900 Subject: [PATCH] Imported Upstream version 0.11.6 --- CMakeLists.txt | 4 +- ChangeLog | 14 +++++ RELEASE | 1 - src/wbxml_tables.c | 2 +- test/tools/CMakeLists.txt | 2 +- .../activesync-012-provision-eas.xml | 63 +++++++++++++++++++ 6 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 test/tools/activesync/activesync-012-provision-eas.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a810bd..bbdad87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT( libwbxml C ) SET( LIBWBXML_VERSION_MAJOR "0" ) SET( LIBWBXML_VERSION_MINOR "11" ) -SET( LIBWBXML_VERSION_PATCH "5" ) +SET( LIBWBXML_VERSION_PATCH "6" ) IF( LIBWBXML_VERSION_BETA ) IF( LIBWBXML_VERSION_BETA VERSION_GREATER 90 ) MATH( EXPR LIBWBXML_VERSION_MINOR "${LIBWBXML_VERSION_MINOR} - 1" ) @@ -23,7 +23,7 @@ SET( LIBWBXML_LIBVERSION_CURRENT 1 ) # UPDATE: last release. # UPDATE: Set REVISION to 0 if any interface have been added, removed or # UPDATE: changed since the last update. -SET( LIBWBXML_LIBVERSION_REVISION 5 ) +SET( LIBWBXML_LIBVERSION_REVISION 6 ) # The difference between the newest and the oldest interfaces. # UPDATE: If any interface have been added since the last public diff --git a/ChangeLog b/ChangeLog index d8894bc..396b04b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2017-08-15 Michael Bell + * Released 0.11.6 + * Fixed/changed the encoding of element Content in CodePage + AirSyncBase (0x11) to WBXML_BINARY_OPTION for Microsoft ActiveSync. + This element is used when the clients send a request to save a draft + email. An example can be found in: + http://interoperability.blob.core.windows.net/files/MS-ASEMAIL/[MS-ASEMAIL].pdf + (4.4 Adding a Draft Email with Attachments). + Reference: + https://msdn.microsoft.com/en-us/library/mt563406%28v=exchg.80%29.aspx + (issue #58 from Thomas Führer) + * Added a testcase for Microsoft ActiveSync EAS Provisioning + (clarifies issue #56). + 2017-02-12 Michael Bell * Released 0.11.5 * Fixed ActiveSync element data of code pages ResolveRecipients and diff --git a/RELEASE b/RELEASE index 97e6c3c..2be69a2 100644 --- a/RELEASE +++ b/RELEASE @@ -24,7 +24,6 @@ To make a release of libwbxml, do the following: * Reset to 0 if any interface has been removed since last release. If any interface has been added then increment. - - Run "make test" again several times to try to see race conditions. "cd trunk" "cmake . -B/tmp/build/libwbxml" diff --git a/src/wbxml_tables.c b/src/wbxml_tables.c index fc678f8..867d0f4 100644 --- a/src/wbxml_tables.c +++ b/src/wbxml_tables.c @@ -3088,7 +3088,7 @@ const WBXMLTagEntry sv_airsync_tag_table[] = { { "Add", 0x11, 0x1c }, /* since 16.0 */ { "Delete", 0x11, 0x1d }, /* since 16.0 */ { "ClientId", 0x11, 0x1e }, /* since 16.0 */ - { "Content", 0x11, 0x1f }, /* since 16.0 */ + { "Content", 0x11, 0x1f, WBXML_TAG_OPTION_BINARY }, /* since 16.0 */ { "Location", 0x11, 0x20 }, /* since 16.0 */ { "Annotation", 0x11, 0x21 }, /* since 16.0 */ { "Street", 0x11, 0x22 }, /* since 16.0 */ diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt index 3ee8044..c6918cf 100644 --- a/test/tools/CMakeLists.txt +++ b/test/tools/CMakeLists.txt @@ -2,7 +2,7 @@ ENABLE_TESTING() CONFIGURE_FILE( "launchTests.sh" "${CMAKE_CURRENT_BINARY_DIR}/launchTests.sh") CONFIGURE_FILE( "normalize_xml.pl" "${CMAKE_CURRENT_BINARY_DIR}/normalize_xml.pl" @ONLY) -SET( activesync_tests 13 ) +SET( activesync_tests 14 ) SET( airsync_tests 4 ) SET( ddf_tests 2 ) # 2009-Jan-19 bellmich diff --git a/test/tools/activesync/activesync-012-provision-eas.xml b/test/tools/activesync/activesync-012-provision-eas.xml new file mode 100644 index 0000000..e507a64 --- /dev/null +++ b/test/tools/activesync/activesync-012-provision-eas.xml @@ -0,0 +1,63 @@ + + + + + 1 + + 1 + + + MS-EAS-Provisioning-WBXML + 1 + 1686474474 + + + 0 + 0 + 0 + + + 0 + 1 + + + + + 1 + + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 0 + 1 + 0 + 1 + 0 + -1 + -1 + 0 + 0 + 0 + 0 + 2 + 1 + 1 + 1 + 1 + 1 + + + + + + + -- 2.34.1