Commit 44f4e331 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r452213 from trunk: 

* Fix precedence problem.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@452462 13f79535-47bb-0310-9956-ffa450edef68
parent 942931ca

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









  *) 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>]










































modules/echo/mod_echo.c



+3
−3



























Changes for modules/echo/mod_echo.c: 3 added lines, 3 removed lines.



Original line number
Diff line number
Diff line







@@ -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;









        }