* 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 3b38fb8cf5b4ae43316d66d66242d40f69a34d4b..dcf27c72d624101674f94202a42dac4fcc8b4c6a 100644 (file)
--- 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 edbdf7b7b15fe75bba93b3da2a07851748213056..5ee3df074a94e891819b7291a2f73d9f72f70923 100644 (file)
--- 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;