give me useless text not useless errno

Reviewed by:	Dean, Alexei
Submitted by:	Marc
Obtained from:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78389 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 354a49365ba50157c56f2a1293df73c4ced45de1..f8dbd06bbb52e46c180d5a4d1aa10c0f90ffeb20 100644 (file)
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,4 +1,6 @@
 Changes with Apache 1.2.1
+  
+  *) Improved unix error response logging.  [Marc Slemko]
 
   *) Update mod_rewrite from 3.0.5 to 3.0.6.  New ruleflag
      QSA=query_string_append.  Also fixed a nasty bug in per-dir context:

diff --git a/APACHE_1_2_X/src/main/util_script.c b/APACHE_1_2_X/src/main/util_script.c
index 12e57b44d1fc90e8b868e4b095bc8d294a4d8879..3fcd3a66cd228a15000c603becfd8c6a8358c98d 100644 (file)
--- a/APACHE_1_2_X/src/main/util_script.c
+++ b/APACHE_1_2_X/src/main/util_script.c
@@ -502,7 +502,10 @@ void call_exec (request_rec *r, char *argv0, char **env, int shellcmd)
         program = fopen (r->filename, "r");
         if (!program) {
             char err_string[HUGE_STRING_LEN];
-            ap_snprintf(err_string, sizeof(err_string), "open of %s failed, errno is %d\n", r->filename, errno);
+            ap_snprintf(err_string, sizeof(err_string), 
+                "open of %s failed, reason: fopen: %s (errno = %d)\n", 
+                r->filename, strerror(errno), errno);
+
             /* write(2, err_string, strlen(err_string)); */
             /* exit(0); */
             log_unixerr("fopen", NULL, err_string, r->server);

diff --git a/APACHE_1_2_X/src/modules/standard/mod_cgi.c b/APACHE_1_2_X/src/modules/standard/mod_cgi.c
index ceed899ad7bf136fd0c590bb6d74ad26672b0982..37f2c0292cd69c169d4a64285cc1c128ec8306f6 100644 (file)
--- a/APACHE_1_2_X/src/modules/standard/mod_cgi.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_cgi.c
@@ -333,7 +333,8 @@ void cgi_child (void *child_stuff)
      */
     
     ap_snprintf(err_string, sizeof(err_string),
-           "exec of %s failed, errno is %d\n", r->filename, errno);
+           "exec of %s failed, reason: %s (errno = %d)\n", 
+            r->filename, strerror(errno), errno);
     write(2, err_string, strlen(err_string));
     exit(0);
 }

diff --git a/APACHE_1_2_X/src/modules/standard/mod_include.c b/APACHE_1_2_X/src/modules/standard/mod_include.c
index 66403979383778119ad00f4690a104e41c406c3c..45157eff43ce7779a8f1e2e875f5301027a3bc16 100644 (file)
--- a/APACHE_1_2_X/src/modules/standard/mod_include.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_include.c
@@ -646,8 +646,8 @@ void include_cmd_child (void *arg)
     fprintf (dbg, "Exec failed\n");
 #endif    
     ap_snprintf(err_string, sizeof(err_string),
-       "httpd: exec of %s failed, errno is %d\n",
-       SHELL_PATH,errno);
+       "httpd: exec of %s failed, reason: %s (errno = %d)\n",
+       SHELL_PATH, strerror(errno), errno);
     write (2, err_string, strlen(err_string));
     exit(0);
 }