LDEV-6086 avoid killing the parent request

Author: zspitzer

core/src/main/java/lucee/runtime/functions/system/InternalRequest.java

@@ -26,7 +26,9 @@
 import lucee.runtime.config.Config;
 import lucee.runtime.engine.ThreadLocalPageContext;
 import lucee.runtime.exp.Abort;
+import lucee.runtime.exp.ApplicationException;
 import lucee.runtime.exp.FunctionException;
+import lucee.runtime.exp.RequestTimeoutException;
 import lucee.runtime.exp.PageException;
 import lucee.runtime.ext.function.Function;
 import lucee.runtime.functions.other.CreatePageContext;
@@ -135,7 +137,15 @@ else if (body != null) {
 		catch (Throwable t) {
 			ExceptionUtil.rethrowIfNecessary(t);
 			if (!Abort.isSilentAbort(t)) {
-				if (throwonerror) throw Caster.toPageException(t);
+				if (throwonerror) {
+					// wrap RequestTimeoutException so it doesn't kill the parent request
+					if (t instanceof RequestTimeoutException) {
+						ApplicationException ae = new ApplicationException(t.getMessage());
+						ae.initCause(t);
+						throw ae;
+					}
+					throw Caster.toPageException(t);
+				}
 				pe = Caster.toPageException(t);
 			}
 		}

test/tickets/LDEV6086.cfc

@@ -13,16 +13,21 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="internalRequest" {
 					throwonerror: false
 				);
 				expect( result ).toHaveKey( "error" );
-				expect( result.error.type ).toBe( "lucee.runtime.exp.RequestTimeoutException" );
+				expect( result.error.message ).toInclude( "timeout" );
 			});
 
-			it( title="InternalRequest should throw RequestTimeoutException with throwonerror=true", body=function() {
-				expect( function() {
+			it( title="InternalRequest should throw with throwonerror=true on RequestTimeoutException", body=function() {
+				try {
 					_InternalRequest(
 						template: "#variables.uri#/timeout.cfm",
 						throwonerror: true
 					);
-				}).toThrow( "lucee.runtime.exp.RequestTimeoutException" );
+					fail( "expected exception was not thrown" );
+				}
+				catch ( application e ) {
+					// wrapped in ApplicationException so it doesn't kill the parent request
+					expect( e.message ).toInclude( "timeout" );
+				}
 			});
 
 		});