httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r160789 - in httpd/httpd/branches/mod_version_for_2.0.x: ./ build/ include/ modules/metadata/ server/
Date Sun, 10 Apr 2005 18:16:18 GMT
Author: pquerna
Date: Sun Apr 10 11:16:15 2005
New Revision: 160789

URL: http://svn.apache.org/viewcvs?view=rev&rev=160789
Log:
Backport of mod_version, and the required minor MMN bump for the
new version api.

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

Added:
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion   (props changed)
      - copied unchanged from r103395, httpd/httpd/trunk/modules/metadata/NWGNUmodversion
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c   (props changed)
      - copied unchanged from r103345, httpd/httpd/trunk/modules/metadata/mod_version.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp   (props changed)
      - copied unchanged from r103345, httpd/httpd/trunk/modules/metadata/mod_version.dsp
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp   (props changed)
      - copied unchanged from r103345, httpd/httpd/trunk/modules/metadata/mod_version.exp
Modified:
    httpd/httpd/branches/mod_version_for_2.0.x/Apache.dsw
    httpd/httpd/branches/mod_version_for_2.0.x/CHANGES
    httpd/httpd/branches/mod_version_for_2.0.x/Makefile.win
    httpd/httpd/branches/mod_version_for_2.0.x/build/mkconfNW.awk
    httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h
    httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h
    httpd/httpd/branches/mod_version_for_2.0.x/include/httpd.h
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmakefile
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/config.m4
    httpd/httpd/branches/mod_version_for_2.0.x/server/core.c

