From: Jim Jagielski <jim@apache.org>
Date: Fri, 15 Aug 2008 22:08:05 +0000 (+0000)
Subject:  * mod_cgid: Pass along empty command line arguments from an ISINDEX
X-Git-Tag: 2.2.10~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b5a71e6afd665b0d246c899c8a0a1139439dca5;p=thirdparty%2Fapache%2Fhttpd.git

 * mod_cgid: Pass along empty command line arguments from an ISINDEX
    query that has consecutive '+' characters in the QUERY_STRING,
    matching the behavior of mod_cgi.
    Trunk version of patch:
      http://svn.apache.org/viewvc?rev=682389&view=rev
      http://svn.apache.org/viewvc?rev=682475&view=rev
    Backport version for 2.2.x of patch:
      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgid.c?r1=682475&r2=682389



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

diff --git a/STATUS b/STATUS
index 3b38fb8cf5b..dcf27c72d62 100644
--- a/STATUS
+++ b/STATUS
@@ -120,16 +120,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
     +1: rpluem, mturk, jim
 
- * mod_cgid: Pass along empty command line arguments from an ISINDEX
-    query that has consecutive '+' characters in the QUERY_STRING,
-    matching the behavior of mod_cgi.
-    Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=682389&view=rev
-      http://svn.apache.org/viewvc?rev=682475&view=rev
-    Backport version for 2.2.x of patch:
-      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgid.c?r1=682475&r2=682389
-    +1: covener, rpluem, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index edbdf7b7b15..5ee3df074a9 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -235,10 +235,8 @@ static char **create_argv(apr_pool_t *p, char *path, char *user, char *group,
 
     for (x = 1; x <= numwords; x++) {
         w = ap_getword_nulls(p, &args, '+');
-        if (strcmp(w, "")) {
-            ap_unescape_url(w);
-            av[idx++] = ap_escape_shell_cmd(p, w);
-        }
+        ap_unescape_url(w);
+        av[idx++] = ap_escape_shell_cmd(p, w);
     }
     av[idx] = NULL;
     return av;