 diff -ru gen/httpd-2.4.x/modules/ssl/ssl_engine_init.c modules/ssl/ssl_engine_init.c
 --- gen/httpd-2.4.x/modules/ssl/ssl_engine_init.c	2015-01-19 16:52:30.000000000 +0100
 +++ modules/ssl/ssl_engine_init.c	2015-01-19 15:42:53.908000000 +0100
-@@ -623,6 +613,14 @@
+@@ -623,6 +613,15 @@
      SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
  
      SSL_CTX_set_info_callback(ctx, ssl_callback_Info);

 #ifdef HAVE_SRP
 const char *ssl_cmd_SSLSRPVerifierFile(cmd_parms *cmd, void *dcfg, const char *arg);
 const char *ssl_cmd_SSLSRPUnknownUserSeed(cmd_parms *cmd, void *dcfg, const char *arg);
@@ -796,6 +811,14 @@
                                        EVP_CIPHER_CTX *, HMAC_CTX *, int);
 #endif
 

+
+	return SSL_TLSEXT_ERR_OK;
+}
+#endif
+#if defined(HAVE_TLS_NPN)
+/*
+ * This callback function is executed when SSL needs to decide what protocols
+ * to advertise during Next Protocol Negotiation (NPN).  It must produce a
