Commit 0b69ede0 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1693919 from trunk: 

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202. 

Submitted By: Daniel Shahaf 
Committed By: covener



Submitted by: covener
Reviewed/backported by: jim


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.17



  *) apxs: Add HTTPD_VERSION and HTTPD_MMN to the variables available with 

     apxs -q. PR58202. [Daniel Shahaf <danielsh apache.org>]



  *) mod_authz_dbd: Avoid a crash when lacking correct DB access permissions.

     PR 57868. [Jose Kahan <jose w3.org>, Yann Ylavic]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) apxs: add HTTPD_MMN and HTTPD_VERSION to apxs -q

     trunk: http://svn.apache.org/r1693919

     2.4.x: trunk works modulo CHANGES

     +1: covener, ylavic, jim



  *) mod_rewrite: Allow cookies to include ':' by using an alternate separator.

     PR47241.

     trunk: http://svn.apache.org/r1693963

acinclude.m4

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ AC_DEFUN(APACHE_FAST_OUTPUT,[ 
dnl APACHE_GEN_CONFIG_VARS

dnl Creates config_vars.mk

AC_DEFUN(APACHE_GEN_CONFIG_VARS,[

  APACHE_SUBST(HTTPD_VERSION)

  APACHE_SUBST(HTTPD_MMN)

  APACHE_SUBST(abs_srcdir)

  APACHE_SUBST(bindir)

  APACHE_SUBST(sbindir)

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ abs_builddir=`pwd` 


dnl Ensure that the httpd version is included

HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`

AC_SUBST(HTTPD_VERSION)

HTTPD_MMN=`$abs_srcdir/build/get-version.sh mmn $abs_srcdir/include/ap_mmn.h MODULE_MAGIC_NUMBER`



dnl #

dnl # Include our own M4 macros along with those for APR and libtool