httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1705684 - /httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
Date Mon, 28 Sep 2015 13:12:17 GMT
Author: jim
Date: Mon Sep 28 13:12:17 2015
New Revision: 1705684

URL: http://svn.apache.org/viewvc?rev=1705684&view=rev
Log:
oops

Modified:
    httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c?rev=1705684&r1=1705683&r2=1705684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c Mon Sep 28 13:12:17 2015
@@ -2135,7 +2135,6 @@ int ssl_callback_SessionTicket(SSL *ssl,
 }
 #endif /* HAVE_TLS_SESSION_TICKETS */
 
-<<<<<<< .working
 #ifdef HAVE_TLS_ALPN
 
 /*



Mime
View raw message