head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


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

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


desc
@@


1.2
log
@Update to 1.4.30
Unbreak build if using libev
@
text
@Index: src/network.c
===================================================================
--- src/network.c	(revision 2801)
+++ src/network.c	(revision 2802)
@@@@ -480,9 +480,11 @@@@
 	network_backend_t backend;
 
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#ifndef OPENSSL_NO_ECDH
 	EC_KEY *ecdh;
 	int nid;
 #endif
+#endif
 
 #ifdef USE_OPENSSL
 	DH *dh;
@


1.1
log
@Add patches from upstream (svn revisions):
 - r2799: Always use our 'own' md5 implementation (fixes #2331)
 - r2800: fix some gcc warnings
 - r2801: Limit amount of bytes we send in one go; fixes stalling in one
	  connection and timeouts on slow systems.
 - r2802: [ssl] fix build errors when Elliptic-Curve Diffie-Hellman
	  is disabled
 - r2803: Add static-file.disable-pathinfo option to prevent handling
	  of urls like .../secret.php/image.jpg as static file
 - r2804: Don't overwrite 401 (auth required) with 501 (unknown method)
	  (fixes #2341)

Add test and regression-test targets.
@
text
@@

