* mod_http2/mod_proxy_http2: fix a bug in calculating the log2 value of

    integers, used in push diaries and proxy window size calculations.
    PR69741 [Benjamin P. Kallus]

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

diff --git a/changes-entries/pr69741.txt b/changes-entries/pr69741.txt
new file mode 100644 (file)
index 0000000..2b1d876
--- /dev/null
+++ b/changes-entries/pr69741.txt
@@ -0,0 +1,3 @@
+  * mod_http2/mod_proxy_http2: fix a bug in calculating the log2 value of
+    integers, used in push diaries and proxy window size calculations.
+    PR69741 [Benjamin P. Kallus]

diff --git a/modules/http2/h2_proxy_util.c b/modules/http2/h2_proxy_util.c
index 5e1ebe663db5e2951b7254cb8adaa0de74f64346..c0b3948c2ed89ffd4920ba906ac563511888e394 100644 (file)
--- a/modules/http2/h2_proxy_util.c
+++ b/modules/http2/h2_proxy_util.c
@@ -34,7 +34,7 @@
 APLOG_USE_MODULE(proxy_http2);
 
 /* h2_log2(n) iff n is a power of 2 */
-unsigned char h2_proxy_log2(int n)
+unsigned char h2_proxy_log2(unsigned int n)
 {
     int lz = 0;
     if (!n) {

diff --git a/modules/http2/h2_proxy_util.h b/modules/http2/h2_proxy_util.h
index 202363dede8d2de41802f8091ef978f8849e53dc..610908eeb246b9fffdb2bad87d1f76d683db2eaf 100644 (file)
--- a/modules/http2/h2_proxy_util.h
+++ b/modules/http2/h2_proxy_util.h
@@ -150,7 +150,7 @@ int h2_proxy_iq_shift(h2_proxy_iqueue *q);
  * common helpers
  ******************************************************************************/
 /* h2_proxy_log2(n) iff n is a power of 2 */
-unsigned char h2_proxy_log2(int n);
+unsigned char h2_proxy_log2(unsigned int n);
 
 /*******************************************************************************
  * HTTP/2 header helpers

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index 605c348ca127fef657e55bc7ebe947ed1ed04578..685e771eaa42461d1460e48f59362d904605706d 100644 (file)
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -32,7 +32,7 @@
 #include "h2_util.h"
 
 /* h2_log2(n) iff n is a power of 2 */
-unsigned char h2_log2(int n)
+unsigned char h2_log2(unsigned int n)
 {
     int lz = 0;
     if (!n) {

diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h
index d1a809c52bfc9a412b84f18896bb2fbf49cfadd5..e813bf586f95bb157798fb2977ca3a440c0ded90 100644 (file)
--- a/modules/http2/h2_util.h
+++ b/modules/http2/h2_util.h
@@ -323,7 +323,7 @@ apr_status_t h2_ififo_remove(h2_ififo *fifo, int id);
  * common helpers
  ******************************************************************************/
 /* h2_log2(n) iff n is a power of 2 */
-unsigned char h2_log2(int n);
+unsigned char h2_log2(unsigned int n);
 
 /**
  * Count the bytes that all key/value pairs in a table have