Author: jfclere Date: Sat Apr 27 09:39:02 2013 New Revision: 1476541 URL: http://svn.apache.org/r1476541 Log: commit accepted patch for BZ 54382.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=1476541&r1=1476540&r2=1476541&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Sat Apr 27 09:39:02 2013 @@ -306,11 +306,11 @@ public class SSIProcessor { break; } } - String command = null; - if (firstLetter != -1) { - command = cmd.substring(firstLetter, lastLetter + 1); + if (firstLetter == -1) { + return ""; + } else { + return cmd.substring(firstLetter, lastLetter + 1); } - return command; } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1476541&r1=1476540&r2=1476541&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Apr 27 09:39:02 2013 @@ -46,7 +46,11 @@ <section name="Tomcat 6.0.37 (jfclere)"> <subsection name="Catalina"> <changelog> - <fix> + <fix> + <bug>54382</bug>: Fix NPE when SSI processing is enabled and an empty + SSI directive is present. (markt) + </fix> + <fix> <bug>53481</bug>: Added support for SSLHonorCipherOrder to allow the server to impose its cipher order on the client. Based on a patch provided by Marcel Å ebek. (schultz) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org