marc 98/11/01 00:45:29
Modified: src CHANGES
src/main util_script.c
Log:
If we are trying to execute a script, the exact thing we are executing
currently isn't logged if it fails. This fixes it so it is logged, with
the Win32 error code returned from the failed CreateProcess() call.
Revision Changes Path
1.1131 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -r1.1130 -r1.1131
--- CHANGES 1998/10/30 22:41:21 1.1130
+++ CHANGES 1998/11/01 08:45:27 1.1131
@@ -1,5 +1,9 @@
Changes with Apache 1.3.4
+ *) WIN32: Log more explicit error messages if spawning an interpreted
+ script failed, including the command line used to attempt to execute
+ the interpreter and the Win32 error code returned. [Marc Slemko]
+
*) Disable sending of error-notes on a 500 (Internal Server Error) response
since it often includes file path info. Enable sending of error-notes
on a 501 (Method Not Implemented). [Roy Fielding] PR#3173
1.135 +10 -1 apache-1.3/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- util_script.c 1998/10/12 13:48:26 1.134
+++ util_script.c 1998/11/01 08:45:29 1.135
@@ -1052,7 +1052,16 @@
*/
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
- }
+ } else {
+ if (is_script) {
+ /* since we are doing magic to find what we are executing
+ * if running a script, log what we think we should have
+ * executed
+ */
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR, r,
+ "could not run script interpreter: %s", pCommand);
+ }
+ }
#if 0
if ((!r->args) || (!r->args[0]) || strchr(r->args, '=')) {
if (is_exe || is_binary) {