Modified: httpd/httpd/branches/mod_version_for_2.0.x/Apache.dsw
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/Apache.dsw?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/Apache.dsw (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/Apache.dsw Sun Apr 10 11:16:15 2005
@@ -180,6 +180,9 @@
     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
@@ -1567,6 +1570,27 @@
 ###############################################################################
 
 Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.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_version"=".\modules\metadata\mod_version.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: httpd/httpd/branches/mod_version_for_2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/CHANGES?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/CHANGES (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/CHANGES Sun Apr 10 11:16:15 2005
@@ -1,5 +1,12 @@
 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>]
 

Modified: httpd/httpd/branches/mod_version_for_2.0.x/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/Makefile.win?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/Makefile.win (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/Makefile.win Sun Apr 10 11:16:15 2005
@@ -278,6 +278,7 @@
 	 $(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 @@
 	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

Modified: httpd/httpd/branches/mod_version_for_2.0.x/build/mkconfNW.awk
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/build/mkconfNW.awk?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/build/mkconfNW.awk (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/build/mkconfNW.awk Sun Apr 10 11:16:15 2005
@@ -60,6 +60,7 @@
     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

Modified: httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h Sun Apr 10 11:16:15 2005
@@ -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

Modified: httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h Sun Apr 10 11:16:15 2005
@@ -17,6 +17,8 @@
 #ifndef AP_RELEASE_H
 #define AP_RELEASE_H
 
+#include "apr_general.h" /* stringify */
+
 /*
  * The below defines the base string of the Server: header. Additional
  * tokens can be added via the ap_add_version_component() API call.
@@ -31,9 +33,18 @@
  */
 #define AP_SERVER_BASEVENDOR "Apache Software Foundation"
 #define AP_SERVER_BASEPRODUCT "Apache"
-#define AP_SERVER_MAJORVERSION "2"
-#define AP_SERVER_MINORVERSION "0"
-#define AP_SERVER_PATCHLEVEL "54-dev"
+
+#define AP_SERVER_MAJORVERSION_NUMBER 2
+#define AP_SERVER_MINORVERSION_NUMBER 0
+#define AP_SERVER_PATCHLEVEL_NUMBER   54
+#define AP_SERVER_ADD_STRING          "-dev"
+
+/* keep old macros as well */
+#define AP_SERVER_MAJORVERSION APR_STRINGIFY(AP_SERVER_MAJORVERSION_NUMBER)
+#define AP_SERVER_MINORVERSION APR_STRINGIFY(AP_SERVER_MINORVERSION_NUMBER)
+#define AP_SERVER_PATCHLEVEL APR_STRINGIFY(AP_SERVER_PATCHLEVEL_NUMBER) \
+                              AP_SERVER_ADD_STRING
+
 #define AP_SERVER_MINORREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
 #define AP_SERVER_BASEREVISION  AP_SERVER_MINORREVISION "." AP_SERVER_PATCHLEVEL
 #define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION

Modified: httpd/httpd/branches/mod_version_for_2.0.x/include/httpd.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/include/httpd.h?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/include/httpd.h (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/include/httpd.h Sun Apr 10 11:16:15 2005
@@ -378,6 +378,25 @@
 # define AP_CORE_DECLARE_NONSTD	AP_DECLARE_NONSTD
 #endif
 
+/** 
+ * The numeric version information is broken out into fields within this 
+ * structure. 
+ */
+typedef struct {
+    int major;              /**< major number */
+    int minor;              /**< minor number */
+    int patch;              /**< patch number */
+    const char *add_string; /**< additional string like "-dev" */
+} ap_version_t;
+
+/**
+ * Return httpd's version information in a numeric form.
+ *
+ *  @param version Pointer to a version structure for returning the version
+ *                 information.
+ */
+AP_DECLARE(void) ap_get_server_revision(ap_version_t *version);
+
 /**
  * Get the server version string
  * @return The server version string

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmakefile?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmakefile (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmakefile Sun Apr 10 11:16:15
2005
@@ -159,6 +159,7 @@
 	$(OBJDIR)/mimemagi.nlm \
 	$(OBJDIR)/uniqueid.nlm \
 	$(OBJDIR)/usertrk.nlm \
+	$(OBJDIR)/modversion.nlm \
 	$(EOLIST)
 
 #

Copied: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion (from
r103395, httpd/httpd/trunk/modules/metadata/NWGNUmodversion)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion?view=diff&rev=160789&p1=httpd/httpd/trunk/modules/metadata/NWGNUmodversion&r1=103395&p2=httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion&r2=160789
==============================================================================
    (empty)

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/NWGNUmodversion
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/config.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/config.m4?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/config.m4 (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/config.m4 Sun Apr 10 11:16:15
2005
@@ -17,6 +17,7 @@
 
 APACHE_MODULE(unique_id, per-request unique ids)
 APACHE_MODULE(setenvif, basing ENV vars on headers, , , yes)
+APACHE_MODULE(version, determining httpd version in config files)
 
 APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 

Copied: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c (from r103345,
httpd/httpd/trunk/modules/metadata/mod_version.c)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c?view=diff&rev=160789&p1=httpd/httpd/trunk/modules/metadata/mod_version.c&r1=103345&p2=httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c&r2=160789
==============================================================================
    (empty)

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp (from
r103345, httpd/httpd/trunk/modules/metadata/mod_version.dsp)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp?view=diff&rev=160789&p1=httpd/httpd/trunk/modules/metadata/mod_version.dsp&r1=103345&p2=httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp&r2=160789
==============================================================================
    (empty)

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.dsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp (from
r103345, httpd/httpd/trunk/modules/metadata/mod_version.exp)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp?view=diff&rev=160789&p1=httpd/httpd/trunk/modules/metadata/mod_version.exp&r1=103345&p2=httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp&r2=160789
==============================================================================
    (empty)

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.exp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: httpd/httpd/branches/mod_version_for_2.0.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/server/core.c?view=diff&r1=160788&r2=160789
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/server/core.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/server/core.c Sun Apr 10 11:16:15 2005
@@ -2442,6 +2442,14 @@
     return APR_SUCCESS;
 }
 
+AP_DECLARE(void) ap_get_server_revision(ap_version_t *version)
+{
+    version->major = AP_SERVER_MAJORVERSION_NUMBER;
+    version->minor = AP_SERVER_MINORVERSION_NUMBER;
+    version->patch = AP_SERVER_PATCHLEVEL_NUMBER;
+    version->add_string = AP_SERVER_ADD_STRING;
+}
+
 AP_DECLARE(const char *) ap_get_server_version(void)
 {
     return (server_version ? server_version : AP_SERVER_BASEVERSION);



Mime
View raw message