head	1.2;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.05.31.17.38.58;	author mm;	state dead;
branches;
next	1.1;

1.1
date	2012.03.19.09.18.13;	author mm;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.4.31
@
text
@Index: src/connections.c
===================================================================
--- src/connections.c	(revision 2821)
+++ src/connections.c	(revision 2822)
@@@@ -1360,9 +1360,7 @@@@
 			}
 
 			con->renegotiations = 0;
-#ifndef OPENSSL_NO_TLSEXT
 			SSL_set_app_data(con->ssl, con);
-#endif
 			SSL_set_accept_state(con->ssl);
 			con->conf.is_ssl=1;
 
@


1.1
log
@Add patch for upstream bug #2391
Reorganize patches

Feature safe:	yes
@
text
@@

