Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 12857 invoked by uid 6000); 28 Jul 1999 18:20:59 -0000
Received: (qmail 12851 invoked by alias); 28 Jul 1999 18:20:57 -0000
Delivered-To: apache-1.3-cvs@hyperreal.org
Received: (qmail 12849 invoked by uid 161); 28 Jul 1999 18:20:57 -0000
Date: 28 Jul 1999 18:20:57 -0000
Message-ID: <19990728182057.12848.qmail@hyperreal.org>
From: coar@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/main http_main.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

coar        99/07/28 11:20:56

  Modified:    src      ApacheCore.def
               src/include ap_mmn.h
               src/main http_main.c
  Log:
  	Note some recent API changes in a couple of places; correct
  	docco on *SecurityDescriptor safety.
  
  Revision  Changes    Path
  1.15      +3 -0      apache-1.3/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheCore.def	1999/03/12 13:54:22	1.14
  +++ ApacheCore.def	1999/07/28 18:20:53	1.15
  @@ -343,4 +343,7 @@
   	ap_standalone   @337
   	ap_server_confname   @338
   	ap_sub_req_method_uri   @339
  +	ap_field_noparam   @340
  +	ap_table_merge_unique_token   @341
  +	ap_table_mergen_unique_token   @342
   
  
  
  
  1.39      +2 -1      apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ap_mmn.h	1999/06/22 15:22:14	1.38
  +++ ap_mmn.h	1999/07/28 18:20:54	1.39
  @@ -220,6 +220,7 @@
    * 19990320.3           - add ap_regexec()
    * 19990604.4           - add ap_field_noparam()
    * 19990621.5           - add local_ip/host to conn_rec for mass-vhost
  + * 19990728.6           - add ap_table_merge[n]_unique_token
    */
   
   #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
  @@ -227,7 +228,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 19990320
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 5                     /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 6                     /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */
   
   /* Useful for testing for features. */
  
  
  
  1.464     +1 -1      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.463
  retrieving revision 1.464
  diff -u -r1.463 -r1.464
  --- http_main.c	1999/07/28 17:58:21	1.463
  +++ http_main.c	1999/07/28 18:20:54	1.464
  @@ -5888,7 +5888,7 @@
       }
       /*
        * We can safely use GetLastError() here without presetting it;
  -     * InitializeSecurityDescriptor() has been verified as clearing it
  +     * {Initialize,Set}SecurityDescriptor() have been verified as clearing it
        * on successful completion.
        */
       if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)