svn commit: r1795908 - in /httpd/httpd/branches/2.4.x: STATUS modules/filters/config.m4

[ji...@apache.org]

Author: jim
Date: Tue May 23 12:53:35 2017
New Revision: 1795908

URL: http://svn.apache.org/viewvc?rev=1795908&view=rev
Log:
This was for some reason not folded in during the larger patchset,
which had been approved and committed.

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/config.m4

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1795908&r1=1795907&r2=1795908&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 23 12:53:35 2017
@@ -203,15 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch:  svn merge -c 1795635 ^/httpd/httpd/trunk . (modulo CHANGES)
      +1: jailletc36, 
 
-  *) mod_brotli: unused variable error could mistakenly note that brotli isn't
-                 available
-     trunk patch: http://svn.apache.org/r1779077
-     2.4.x patch:  svn merge -c 1779077 ^/httpd/httpd/trunk .
-     +1: 
-     jailletc36: not tested (hence no vote), but brotli has been merged in the
-                 coming 2.4.26 and the changelog looks straightforward.
-                 r1791231 says it has been backported, but it is not.
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]
 

Modified: httpd/httpd/branches/2.4.x/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/config.m4?rev=1795908&r1=1795907&r2=1795908&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/config.m4 Tue May 23 12:53:35 2017
@@ -154,7 +154,8 @@ APACHE_MODULE(brotli, Brotli compression
     AC_MSG_CHECKING([for Brotli library >= 0.6.0 via prefix])
     AC_TRY_COMPILE(
       [#include <brotli/encode.h>],[
-const uint8_t *o = BrotliEncoderTakeOutput((BrotliEncoderState*)0, (size_t*)0);],
+const uint8_t *o = BrotliEncoderTakeOutput((BrotliEncoderState*)0, (size_t*)0);
+if (o) return *o;],
       [AC_MSG_RESULT(yes)
        ap_brotli_found=yes
        ap_brotli_cflags="-I${ap_brotli_base}/include"