You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/03/21 07:00:34 UTC
cvs commit: apache-1.3/src/main util.c util_script.c
wrowe 02/03/20 22:00:34
Modified: src/main util.c util_script.c
Log:
Clarify some difficult to read code by modifying comments
to express the current behavior, and deprecate some long
unused win32 code. [William Rowe]
Revision Changes Path
1.202 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- util.c 13 Mar 2002 21:05:31 -0000 1.201
+++ util.c 21 Mar 2002 06:00:34 -0000 1.202
@@ -1502,7 +1502,7 @@
* 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
*/
1.163 +0 -39 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.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- util_script.c 21 Mar 2002 05:56:52 -0000 1.162
+++ util_script.c 21 Mar 2002 06:00:34 -0000 1.163
@@ -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)
@@ -730,40 +725,6 @@
ap_rprintf(r, "%4dM", (int)((size + 524288) / 1048576));
}
}
-
-#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)