From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 26 Jan 2016 14:34:57 +0000 (+0000)
Subject: mod_http2: merge r1726798 from trunk.
X-Git-Tag: 2.4.19~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=313a847b082dabcc529c1ec8b4252c9c854a888a;p=apache

mod_http2: merge r1726798 from trunk.
Fix warnings:
modules/http2/h2_util.c|174| warning: suggest parentheses around ‘+’ in operand of ‘&’
modules/http2/h2_util.c|176| warning: suggest parentheses around ‘+’ in operand of ‘&’

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1726801 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index 47e70843e9..58bdcf3cf3 100644
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -170,10 +170,10 @@ const char *h2_util_base64url_encode(const char *data,
     enc = p;
     for (i = 0; i < mlen; i+= 3) {
         *p++ = BASE64URL_CHARS[ (udata[i] >> 2) & 0x3fu ];
-        *p++ = BASE64URL_CHARS[ (udata[i] << 4) + 
-                               ((i+1 < len)? (udata[i+1] >> 4) : 0) & 0x3fu ];
-        *p++ = BASE64URL_CHARS[ (udata[i+1] << 2) + 
-                               ((i+2 < len)? (udata[i+2] >> 6) : 0) & 0x3fu ];
+        *p++ = BASE64URL_CHARS[ ((udata[i] << 4) + 
+                                 ((i+1 < len)? (udata[i+1] >> 4) : 0)) & 0x3fu ];
+        *p++ = BASE64URL_CHARS[ ((udata[i+1] << 2) + 
+                                 ((i+2 < len)? (udata[i+2] >> 6) : 0)) & 0x3fu ];
         if (i+2 < len) {
             *p++ = BASE64URL_CHARS[ udata[i+2] & 0x3fu ];
         }