Browse Source

remove logical dead code

From: Stefan Bühler <stbuehler@web.de>

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2945 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.35
Stefan Bühler 8 years ago
parent
commit
bcd35cc264
  1. 1
      NEWS
  2. 6
      src/mod_compress.c
  3. 2
      src/network.c

1
NEWS

@ -11,6 +11,7 @@ NEWS
* [mod_fastcgi,mod_scgi] fix resource leaks on spawning backends
* [mod_magnet] fix memory leak
* add comments for switch fall throughs
* remove logical dead code
- 1.4.34
* [mod_auth] explicitly link ssl for SHA1 (fixes #2517)

6
src/mod_compress.c

@ -413,7 +413,7 @@ static int deflate_file_to_buffer_bzip2(server *srv, connection *con, plugin_dat
static int deflate_file_to_file(server *srv, connection *con, plugin_data *p, buffer *fn, stat_cache_entry *sce, int type) {
int ifd, ofd;
int ret = -1;
int ret;
void *start;
const char *filename = fn->ptr;
ssize_t r;
@ -526,6 +526,7 @@ static int deflate_file_to_file(server *srv, connection *con, plugin_data *p, bu
}
#endif
ret = -1;
switch(type) {
#ifdef USE_ZLIB
case HTTP_ACCEPT_ENCODING_GZIP:
@ -542,9 +543,6 @@ static int deflate_file_to_file(server *srv, connection *con, plugin_data *p, bu
ret = deflate_file_to_buffer_bzip2(srv, con, p, start, sce->st.st_size);
break;
#endif
default:
ret = -1;
break;
}
if (ret == 0) {

2
src/network.c

@ -543,7 +543,6 @@ static X509* x509_load_pem_file(server *srv, const char *file) {
return x;
error:
if (NULL != x) X509_free(x);
if (NULL != in) BIO_free(in);
return NULL;
}
@ -573,7 +572,6 @@ static EVP_PKEY* evp_pkey_load_pem_file(server *srv, const char *file) {
return x;
error:
if (NULL != x) EVP_PKEY_free(x);
if (NULL != in) BIO_free(in);
return NULL;
}

Loading…
Cancel
Save