httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r452462 - in /httpd/httpd/branches/2.2.x: CHANGES modules/echo/mod_echo.c
Date Tue, 03 Oct 2006 12:49:43 GMT
Author: rpluem
Date: Tue Oct  3 05:49:42 2006
New Revision: 452462

URL: http://svn.apache.org/viewvc?view=rev&rev=452462
Log:
Merge r452213 from trunk:

* Fix precedence problem.

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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/echo/mod_echo.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=452462&r1=452461&r2=452462
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct  3 05:49:42 2006
@@ -1,6 +1,9 @@
                                                         -*- 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>]
 

Modified: httpd/httpd/branches/2.2.x/modules/echo/mod_echo.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/echo/mod_echo.c?view=diff&rev=452462&r1=452461&r2=452462
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/echo/mod_echo.c (original)
+++ httpd/httpd/branches/2.2.x/modules/echo/mod_echo.c Tue Oct  3 05:49:42 2006
@@ -63,9 +63,9 @@
         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;
         }



Mime
View raw message