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

(-)java/org/apache/catalina/servlets/CGIServlet.java (-2 / +14 lines)
Lines 1602-1607 Link Here
1602
            InputStream cgiOutput = null;
1602
            InputStream cgiOutput = null;
1603
            BufferedReader commandsStdErr = null;
1603
            BufferedReader commandsStdErr = null;
1604
            BufferedOutputStream commandsStdIn = null;
1604
            BufferedOutputStream commandsStdIn = null;
1605
            Thread errReaderThread = null;
1605
            Process proc = null;
1606
            Process proc = null;
1606
            int bufRead = -1;
1607
            int bufRead = -1;
1607
1608
Lines 1658-1668 Link Here
1658
                    (new InputStreamReader(proc.getErrorStream()));
1659
                    (new InputStreamReader(proc.getErrorStream()));
1659
                final BufferedReader stdErrRdr = commandsStdErr ;
1660
                final BufferedReader stdErrRdr = commandsStdErr ;
1660
1661
1661
                new Thread() {
1662
                errReaderThread = new Thread() {
1662
                    public void run () {
1663
                    public void run () {
1663
                        sendToLog(stdErrRdr) ;
1664
                        sendToLog(stdErrRdr) ;
1664
                    }
1665
                    }
1665
                }.start() ;
1666
                };
1667
                errReaderThread.start();
1666
1668
1667
                InputStream cgiHeaderStream =
1669
                InputStream cgiHeaderStream =
1668
                    new HTTPHeaderInputStream(proc.getInputStream());
1670
                    new HTTPHeaderInputStream(proc.getInputStream());
Lines 1752-1757 Link Here
1752
                        log ("Exception closing output stream " + ioe);
1754
                        log ("Exception closing output stream " + ioe);
1753
                    }
1755
                    }
1754
                }
1756
                }
1757
                
1758
                if(errReaderThread!=null) {
1759
                	try {
1760
						errReaderThread.join(10000);
1761
					} catch (InterruptedException e) {
1762
						Thread.currentThread().interrupt();
1763
					}
1764
                }
1765
                
1766
                
1755
                if (debug > 4) {
1767
                if (debug > 4) {
1756
                    log ("Running finally block");
1768
                    log ("Running finally block");
1757
                }
1769
                }

Return to bug 48454