Commit e6769acb authored by Paul Querna's avatar Paul Querna
Browse files

Backport of mod_version, and the required minor MMN bump for the 

new version api.

Merged from revisions 103345, 106103, 103395, and 102405.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x@160789 13f79535-47bb-0310-9956-ffa450edef68
parent a8c95396

Apache.dsw

+24 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ Package=<4> 
    Project_Dep_Name mod_usertrack

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_version

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_vhost_alias

    End Project Dependency

    Begin Project Dependency
@@ -1587,6 +1590,27 @@ Package=<4> 


###############################################################################



Project: "mod_version"=".\modules\metadata\mod_version.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

}}}



###############################################################################



Project: "mod_vhost_alias"=".\modules\mappers\mod_vhost_alias.dsp" - Package Owner=<4>



Package=<5>

CHANGES

+7 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.54













  *) Added new module mod_version, which provides version dependent













     configuration containers.  [André Malo]

























  *) Add core version query function (ap_get_server_revision) and













     accompanying ap_version_t structure (minor MMN bump).













     [André Malo]



























  *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.















     [Rüiger Plü <r.pluem t-online.de>]















































Makefile.win



+2
−0






























Original line number
Diff line number
Diff line








@@ -278,6 +278,7 @@ _build:













	 $(MAKE) $(MAKEOPT) -f mod_setenvif.mak    CFG="mod_setenvif - Win32 $(LONG)" RECURSE=0 $(CTARGET)















	 $(MAKE) $(MAKEOPT) -f mod_unique_id.mak   CFG="mod_unique_id - Win32 $(LONG)" RECURSE=0 $(CTARGET)















	 $(MAKE) $(MAKEOPT) -f mod_usertrack.mak   CFG="mod_usertrack - Win32 $(LONG)" RECURSE=0 $(CTARGET)













	 $(MAKE) $(MAKEOPT) -f mod_version.mak     CFG="mod_version - Win32 $(LONG)" RECURSE=0 $(CTARGET)















	cd ..\..















	cd modules\proxy















	 $(MAKE) $(MAKEOPT) -f mod_proxy.mak       CFG="mod_proxy - Win32 $(LONG)" RECURSE=0 $(CTARGET)










@@ -408,6 +409,7 @@ _copybin:













	copy modules\metadata\$(LONG)\mod_setenvif.$(src_so) 	"$(inst_so)" <.y















	copy modules\metadata\$(LONG)\mod_unique_id.$(src_so) 	"$(inst_so)" <.y















	copy modules\metadata\$(LONG)\mod_usertrack.$(src_so) 	"$(inst_so)" <.y













	copy modules\metadata\$(LONG)\mod_version.$(src_so) 	"$(inst_so)" <.y















	copy modules\proxy\$(LONG)\mod_proxy.$(src_so) 		"$(inst_so)" <.y















	copy modules\proxy\$(LONG)\mod_proxy_connect.$(src_so) 	"$(inst_so)" <.y















	copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) 	"$(inst_so)" <.y

































build/mkconfNW.awk



+1
−0






























Original line number
Diff line number
Diff line








@@ -60,6 +60,7 @@ BEGIN {













    print "#LoadModule status_module modules/status.nlm"















    print "#LoadModule unique_id_module modules/uniqueid.nlm"















    print "#LoadModule usertrack_module modules/usertrk.nlm"













    print "#LoadModule version_module modules/modversion.nlm"















    print "#LoadModule vhost_alias_module modules/vhost.nlm"















    print ""















    next

































include/ap_mmn.h



+2
−1






























Original line number
Diff line number
Diff line








@@ -83,6 +83,7 @@













 *                         ap_finalize_sub_req_protocol on Win32 and NetWare















 * 20020903.9 (2.0.51-dev) create pcommands and initialize arrays before















 *                         calling ap_setup_prelinked_modules













 * 20020903.10 (2.0.54-dev) added ap_get_server_revision / ap_version_t















 */































#define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */









@@ -90,7 +91,7 @@













#ifndef MODULE_MAGIC_NUMBER_MAJOR















#define MODULE_MAGIC_NUMBER_MAJOR 20020903















#endif













#define MODULE_MAGIC_NUMBER_MINOR 9                     /* 0...n */













#define MODULE_MAGIC_NUMBER_MINOR 10                     /* 0...n */































/**















 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a