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/mod_staticfile.c
===================================================================
--- src/mod_staticfile.c	(revision 2799)
+++ src/mod_staticfile.c	(revision 2800)
@@@@ -350,7 +350,6 @@@@
 URIHANDLER_FUNC(mod_staticfile_subrequest) {
 	plugin_data *p = p_d;
 	size_t k;
-	int s_len;
 	stat_cache_entry *sce = NULL;
 	buffer *mtime = NULL;
 	data_string *ds;
@@@@ -376,8 +375,6 @@@@
 
 	mod_staticfile_patch_connection(srv, con, p);
 
-	s_len = con->uri.path->used - 1;
-
 	/* ignore certain extensions */
 	for (k = 0; k < p->conf.exclude_ext->used; k++) {
 		ds = (data_string *)p->conf.exclude_ext->data[k];
Index: src/mod_userdir.c
===================================================================
--- src/mod_userdir.c	(revision 2799)
+++ src/mod_userdir.c	(revision 2800)
@@@@ -166,7 +166,6 @@@@
 
 URIHANDLER_FUNC(mod_userdir_docroot_handler) {
 	plugin_data *p = p_d;
-	int uri_len;
 	size_t k;
 	char *rel_url;
 #ifdef HAVE_PWD_H
@@@@ -182,8 +181,6 @@@@
 	 */
 	if (p->conf.path->used == 0) return HANDLER_GO_ON;
 
-	uri_len = con->uri.path->used - 1;
-
 	/* /~user/foo.html -> /home/user/public_html/foo.html */
 
 	if (con->uri.path->ptr[0] != '/' ||
Index: src/mod_fastcgi.c
===================================================================
--- src/mod_fastcgi.c	(revision 2799)
+++ src/mod_fastcgi.c	(revision 2800)
@@@@ -3132,7 +3132,6 @@@@
 	plugin_data *p = p_d;
 
 	handler_ctx *hctx = con->plugin_ctx[p->id];
-	fcgi_proc *proc;
 	fcgi_extension_host *host;
 
 	if (NULL == hctx) return HANDLER_GO_ON;
@@@@ -3201,7 +3200,6 @@@@
 	/* ok, create the request */
 	switch(fcgi_write_request(srv, hctx)) {
 	case HANDLER_ERROR:
-		proc = hctx->proc;
 		host = hctx->host;
 
 		if (hctx->state == FCGI_STATE_INIT ||
@


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

