From 2890c834f7ac79ec436884c2a5e5d4953e7930cc Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Mon, 2 Oct 2006 21:13:58 +0000 Subject: [PATCH] * Fix precedence problem. PR: 40658 Submitted by: Larry Cipriani Reviewed by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@452213 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/echo/mod_echo.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 3d487026ee..ef9b5436a7 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] + *) mod_echo: Fix precedence problem in if statement. PR 40658. + [Larry Cipriani ] + *) mod_mime_magic: Fix precedence problem in if statement. PR 40656. [Larry Cipriani ] diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c index 6c8a4113c1..ddbe972c58 100644 --- a/modules/echo/mod_echo.c +++ b/modules/echo/mod_echo.c @@ -63,9 +63,9 @@ static int process_echo_connection(conn_rec *c) bb = apr_brigade_create(c->pool, c->bucket_alloc); /* Get a single line of input from the client */ - if ((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, - APR_BLOCK_READ, 0) != APR_SUCCESS || - APR_BRIGADE_EMPTY(bb))) { + if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, + APR_BLOCK_READ, 0)) != APR_SUCCESS) || + APR_BRIGADE_EMPTY(bb)) { apr_brigade_destroy(bb); break; } -- 2.40.0