Merge pull request #30 from ortus-boxlang/development

Beta 22

gradle.properties

@@ -1,5 +1,5 @@
-#Fri Oct 25 15:01:28 UTC 2024
-boxlangVersion=1.0.0-beta21
+#Fri Nov 01 20:52:59 UTC 2024
+boxlangVersion=1.0.0-beta22
 jdkVersion=21
-version=1.0.0-beta21
+version=1.0.0-beta22
 group=ortus.boxlang

src/main/java/ortus/boxlang/web/exchange/BoxHTTPUndertowExchange.java

@@ -77,7 +77,7 @@ public class BoxHTTPUndertowExchange implements IBoxHTTPExchange {
 	/**
 	 * PrintWriter for the response that wraps the channel
 	 */
-	PrintWriter						writer;
+	WhitespaceManagingPrintWriter	writer;
 
 	/**
 	 * The Undertow exchange for this request
@@ -177,6 +177,8 @@ public void flushResponseBuffer() {
 				setResponseHeader( "Content-Type", "text/html;charset=UTF-8" );
 			}
 
+			// Update this in case the content type has changed
+			writer.setWhitespaceCompressionEnabled( context.isWhitespaceCompressionEnabled() );
 			writer.flush();
 			getResponseChannel().flush();
 		} catch ( IOException e ) {
@@ -527,7 +529,7 @@ public int getResponseStatus() {
 	public PrintWriter getResponseWriter() {
 		if ( writer == null ) {
 			OutputStream outputStream = new BlockingBufferedOutputStream( getResponseChannel() );
-			writer = new PrintWriter( outputStream, false );
+			writer = new WhitespaceManagingPrintWriter( new PrintWriter( outputStream, false ), context.isWhitespaceCompressionEnabled() );
 		}
 		return writer;
 	}

src/main/java/ortus/boxlang/web/handlers/WelcomeFileHandler.java

@@ -25,6 +25,8 @@
 import io.undertow.server.handlers.resource.Resource;
 import io.undertow.server.handlers.resource.ResourceManager;
 import io.undertow.util.CanonicalPathUtils;
+import io.undertow.util.RedirectBuilder;
+import io.undertow.util.StatusCodes;
 
 /**
  * The WelcomeFileHandler is an Undertow HttpHandler that serves welcome files.
@@ -59,6 +61,15 @@ public WelcomeFileHandler( final HttpHandler next, ResourceManager resourceManag
 	public void handleRequest( final HttpServerExchange exchange ) throws Exception {
 		Resource resource = resourceManager.getResource( canonicalize( exchange.getRelativePath() ) );
 		if ( resource != null && resource.isDirectory() ) {
+			// First ensure that the directory has a trailing slash, and if not, redirect it
+			if ( !exchange.getRequestPath().endsWith( "/" ) ) {
+				exchange.setStatusCode( StatusCodes.FOUND );
+				exchange.getResponseHeaders().put( io.undertow.util.Headers.LOCATION,
+				    RedirectBuilder.redirect( exchange, exchange.getRelativePath() + "/", true ) );
+				exchange.endExchange();
+				return;
+			}
+			// if it's a directory and we have the trailing slash, then let's look for welcome files
 			Resource indexResource = getIndexFiles( exchange, resourceManager, resource.getPath(), welcomeFiles );
 			if ( indexResource != null ) {
 				String newPath = indexResource.getPath();