httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@locus.apache.org
Subject cvs commit: apache-2.0/src/os/os2 os.c
Date Mon, 20 Mar 2000 02:42:20 GMT
bjh         00/03/19 18:42:20

  Modified:    src/include ap_config.h
               src/main util_script.c
               src/os/os2 os.c
  Log:
  Bring forward my recent 1.3 patches.
  
  Revision  Changes    Path
  1.18      +1 -0      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_config.h	2000/03/19 13:28:42	1.17
  +++ ap_config.h	2000/03/20 02:42:19	1.18
  @@ -824,6 +824,7 @@
   #define NO_RELIABLE_PIPED_LOGS
   #define USE_OS2SEM_SERIALIZED_ACCEPT
   #define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
  +#define NO_SLACK
   
   #elif defined(__MACHTEN__)
   typedef int rlim_t;
  
  
  
  1.27      +16 -1     apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- util_script.c	2000/03/10 00:06:55	1.26
  +++ util_script.c	2000/03/20 02:42:20	1.27
  @@ -203,7 +203,7 @@
       conn_rec *c = r->connection;
       const char *rem_logname;
       char *env_path;
  -#ifdef WIN32
  +#if defined(WIN32) || defined(OS2)
       char *env_temp;
   #endif
       const char *host;
  @@ -266,6 +266,21 @@
       }
       if (env_temp = getenv("WINDIR")) {
           ap_table_addn(e, "WINDIR", env_temp);
  +    }
  +#endif
  +
  +#ifdef OS2
  +    if ((env_temp = getenv("COMSPEC")) != NULL) {
  +        ap_table_addn(e, "COMSPEC", env_temp);            
  +    }
  +    if ((env_temp = getenv("ETC")) != NULL) {
  +        ap_table_addn(e, "ETC", env_temp);            
  +    }
  +    if ((env_temp = getenv("DPATH")) != NULL) {
  +        ap_table_addn(e, "DPATH", env_temp);            
  +    }
  +    if ((env_temp = getenv("PERLLIB_PREFIX")) != NULL) {
  +        ap_table_addn(e, "PERLLIB_PREFIX", env_temp);            
       }
   #endif
   
  
  
  
  1.4       +7 -2      apache-2.0/src/os/os2/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/os.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- os.c	1999/08/31 12:33:06	1.3
  +++ os.c	2000/03/20 02:42:20	1.4
  @@ -7,8 +7,10 @@
   #define INCL_DOS
   #include <os2.h>
   #include <stdio.h>
  +#include <string.h>
   
   static int rc=0;
  +static char errorstr[20];
   
   void ap_os_dso_init(void)
   {
  @@ -18,7 +20,6 @@
   
   ap_os_dso_handle_t ap_os_dso_load(const char *module_name)
   {
  -    char errorstr[200];
       HMODULE handle;
   
       rc = DosLoadModule(errorstr, sizeof(errorstr), module_name, &handle);
  @@ -54,5 +55,9 @@
   
   const char *ap_os_dso_error(void)
   {
  -    return ap_os_error_message(rc);
  +    static char message[200];
  +    strcpy(message, ap_os_error_message(rc));
  +    strcat(message, " for module ");
  +    strcat(message, errorstr);
  +    return message;
   }
  
  
  

Mime
View raw message