Merge r726636 from trunk:

* Do not add an empty argument if we do not have any args for the script.
  Fixes a regression from r682475.

PR: 46380

Reviewed by: rpluem, covener, minfrin

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

diff --git a/CHANGES b/CHANGES
index 63c59e03b812a9d0093d50d38a7654a1c01c6998..d4286620aed5cf5f6954568c3dfd3a1fdfc48820 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.13
 
+  *) mod_cgid: Do not add an empty argument when calling the CGI script.
+     PR 46380 [Ruediger Pluem]
+
   *) Fix potential segfaults with use of the legacy ap_rputs() etc
      interfaces, in cases where an output filter fails.  PR 36780.
      [Joe Orton]

diff --git a/STATUS b/STATUS
index 50c65a22a628e8b9e257c451d66332d75084bc9a..fba0fd520627c4b50f90aa74dfdad94db81683a9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -84,14 +84,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_cgid: Do not add an empty argument when calling the CGI script.
-   PR 46380 (fixes a regression of r682475 (trunk) / r686392 (2.2.x).
-   Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=726636&view=rev
-   Backport version for 2.2.x of patch:
-      Trunk version of patch works
-   +1: rpluem, covener, minfrin
-
 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 99ae84b5b774316de3d159e228974190b72c0386..6f39ff6640e4dea16ce10e0ffa57d16e0c14e9b5 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -203,7 +203,7 @@ static char **create_argv(apr_pool_t *p, char *path, char *user, char *group,
     char *w;
     int idx = 0;
 
-    if (ap_strchr_c(args, '=')) {
+    if (!(*args) || ap_strchr_c(args, '=')) {
         numwords = 0;
     }
     else {