Date: 27 Nov 1999 14:48:38 -0000
Message-ID: <19991127144838.13959.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src/main util_script.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org
Status: O

bjh         99/11/27 06:48:37

  Modified:    src/main util_script.c
  Log:
  OS/2: Add a handful of environment variables that should be passed to CGI
  scripts by default.
  
  Revision  Changes    Path
  1.147     +16 -1     apache-1.3/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/util_script.c,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- util_script.c	1999/10/21 20:44:45	1.146
  +++ util_script.c	1999/11/27 14:48:36	1.147
  @@ -200,7 +200,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;
  @@ -263,6 +263,21 @@
       }
       if (env_temp = getenv("WINDIR")) {
           ap_table_addn(e, "WINDIR", env_temp);
  +    }
  +#endif
  +
  +#ifdef OS2
  +    if (env_temp = getenv("COMSPEC")) {
  +        ap_table_addn(e, "COMSPEC", env_temp);            
  +    }
  +    if (env_temp = getenv("ETC")) {
  +        ap_table_addn(e, "ETC", env_temp);            
  +    }
  +    if (env_temp = getenv("DPATH")) {
  +        ap_table_addn(e, "DPATH", env_temp);            
  +    }
  +    if (env_temp = getenv("PERLLIB_PREFIX")) {
  +        ap_table_addn(e, "PERLLIB_PREFIX", env_temp);            
       }
   #endif