Commit a4f39e9d authored by Andre Malo's avatar Andre Malo
Browse files

merge mod_version_for_2.0.x branch back to branches/2.0.x 

* merge 160788 to 326121 from branches/mod_version_for_2.0.x, but leave out
  generated docs files (will cleanly rebuild later)

Reviewed by: Paul Querna, Bill Rowe, (Justin Erenkrantz), me


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

Apache.dsw

+24 −0
Changes for Apache.dsw: 24 added lines, 0 removed lines.
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

+6 −1
Changes for CHANGES: 6 added lines, 1 removed line.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.56-dev

Changes with Apache 2.0.56









  *) 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]

















Changes with Apache 2.0.55










































Makefile.win



+2
−0



























Changes for Makefile.win: 2 added lines, 0 removed lines.



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



























Changes for build/mkconfNW.awk: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -61,6 +61,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


































docs/manual/mod/mod_version.html
0 → 100644



+11
−0



























Changes for docs/manual/mod/mod_version.html: 11 added lines, 0 removed lines.



Original line number
Diff line number
Diff line









URI: mod_version.html.en









Content-Language: en









Content-type: text/html; charset=ISO-8859-1



















URI: mod_version.html.ja.euc-jp









Content-Language: ja









Content-type: text/html; charset=EUC-JP



















URI: mod_version.html.ko.euc-kr









Content-Language: ko









Content-type: text/html; charset=EUC-KR