cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties

[kinman]

kinman      2003/12/11 10:24:22

  Modified:    jasper2/src/share/org/apache/jasper/compiler Parser.java
               jasper2/src/share/org/apache/jasper/resources
                        messages.properties
  Log:
  - Fix 25448: Allow white spaces in an empty body for <jsp:include>
  
  Revision  Changes    Path
  1.86      +4 -3      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- Parser.java       4 Dec 2003 19:37:58 -0000       1.85
  +++ Parser.java       11 Dec 2003 18:24:21 -0000      1.86
  @@ -1090,6 +1090,7 @@
                         "&lt;" + tag );
        }
           
  +        reader.skipSpaces();
           if( reader.matchesETag( tag ) ) {
               // EmptyBody
               return;
  
  
  
  1.137     +2 -2      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- messages.properties       10 Dec 2003 00:24:23 -0000      1.136
  +++ messages.properties       11 Dec 2003 18:24:21 -0000      1.137
  @@ -116,7 +116,7 @@
   jsp.error.include.badflush=jsp:include page=\"...\" flush=\"true\" is the only 
valid combination in JSP 1.0
   jsp.error.attempt_to_clear_flushed_buffer=Error: Attempt to clear a buffer that's 
already been flushed
   jsp.error.overflow=Error: JSP Buffer overflow
  -jsp.error.paramexpected=Expected \"param\" tag with \"name\" and \"value\" 
attributes
  +jsp.error.paramexpected=Expecting \"jsp:param\" standard action with \"name\" and 
\"value\" attributes
   jsp.error.param.invalidUse=The jsp:param action must not be used outside the 
jsp:include, jsp:forward, or jsp:params elements
   jsp.error.params.invalidUse=jsp:params must be a direct child of jsp:plugin
   jsp.error.fallback.invalidUse=jsp:fallback must be a direct child of jsp:plugin
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]