httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml
Date Fri, 23 Aug 2002 18:05:38 GMT
ianh        2002/08/23 11:05:38

  Modified:    include  ap_release.h
               server   core.c
               docs/conf httpd-std.conf.in
               docs/manual/mod core.xml
  Log:
  Major/Minor/Min[imal]
  now working as one (with a sane mind) would thing it should
  
  Revision  Changes    Path
  1.71      +5 -3      httpd-2.0/include/ap_release.h
  
  Index: ap_release.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_release.h,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- ap_release.h	23 Aug 2002 17:24:39 -0000	1.70
  +++ ap_release.h	23 Aug 2002 18:05:37 -0000	1.71
  @@ -73,9 +73,11 @@
    */
   #define AP_SERVER_BASEVENDOR "Apache Software Foundation"
   #define AP_SERVER_BASEPRODUCT "Apache"
  -#define AP_SERVER_MAJORVERSION "2.0"
  -#define AP_SERVER_MINORVERSION "41-dev"
  -#define AP_SERVER_BASEREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
  +#define AP_SERVER_MAJORVERSION "2"
  +#define AP_SERVER_MINORVERSION "0"
  +#define AP_SERVER_PATCHLEVEL "41-dev"
  +#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
   #define AP_SERVER_VERSION  AP_SERVER_BASEVERSION
   
  
  
  
  1.201     +14 -7     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.200
  retrieving revision 1.201
  diff -u -r1.200 -r1.201
  --- core.c	23 Aug 2002 17:24:39 -0000	1.200
  +++ core.c	23 Aug 2002 18:05:37 -0000	1.201
  @@ -2286,8 +2286,9 @@
   static int version_locked = 0;
   
   enum server_token_type {
  -    SrvTk_MAJ,          /* eg: Apache/2.0 */
  -    SrvTk_MIN,          /* eg: Apache/2.0.41 */
  +    SrvTk_MAJOR,        /* eg: Apache/2 */
  +    SrvTk_MINOR,        /* eg. Apache/2.0 */
  +    SrvTk_MINIMAL,      /* eg: Apache/2.0.41 */
       SrvTk_OS,           /* eg: Apache/2.0.41 (UNIX) */
       SrvTk_FULL,         /* eg: Apache/2.0.41 (UNIX) PHP/4.2.2 FooBar/1.2b */
       SrvTk_PRODUCT_ONLY  /* eg: Apache */
  @@ -2340,10 +2341,13 @@
       if (ap_server_tokens == SrvTk_PRODUCT_ONLY) {
           ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT);
       }
  -    else if (ap_server_tokens == SrvTk_MIN) {
  +    else if (ap_server_tokens == SrvTk_MINIMAL) {
           ap_add_version_component(pconf, AP_SERVER_BASEVERSION);
       }
  -    else if (ap_server_tokens == SrvTk_MAJ) {
  +    else if (ap_server_tokens == SrvTk_MINOR) {
  +        ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MINORREVISION);
  +    }
  +    else if (ap_server_tokens == SrvTk_MAJOR) {
           ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
       }
       else {
  @@ -2372,10 +2376,13 @@
           ap_server_tokens = SrvTk_OS;
       }
       else if (!strcasecmp(arg, "Min") || !strcasecmp(arg, "Minimal")) {
  -        ap_server_tokens = SrvTk_MIN;
  +        ap_server_tokens = SrvTk_MINIMAL;
  +    }
  +    else if (!strcasecmp(arg, "Major")) {
  +        ap_server_tokens = SrvTk_MAJOR;
       }
  -    else if (!strcasecmp(arg, "Maj") || !strcasecmp(arg, "Major")) {
  -        ap_server_tokens = SrvTk_MAJ;
  +    else if (!strcasecmp(arg, "Minor") ) {
  +        ap_server_tokens = SrvTk_MINOR;
       }
       else if (!strcasecmp(arg, "Prod") || !strcasecmp(arg, "ProductOnly")) {
           ap_server_tokens = SrvTk_PRODUCT_ONLY;
  
  
  
  1.16      +1 -1      httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- httpd-std.conf.in	23 Aug 2002 17:24:39 -0000	1.15
  +++ httpd-std.conf.in	23 Aug 2002 18:05:38 -0000	1.16
  @@ -506,7 +506,7 @@
   # This directive configures what you return as the Server HTTP response
   # Header. The default is 'Full' which sends information about the OS-Type
   # and compiled in modules.
  -# Set to one of:  Full | OS | Minor | Major | Prod
  +# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
   # where Full conveys the most information, and Prod the least.
   ServerTokens Full
   #
  
  
  
  1.25      +7 -2      httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- core.xml	23 Aug 2002 17:24:39 -0000	1.24
  +++ core.xml	23 Aug 2002 18:05:38 -0000	1.25
  @@ -2288,7 +2288,7 @@
   <directivesynopsis>
   <name>ServerTokens</name>
   <description>Configures the Server HTTP response header</description>
  -<syntax>ServerTokens Major|Minimal|ProductOnly|OS|Full</syntax>
  +<syntax>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</syntax>
   <default>ServerTokens Full</default>
   <contextlist><context>server config</context></contextlist>
   
  @@ -2304,7 +2304,12 @@
         <dd>Server sends (<em>e.g.</em>): <code>Server:
         Apache</code></dd>
   
  -      <dt><code>ServerTokens Maj[or]</code></dt>
  +      <dt><code>ServerTokens Major</code></dt>
  +
  +      <dd>Server sends (<em>e.g.</em>): <code>Server:
  +      Apache/2</code></dd>
  +
  +      <dt><code>ServerTokens Minor</code></dt>
   
         <dd>Server sends (<em>e.g.</em>): <code>Server:
         Apache/2.0</code></dd>
  
  
  

Mime
View raw message