Commit de2e43d9 authored by Joe Orton's avatar Joe Orton
Browse files

Fix mis-merge and revert local change accidentally committed. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1769589 13f79535-47bb-0310-9956-ffa450edef68
parent 48960f7b

CHANGES

+0 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,6 @@ Changes with Apache 2.4.24 
  *) mod_dav: Add support for childtags to dav_error.

  *) mod_dav: Add support for childtags to dav_error.

     [Jari Urpalainen <jari.urpalainen nokia.com>]

     [Jari Urpalainen <jari.urpalainen nokia.com>]





>>>>>>> .merge-right.r1769587

  *) mod_proxy_fcgi: Fix 2.4.23 breakage for mod_rewrite per-dir and query 

  *) mod_proxy_fcgi: Fix 2.4.23 breakage for mod_rewrite per-dir and query 

     string showing up in SCRIPT_FILENAME. PR59815

     string showing up in SCRIPT_FILENAME. PR59815

configure.in

+1 −3
Original line number Original line Diff line number Diff line
@@ -158,9 +158,7 @@ else 
   ifdef([APR_FIND_APU], [

   ifdef([APR_FIND_APU], [

     APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 

     APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 

                  1, ${apr_major_version})

                  1, ${apr_major_version})

   ], [apu_found=no

   ], [apu_found=no])

      AC_MSG_NOTICE([APR-util 1.x not supported with APR 1.x])

      ])

fi

fi





if test "$apu_found" = "no"; then

if test "$apu_found" = "no"; then