[cpp-opensaml COMMIT] in /branches/REL_2: config_win32.h configure.ac saml/Makefile.am saml/saml.rc saml/util/CommonD...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan  9 00:35:31 2013
New Revision: 759

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=759&view=rev
Log:
https://issues.shibboleth.net/jira/browse/CPPOST-81

Modified:
    branches/REL_2/config_win32.h
    branches/REL_2/configure.ac
    branches/REL_2/saml/Makefile.am
    branches/REL_2/saml/saml.rc
    branches/REL_2/saml/util/CommonDomainCookie.cpp
    branches/REL_2/saml/version.h
    branches/REL_2/samlsign/samlsign.rc

Modified: branches/REL_2/config_win32.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/config_win32.h?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_2/config_win32.h (original)
+++ branches/REL_2/config_win32.h Wed Jan  9 00:35:31 2013
@@ -87,13 +87,13 @@
 #define PACKAGE_NAME "opensaml"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 2.5.1"
+#define PACKAGE_STRING "opensaml 2.5.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "opensaml"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.1"
+#define PACKAGE_VERSION "2.5.2"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -106,7 +106,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.5.1"
+#define VERSION "2.5.2"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

Modified: branches/REL_2/configure.ac
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/configure.ac?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_2/configure.ac (original)
+++ branches/REL_2/configure.ac Wed Jan  9 00:35:31 2013
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5.1],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.5.2],[https://issues.shibboleth.net/],[opensaml])
 AC_CONFIG_SRCDIR(saml)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)

Modified: branches/REL_2/saml/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/Makefile.am?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_2/saml/Makefile.am (original)
+++ branches/REL_2/saml/Makefile.am Wed Jan  9 00:35:31 2013
@@ -191,7 +191,7 @@
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 8:1:0
+libsaml_la_LDFLAGS = -version-info 8:2:0
 
 install-exec-hook:
 	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done

Modified: branches/REL_2/saml/saml.rc
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.rc?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_2/saml/saml.rc (original)
+++ branches/REL_2/saml/saml.rc Wed Jan  9 00:35:31 2013
@@ -28,8 +28,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,1,0
+ FILEVERSION 2,5,2,0
+ PRODUCTVERSION 2,5,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,13 +47,13 @@
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Shibboleth Consortium\0"
             VALUE "FileDescription", "OpenSAML Library\0"
-            VALUE "FileVersion", "2, 5, 1, 0\0"
+            VALUE "FileVersion", "2, 5, 2, 0\0"
 #ifdef _DEBUG
             VALUE "InternalName", "saml2_5D\0"
 #else
             VALUE "InternalName", "saml2_5\0"
 #endif
-            VALUE "LegalCopyright", "Copyright © 2012 UCAID\0"
+            VALUE "LegalCopyright", "Copyright © 2013 UCAID\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef _DEBUG
             VALUE "OriginalFilename", "saml2_5D.dll\0"
@@ -61,8 +61,8 @@
             VALUE "OriginalFilename", "saml2_5.dll\0"
 #endif
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "OpenSAML 2.5.1\0"
-            VALUE "ProductVersion", "2, 5, 1, 0\0"
+            VALUE "ProductName", "OpenSAML 2.5.2\0"
+            VALUE "ProductVersion", "2, 5, 2, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

Modified: branches/REL_2/saml/util/CommonDomainCookie.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/util/CommonDomainCookie.cpp?rev=759&r1=758&r2=759&view=diff
==============================================================================
--- branches/REL_2/saml/util/CommonDomainCookie.cpp (original)
+++ branches/REL_2/saml/util/CommonDomainCookie.cpp Wed Jan  9 00:35:31 2013
@@ -53,6 +53,9 @@
     split(m_list, b64, is_space(), algorithm::token_compress_on);
     free(b64);
 
+    // Remove empty elements.
+    m_list.erase(remove(m_list.begin(), m_list.end(), ""), m_list.end());
+
     // Now Base64 decode the list elements, overwriting them.
     xsecsize_t len;

[... 88 lines stripped ...]