View | Details | Raw Unified | Return to bug 61189
Collapse All | Expand All

(-)java/org/apache/catalina/servlets/CGIServlet.java (+10 lines)
Lines 311-316 Link Here
311
            shellEnv.putAll(System.getenv());
311
            shellEnv.putAll(System.getenv());
312
        }
312
        }
313
313
314
        for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements(); ) {
315
            String initParamName = e.nextElement();
316
            if (initParamName.startsWith("environment-variable-")) {
317
                if (initParamName.length() == 21) {
318
                    throw new ServletException("Empty var name in 'environment-variable-'.");
319
                }
320
                shellEnv.put(initParamName.substring(21), config.getInitParameter(initParamName));
321
            }
322
        }
323
314
        if (getServletConfig().getInitParameter("executable") != null) {
324
        if (getServletConfig().getInitParameter("executable") != null) {
315
            cgiExecutable = getServletConfig().getInitParameter("executable");
325
            cgiExecutable = getServletConfig().getInitParameter("executable");
316
        }
326
        }

Return to bug 61189