* Fix precedence problem.

PR: 40658
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@452213 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3d487026ee83206e8b80353680d569def48cee82..ef9b5436a7df509de848f014cf87cbba1f6f20c5 100644 (file)
--- 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 <lvc lucent.com>]
+
   *) mod_mime_magic: Fix precedence problem in if statement. PR 40656.
      [Larry Cipriani <lvc lucent.com>]
 

diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index 6c8a4113c197170c0010af2dc9d2b49eeebbfb67..ddbe972c589231ff517b6f500194f549233464c4 100644 (file)
--- 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;
         }