  /**  Session Cache Support  */
  apr_status_t ssl_scache_init(server_rec *, apr_pool_t *);
  void         ssl_scache_status_register(apr_pool_t *p);
-Index: .
-===================================================================
---- .	(revision 1681722)
-+++ .	(working copy)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
-   Merged /httpd/httpd/trunk:r1332643,1487772,1670397,1670434,1670436,1670578,1675459,1676004,1676709

===================================================================
--- 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

+</directivesynopsis>
+
 </modulesynopsis>
Index: modules/ssl/mod_ssl.c
===================================================================
--- modules/ssl/mod_ssl.c	(revision 1681722)
