From 604042b24c277a411dab471ca5836686c0facf85 Mon Sep 17 00:00:00 2001 From: Thomas Porzelt Date: Tue, 30 Sep 2008 20:26:21 +0200 Subject: [PATCH] fixed segfault in server_free() if workers are not allocated yet; removed virtualrequest.h include from base.h --- src/base.h | 1 - src/server.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/base.h b/src/base.h index 81a8818..106de00 100644 --- a/src/base.h +++ b/src/base.h @@ -44,7 +44,6 @@ typedef struct connection connection; #include "plugin.h" #include "request.h" #include "response.h" -#include "virtualrequest.h" #include "log.h" #include "connection.h" diff --git a/src/server.c b/src/server.c index 0255e18..cdfc1c0 100644 --- a/src/server.c +++ b/src/server.c @@ -85,7 +85,7 @@ void server_free(server* srv) { /* join all workers */ { guint i; - for (i = 1; i < srv->worker_count; i++) { + for (i = 1; i < srv->workers->len; i++) { worker *wrk; wrk = g_array_index(srv->workers, worker*, i); worker_exit(srv->main_worker, wrk); @@ -96,7 +96,7 @@ void server_free(server* srv) { /* free all workers */ { guint i; - for (i = 0; i < srv->worker_count; i++) { + for (i = 0; i < srv->workers->len; i++) { worker *wrk; struct ev_loop *loop; wrk = g_array_index(srv->workers, worker*, i);