src/main/stream.c

@@ -506,7 +506,6 @@ void li_iostream_acquire(liIOStream* iostream) {
 }
 
 void li_iostream_release(liIOStream* iostream) {
-	if (iostream == NULL) return;
 	li_stream_release(&iostream->stream_in);
 	li_stream_release(&iostream->stream_out);
 }
@@ -527,6 +526,8 @@ int li_iostream_reset(liIOStream *iostream) {
 	li_stream_disconnect(&iostream->stream_out);
 	li_stream_disconnect_dest(&iostream->stream_in);
 
+	li_iostream_release(iostream);
+
 	return fd;
 }
 

src/main/stream_simple_socket.c

@@ -19,6 +19,7 @@ void li_stream_simple_socket_close(liIOStream *stream, gboolean aborted) {
 	}
 
 	if (aborted || stream->in_closed) {
+		li_iostream_acquire(stream);
 		fd = li_iostream_reset(stream);
 		if (-1 != fd) {
 			shutdown(fd, SHUT_RDWR);

src/modules/fastcgi_stream.c

@@ -200,7 +200,6 @@ static void backend_close(liBackendPool *bpool, liWorker *wrk, liBackendConnecti
 		li_stream_simple_socket_close(ctx->iostream, FALSE);
 		fd = li_iostream_reset(ctx->iostream);
 		LI_FORCE_ASSERT(-1 == fd);
-		li_iostream_release(ctx->iostream);
 		ctx->iostream = NULL;
 	}
 	li_stream_reset(&ctx->fcgi_in);
@@ -282,7 +281,6 @@ static void fastcgi_reset(liFastCGIBackendContext *ctx) {
 		li_stream_simple_socket_close(iostream, TRUE);
 		fd = li_iostream_reset(iostream);
 		LI_FORCE_ASSERT(-1 == fd);
-		li_iostream_release(iostream);
 
 		li_stream_disconnect(&ctx->fcgi_out);
 		li_stream_disconnect_dest(&ctx->fcgi_in);

src/modules/mod_openssl.c

@@ -213,7 +213,6 @@ static gboolean openssl_con_new(liConnection *con, int fd) {
 		ERROR(srv, "SSL_new: %s", ERR_error_string(ERR_get_error(), NULL));
 		fd = li_iostream_reset(conctx->sock_stream);
 		close(fd);
-		li_iostream_release(conctx->sock_stream);
 		g_slice_free(openssl_connection_ctx, conctx);
 		return FALSE;
 	}

tests/t-dirlist.py

@@ -28,7 +28,6 @@ class Test(GroupTest):
 		TestDirlist,
 		TestRedirectDir,
 		TestRedirectDirWithQuery,
-		TestRedirectDirWithQueryAndSpecialChars,
 	]
 
 	config = """