--- java/org/apache/catalina/servlets/CGIServlet.java	(revision 1807323)
+++ java/org/apache/catalina/servlets/CGIServlet.java	(working copy)
@@ -311,6 +311,16 @@ 
             shellEnv.putAll(System.getenv());
         }
 
+        for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements(); ) {
+            String initParamName = e.nextElement();
+            if (initParamName.startsWith("environment-variable-")) {
+                if (initParamName.length() == 21) {
+                    throw new ServletException("Empty var name in 'environment-variable-'.");
+                }
+                shellEnv.put(initParamName.substring(21), config.getInitParameter(initParamName));
+            }
+        }
+
         if (getServletConfig().getInitParameter("executable") != null) {
             cgiExecutable = getServletConfig().getInitParameter("executable");
         }