cvs commit: apache-1.3/src/include http_main.h

[wr...@locus.apache.org]

wrowe       00/06/15 12:18:26

  Modified:    src      CHANGES ApacheCore.def
               src/main http_main.c
               src/include http_main.h
  Log:
    Export the Win32 .dll ap_start_shutdown and ap_start_restart symbols
    in order for dynamically linked modules to share.
  
  PR:		PR5657
  Submitted by:	Jim Patterson <ji...@ncf.ca>
  Reviewed by:	William Rowe
  
  Revision  Changes    Path
  1.1558    +10 -0     apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1557
  retrieving revision 1.1558
  diff -u -r1.1557 -r1.1558
  --- CHANGES	2000/06/15 00:31:37	1.1557
  +++ CHANGES	2000/06/15 19:18:19	1.1558
  @@ -1,5 +1,15 @@
   Changes with Apache 1.3.13
   
  +  *) Export from Win32 the ap_start_shutdown and ap_start_restart symbols 
  +     for modules and executables dynamically linked to the core.
  +     [William Rowe; Jim Patterson <ji...@ncf.ca>]
  +
  +  *) Correct the problem where the only local host name that the IP stack
  +     can discover are 'undotted' private names.  If no fully qualified
  +     domain name can be identified, the default ServerName will be set to
  +     the machine's IP address string. A warning is always provided if the
  +     ServerName not specified, but assumed.  [William Rowe]
  +
     *) Prevent the source code for CGIs from being revealed when using
        mod_vhost_alias and the CGI directory is under the document root
        and a user makes a request like http://www.example.com//cgi-bin/cgi
  
  
  
  1.22      +2 -0      apache-1.3/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ApacheCore.def	2000/03/13 21:00:38	1.21
  +++ ApacheCore.def	2000/06/15 19:18:19	1.22
  @@ -365,3 +365,5 @@
   	ap_registry_get_server_root @360
   	ap_registry_get_service_conf @361
   	ap_registry_set_service_conf @362
  +	ap_start_shutdown @363
  +	ap_start_restart @364
  
  
  
  1.502     +2 -2      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.501
  retrieving revision 1.502
  diff -u -r1.501 -r1.502
  --- http_main.c	2000/06/13 16:34:04	1.501
  +++ http_main.c	2000/06/15 19:18:22	1.502
  @@ -2879,7 +2879,7 @@
    * variables are no longer used to pass on the required action to the parent.
    */
   
  -void ap_start_shutdown(void)
  +API_EXPORT(void) ap_start_shutdown(void)
   {
   #ifndef WIN32
       if (shutdown_pending == 1) {
  @@ -2896,7 +2896,7 @@
   }
   
   /* do a graceful restart if graceful == 1 */
  -void ap_start_restart(int graceful)
  +API_EXPORT(void) ap_start_restart(int graceful)
   {
   #ifndef WIN32
       if (restart_pending == 1) {
  
  
  
  1.33      +2 -2      apache-1.3/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/http_main.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- http_main.h	2000/06/12 21:49:53	1.32
  +++ http_main.h	2000/06/15 19:18:26	1.33
  @@ -112,8 +112,8 @@
    * reset_timeout() resets the timeout in progress.
    */
   
  -void ap_start_shutdown(void);
  -void ap_start_restart(int);
  +API_EXPORT(void) ap_start_shutdown(void);
  +API_EXPORT(void) ap_start_restart(int);
   API_EXPORT(void) ap_hard_timeout(char *, request_rec *);
   void ap_keepalive_timeout(char *, request_rec *);
   API_EXPORT(void) ap_soft_timeout(char *, request_rec *);