-Index: docs/manual/mod/directives.html.en
-===================================================================
---- docs/manual/mod/directives.html.en	(revision 1681722)
-+++ docs/manual/mod/directives.html.en	(working copy)
-@@ -548,6 +548,7 @@
- <li><a href="mod_include.html#ssistarttag">SSIStartTag</a></li>
- <li><a href="mod_include.html#ssitimeformat">SSITimeFormat</a></li>
- <li><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho</a></li>
-+<li><a href="mod_ssl.html#sslalpnpreference">SSLALPNPreference</a></li>
- <li><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile</a></li>
- <li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
- <li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
-Index: docs/manual/mod/mod_ssl.html.en
-===================================================================
---- docs/manual/mod/mod_ssl.html.en	(revision 1681722)
-+++ docs/manual/mod/mod_ssl.html.en	(working copy)
-@@ -53,6 +53,7 @@
- <li><img alt="" src="../images/down.gif" /> <a href="#authzproviders">Authorization providers for use with Require</a></li>
- </ul><h3 class="directives">Directives</h3>
- <ul id="toc">
-+<li><img alt="" src="../images/down.gif" /> <a href="#sslalpnpreference">SSLALPNPreference</a></li>
- <li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatefile">SSLCACertificateFile</a></li>
- <li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatepath">SSLCACertificatePath</a></li>
- <li><img alt="" src="../images/down.gif" /> <a href="#sslcadnrequestfile">SSLCADNRequestFile</a></li>
-@@ -323,6 +324,30 @@
- 
- </div>
- <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-+<div class="directive-section"><h2><a name="SSLALPNPreference" id="SSLALPNPreference">SSLALPNPreference</a> <a name="sslalpnpreference" id="sslalpnpreference">Directive</a></h2>
-+<table class="directive">
-+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure protocol preference for Application-Layer Protocol Negotiation (RFC 7301)</td></tr>
-+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLALPNPreference <em>protocol-id</em> ...</code></td></tr>
-+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
-+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available if using OpenSSL 1.0.2 or later</td></tr>
-+</table>
-+<p>This directive overrides preferences by implementations of application-layer
-+protocols during negotiation. Protocol IDs must be specified in terms of the
-+"Identification Sequence" from IANA's Application-Layer Protocol
-+Negotiation (ALPN) Protocol IDs registry. The protocol specified first gets
-+precedence over later or unspecified protocols. This list is evaluated
-+against client capabilities.</p>
-+
-+<div class="example"><h3>Examples</h3><pre class="prettyprint lang-config">SSLALPNPreference h2 spdy/3</pre>
-+<p>For clients which support both protocols, <code>h2</code> will be selected. For
-+clients which only support <code>spdy/3</code>, that one will be chosen. If a client
-+supports only protocol X and there is support for X in httpd, the
-+negotiation will select X.</p></div>
-+
-+</div>
-+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
- <div class="directive-section"><h2><a name="SSLCACertificateFile" id="SSLCACertificateFile">SSLCACertificateFile</a> <a name="sslcacertificatefile" id="sslcacertificatefile">Directive</a></h2>
- <table class="directive">
- <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA Certificates
 Index: docs/manual/mod/mod_ssl.xml
 ===================================================================
 --- docs/manual/mod/mod_ssl.xml	(revision 1681722)

===================================================================
--- modules/ssl/ssl_private.h	(revision 1681722)
+++ modules/ssl/ssl_private.h	(working copy)
@@ -148,6 +148,11 @@
 #define HAVE_ECC
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_NEXTPROTONEG) \
+    && !defined(OPENSSL_NO_TLSEXT)
+#define HAVE_TLS_NPN
+#endif
+
 /* OCSP stapling */
 #if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb)
 #define HAVE_OCSP_STAPLING
@@ -182,6 +187,11 @@
 #include <openssl/srp.h>
 #endif

 /**  Session Cache Support  */
 apr_status_t ssl_scache_init(server_rec *, apr_pool_t *);
 void         ssl_scache_status_register(apr_pool_t *p);
