From 525bc5bdeca4366046c987b1c5d5b5d420e62a45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= Date: Fri, 3 Jul 2009 14:43:44 +0000 Subject: [PATCH] Simplified conditions. --- org.glite.lb.server/src/bkserverd.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index e06dd1d..c28dde2 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -1412,24 +1412,21 @@ int bk_accept_serve(int conn, struct timeval *timeout, void *cdata) memcpy(&ctx->p_tmp_timeout, timeout, sizeof(ctx->p_tmp_timeout)); gettimeofday(&before, NULL); err = edg_wll_AcceptHTTP(ctx, &body, &resp, &hdrOut, &bodyOut, &httpErr); - if (httpErr != HTTP_BADREQ){ - if (err && (err = handle_server_error(ctx))){ - edg_wll_DoneHTTP(ctx, resp, hdrOut, bodyOut); - free(resp); - free(bodyOut); - if (body) - free(body); - // hdrOut are static - return err; - } + if (err && (err = handle_server_error(ctx))){ + edg_wll_DoneHTTP(ctx, resp, hdrOut, bodyOut); + free(resp); + free(bodyOut); + if (body) + free(body); + // hdrOut are static + return err; } - err = 0; #ifdef GLITE_LB_SERVER_WITH_WS if (httpErr == HTTP_BADREQ) err = try_accept_ws(conn, timeout, cdata, body, strlen(body) + 1); #endif - if (!err) + if (err) edg_wll_DoneHTTP(ctx, resp, hdrOut, bodyOut); free(resp); -- 1.8.2.3