trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: TS-1189 Build problem with older versions of OpenSSL.
Date Thu, 05 Apr 2012 23:00:02 GMT
Updated Branches:
  refs/heads/master 040e5172a -> b7a63b49c


TS-1189 Build problem with older versions of OpenSSL.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b7a63b49
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b7a63b49
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b7a63b49

Branch: refs/heads/master
Commit: b7a63b49c4bec02693312e876ee700bddcd5a6cd
Parents: 040e517
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Thu Apr 5 16:58:38 2012 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Thu Apr 5 16:58:38 2012 -0600

----------------------------------------------------------------------
 CHANGES                          |    6 ++++--
 iocore/net/P_SSLNetVConnection.h |   11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7a63b49/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1822bb4..2a724b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.4
+  *) [TS-1189] Build problem with older versions of OpenSSL.
+
   *) [TS-1178] cop will kill manager & server, even cop it self, in cluster.
 
   *) [TS-1156] Fix timestamp log fields, and stop supporting network byte
@@ -16,7 +18,7 @@ Changes with Apache Traffic Server 3.1.4
   *) [TS-1036] Improve some squid log compatiblity. Suggestions from mnot.
 
   *) [TS-1092] Remove specific SSL termination mode, we either terminate, or
-    we do not.
+   we do not.
 
   *) [TS-1173] Improve the comments in remap.config.
 
@@ -45,7 +47,7 @@ Changes with Apache Traffic Server 3.1.4
   *) [TS-1114] Fix to lock vol for CacheVC::write_vector.
 
   *) [TS-857] Possibly related race in UnixNetVConnection::mainEvent
-              on inactivity timeout.
+   on inactivity timeout.
 
   *) [TS-1149] Pretty up automake output.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7a63b49/iocore/net/P_SSLNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 4375fb7..037b28c 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -40,6 +40,17 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
+// These are included here beacuse older OpenSSL libraries don't have them.
+// Don't copy these defines, or use their values directly, they are merely
+// here to avoid compiler errors.
+#ifndef SSL_TLSEXT_ERR_OK
+#define SSL_TLSEXT_ERR_OK 0
+#endif
+
+#ifndef SSL_TLSEXT_ERR_NOACK
+#define SSL_TLSEXT_ERR_NOACK 3
+#endif
+
 class SSLNextProtocolSet;
 
 //////////////////////////////////////////////////////////////////


Mime
View raw message