View | Details | Raw Unified | Return to bug 246373 | Differences between
and this patch

Collapse All | Expand All

(-)b/native/include/ssl_private.h (-1 / +1 lines)
Lines 241-247 Link Here
241
#define TLS_server_method                SSLv23_server_method
241
#define TLS_server_method                SSLv23_server_method
242
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
242
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
243
243
244
#if OPENSSL_VERSION_NUMBER >= 0x10101000L
244
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
245
#define HAVE_KEYLOG_CALLBACK
245
#define HAVE_KEYLOG_CALLBACK
246
#endif
246
#endif
247
247
(-)b/xdocs/miscellaneous/changelog.xml (-2 / +15 lines)
Lines 34-39 Link Here
34
  This is the Changelog for Tomcat Native 1.2.
34
  This is the Changelog for Tomcat Native 1.2.
35
  </p>
35
  </p>
36
</section>
36
</section>
37
<section name="Changes in 1.2.25">
38
  <changelog>
39
    <fix>
40
      Incomplete name mangling fix for C++ compilers in tcn_api.h. (michaelo)
41
    </fix>
42
    <update>
43
      Improve OS-specific header include for native thread id. (michaelo)
44
    </update>
45
    <fix>
46
      Disable keylog callback support for LibreSSL. (michaelo)
47
    </fix>
48
  </changelog>
49
</section>
37
<section name="Changes in 1.2.24">
50
<section name="Changes in 1.2.24">
38
  <changelog>
51
  <changelog>
39
    <fix>
52
    <fix>
Lines 62-68 Link Here
62
      OpenSSL 1.1.0 onwards. (mturk)
75
      OpenSSL 1.1.0 onwards. (mturk)
63
    </update>
76
    </update>
64
    <add>
77
    <add>
65
      Introduce tcn_get_thread_id(void) to reduce code duplication. (michaelo)
78
      <bug>64316</bug>: Introduce tcn_get_thread_id(void) to reduce code
79
	  duplication. (michaelo)
66
    </add>
80
    </add>
67
    <fix>
81
    <fix>
68
      Fix linking against OpenSSL in non-standard locations on FreeBSD.
82
      Fix linking against OpenSSL in non-standard locations on FreeBSD.
69
- 

Return to bug 246373