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

(-)java/org/apache/catalina/servlets/CGIServlet.java (+24 lines)
Lines 311-316 Link Here
311
            shellEnv.putAll(System.getenv());
311
            shellEnv.putAll(System.getenv());
312
        }
312
        }
313
313
314
        if (config.getInitParameter("environment-variable-1") != null) {
315
            for (int i = 1;; i++) {
316
                String envVar = config.getInitParameter("environment-variable-" + i);
317
                if (envVar == null) {
318
                    break;
319
                }
320
                if (envVar.length() == 0) {
321
                    throw new ServletException("Invalid empty environment-variable-" + i + ".");
322
                }
323
                int equalIndex = envVar.indexOf('=');
324
                if (equalIndex == 0) {
325
                    throw new ServletException("Empty name in environment-variable-" + i + ".");
326
                }
327
                else if (equalIndex < 0) {
328
                    shellEnv.put(envVar, "");
329
                }
330
                else {
331
                    String variableName = envVar.substring(0, equalIndex);
332
                    String variableValue = envVar.substring(equalIndex + 1);
333
                    shellEnv.put(variableName, variableValue);
334
                }
335
            }
336
        }
337
314
        if (getServletConfig().getInitParameter("executable") != null) {
338
        if (getServletConfig().getInitParameter("executable") != null) {
315
            cgiExecutable = getServletConfig().getInitParameter("executable");
339
            cgiExecutable = getServletConfig().getInitParameter("executable");
316
        }
340
        }

Return to bug 61189