Commit e05f1df3 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

This was for some reason not folded in during the larger patchset, 

which had been approved and committed.


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

STATUS

+0 −9
Original line number Diff line number Diff line
@@ -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 ]

modules/filters/config.m4

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ APACHE_MODULE(brotli, Brotli compression support, , , most, [ 
    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"