You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/02 06:16:16 UTC
svn commit: r991801 - in /trafficserver/traffic/trunk: CHANGES
iocore/net/SSLConfig.cc
Author: zwoop
Date: Thu Sep 2 04:16:15 2010
New Revision: 991801
URL: http://svn.apache.org/viewvc?rev=991801&view=rev
Log:
TS-405 Fixes for seprate certa and key files for SSL.
Tested on FC 13.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=991801&r1=991800&r2=991801&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Thu Sep 2 04:16:15 2010
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 2.1.3
+ *) Problems with specifying separate config files for SSL certificates and
+ keys [TS-405].
+
*) TS fails to use user ID with user name longer than 8 characters
[TS-420].
@@ -121,7 +124,7 @@ Changes with Apache Traffic Server 2.1.0
Changes with Apache Traffic Server 2.0.1
- *) Port of CVE-2010-2952 for 2.0.x [TS-TS-425].
+ *) Port of CVE-2010-2952 for 2.0.x [TS-425].
*) Backport part of TS-322 that deals with indexing arrays with char
(author: Marcus Ruckert) [TS-334].
Modified: trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLConfig.cc?rev=991801&r1=991800&r2=991801&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLConfig.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLConfig.cc Thu Sep 2 04:16:15 2010
@@ -332,7 +332,7 @@ SslConfigParams::initialize()
serverKeyPathOnly = xstrdup(Layout::get()->prefix);
}
if (ssl_server_private_key_filename != NULL) {
- serverKeyPath = Layout::relative_to(serverKeyPathOnly, ssl_server_private_key_path);
+ serverKeyPath = Layout::relative_to(serverKeyPathOnly, ssl_server_private_key_filename);
#ifdef _WIN32
i = 0;