Mailing List Archive

ben 97/11/11 16:50:45

Modified: src/main util_script.c
Log:
Hopefully fix winsock in CGI problems.
Submitted by: Frank Faubert <frank@sane.com>

Revision Changes Path
1.83 +12 -1 apachen/src/main/util_script.c

Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- util_script.c 1997/10/24 15:40:55 1.82
+++ util_script.c 1997/11/12 00:50:44 1.83
@@ -161,8 +161,10 @@
server_rec *s = r->server;
conn_rec *c = r->connection;
const char *rem_logname;
-
char port[40], *env_path;
+#ifdef WIN32
+ char *env_temp;
+#endif

array_header *hdrs_arr = table_elts(r->headers_in);
table_entry *hdrs = (table_entry *) hdrs_arr->elts;
@@ -196,6 +198,15 @@

if (!(env_path = getenv("PATH")))
env_path = DEFAULT_PATH;
+
+#ifdef WIN32
+ if (env_temp = getenv("SystemRoot"))
+ table_set(e, "SystemRoot", env_temp);
+ if (env_temp = getenv("COMSPEC"))
+ table_set(e, "COMSPEC", env_temp);
+ if (env_temp = getenv("WINDIR"))
+ table_set(e, "WINDIR", env_temp);
+#endif

table_set(e, "PATH", env_path);
table_set(e, "SERVER_SOFTWARE", SERVER_VERSION);