tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1292706 - in /tomcat/native/branches/1.1.x: build.xml native/include/tcn_version.h native/os/win32/libtcnative.rc native/src/sslcontext.c
Date Thu, 23 Feb 2012 08:45:32 GMT
Author: mturk
Date: Thu Feb 23 08:45:32 2012
New Revision: 1292706

URL: http://svn.apache.org/viewvc?rev=1292706&view=rev
Log:
Bump versions to current candidate

Modified:
    tomcat/native/branches/1.1.x/build.xml
    tomcat/native/branches/1.1.x/native/include/tcn_version.h
    tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
    tomcat/native/branches/1.1.x/native/src/sslcontext.c

Modified: tomcat/native/branches/1.1.x/build.xml
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1292706&r1=1292705&r2=1292706&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Thu Feb 23 08:45:32 2012
@@ -33,7 +33,7 @@
     <property name="year"                  value="2012" />
     <property name="version.major"         value="1" />
     <property name="version.minor"         value="1" />
-    <property name="version.build"         value="17" />
+    <property name="version.build"         value="23" />
     <property name="version.patch"         value="0" />
     <property name="version.suffix"        value="-dev" />
 

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1292706&r1=1292705&r2=1292706&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Thu Feb 23 08:45:32 2012
@@ -69,7 +69,7 @@ extern "C" {
 #define TCN_MINOR_VERSION       1
 
 /** patch level */
-#define TCN_PATCH_VERSION       22
+#define TCN_PATCH_VERSION       23
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This

Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=1292706&r1=1292705&r2=1292706&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Thu Feb 23 08:45:32 2012
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
                      "See the License for the specific language governing " \
                      "permissions and limitations under the License."
 
-#define TCN_VERSION "1.1.22"
+#define TCN_VERSION "1.1.23"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,22,0
- PRODUCTVERSION 1,1,22,0
+ FILEVERSION 1,1,23,0
+ PRODUCTVERSION 1,1,23,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=1292706&r1=1292705&r2=1292706&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Thu Feb 23 08:45:32 2012
@@ -484,6 +484,8 @@ static X509 *load_pem_cert(tcn_ssl_ctxt_
         BIO_free(bio);
         return NULL;
     }
+    if (!cb_data)
+        cb_data = &tcn_password_callback;
     cert = PEM_read_bio_X509_AUX(bio, NULL,
                 (pem_password_cb *)SSL_password_callback,
                 (void *)cb_data);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message