Clarify some difficult to read code by modifying comments

  to express the current behavior, and deprecate some long
  unused win32 code.  [William Rowe]

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

diff --git a/src/main/util.c b/src/main/util.c
index e42de8a7b30e128ca0fe1ee053b0423b16c9f4e0..d4ed8458add180a5ce6662f73b07033272b3ab1c 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -1502,7 +1502,7 @@ static char x2c(const char *what)
  * Failure is due to
  *   bad % escape       returns BAD_REQUEST
  *
- *   decoding %00 -> \0
+ *   decoding %00 -> \0  (the null character)
  *   decoding %2f -> /   (a special character)
  *                      returns NOT_FOUND
  */

diff --git a/src/main/util_script.c b/src/main/util_script.c
index 80861d6fde25056f240af40e7883842f65082a6c..3fae2b54075b3eef52e2c9e9ab547a9eca70b1bf 100644 (file)
--- a/src/main/util_script.c
+++ b/src/main/util_script.c
@@ -90,11 +90,6 @@
  * group are the first three arguments to be passed; if not, all three
  * must be NULL.  The query info is split into separate arguments, where
  * "+" is the separator between keyword arguments.
- *
- * XXXX: note that the WIN32 code uses one of the suexec strings 
- * to pass an interpreter name.  Remember this if changing the way they
- * are handled in create_argv.
- *
  */
 static char **create_argv(pool *p, char *path, char *user, char *group,
                          char *av0, const char *args)
@@ -731,40 +726,6 @@ API_EXPORT(void) ap_send_size(size_t size, request_rec *r)
     }
 }
 
-#if defined(WIN32)
-static char **create_argv_cmd(pool *p, char *av0, const char *args, char *path)
-{
-    register int x, n;
-    char **av;
-    char *w;
-
-    for (x = 0, n = 2; args[x]; x++) {
-        if (args[x] == '+') {
-           ++n;
-       }
-    }
-
-    /* Add extra strings to array. */
-    n = n + 2;
-
-    av = (char **) ap_palloc(p, (n + 1) * sizeof(char *));
-    av[0] = av0;
-
-    /* Now insert the extra strings we made room for above. */
-    av[1] = strdup("/C");
-    av[2] = strdup(path);
-
-    for (x = (1 + 2); x < n; x++) {
-       w = ap_getword(p, &args, '+');
-       ap_unescape_url(w);
-       av[x] = ap_escape_shell_cmd(p, w);
-    }
-    av[n] = NULL;
-    return av;
-}
-#endif
-
-
 API_EXPORT(int) ap_call_exec(request_rec *r, child_info *pinfo, char *argv0,
                             char **env, int shellcmd)
 {