This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a5be9a604c89827edabef45410fb95cb6b7a64d2 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Apr 29 20:35:47 2025 +0100 Add HTTP and renumber diagrams --- webapps/docs/architecture/requestProcess.xml | 5 +-- .../{1_nio.plantuml => 11_nio.plantuml} | 0 .../requestProcess/{1_nio.png => 11_nio.png} | Bin .../architecture/requestProcess/21_http11.plantuml | 38 +++++++++++++++++++++ .../docs/architecture/requestProcess/21_http11.png | Bin 0 -> 18334 bytes 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/webapps/docs/architecture/requestProcess.xml b/webapps/docs/architecture/requestProcess.xml index 97ec32d73f..5b16e97559 100644 --- a/webapps/docs/architecture/requestProcess.xml +++ b/webapps/docs/architecture/requestProcess.xml @@ -44,7 +44,7 @@ UML diagrams have been created for each Endpoint implementation to show how requests flow from the endpoint to the protocol. </p> <p> -<a href="requestProcess/1_nio.png">Diagram 1</a> shows how requests received via +<a href="requestProcess/11_nio.png">Diagram 1.1</a> shows how requests received via an NIO based endpoint are processed upto the point they reach the processor instance. </p> @@ -59,7 +59,8 @@ UML diagrams have been created for each protocol to show how requests flow from the processor instance to the CoyoteAdapter. </p> <p> -HTTP/1.1 TBD. +<a href="requestProcess/21_http11.png">Diagram 2.1</a> shows how HTTP/0.9, HTTP/1.0 +and HTTP/1.1 requests are processed. </p> <p> HTTP/2 - TBD. diff --git a/webapps/docs/architecture/requestProcess/1_nio.plantuml b/webapps/docs/architecture/requestProcess/11_nio.plantuml similarity index 100% rename from webapps/docs/architecture/requestProcess/1_nio.plantuml rename to webapps/docs/architecture/requestProcess/11_nio.plantuml diff --git a/webapps/docs/architecture/requestProcess/1_nio.png b/webapps/docs/architecture/requestProcess/11_nio.png similarity index 100% rename from webapps/docs/architecture/requestProcess/1_nio.png rename to webapps/docs/architecture/requestProcess/11_nio.png diff --git a/webapps/docs/architecture/requestProcess/21_http11.plantuml b/webapps/docs/architecture/requestProcess/21_http11.plantuml new file mode 100644 index 0000000000..4060b80084 --- /dev/null +++ b/webapps/docs/architecture/requestProcess/21_http11.plantuml @@ -0,0 +1,38 @@ +@startuml + +' Licensed to the Apache Software Foundation (ASF) under one or more +' contributor license agreements. See the NOTICE file distributed with +' this work for additional information regarding copyright ownership. +' The ASF licenses this file to You under the Apache License, Version 2.0 +' (the "License"); you may not use this file except in compliance with +' the License. You may obtain a copy of the License at +' +' http://www.apache.org/licenses/LICENSE-2.0 +' +' Unless required by applicable law or agreed to in writing, software +' distributed under the License is distributed on an "AS IS" BASIS, +' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +' See the License for the specific language governing permissions and +' limitations under the License. + +hide footbox +skinparam style strictuml + +activate Processor + +Processor -> InputBuffer ++: parseRequestLine() +return +Processor -> Processor ++: prepareRequestProtocol() +return +Processor -> InputBuffer ++: parseHeaders() +return +Processor -> Processor ++: prepareRequest() +return +Processor -> CoyoteAdapter ++: service() +note right of CoyoteAdapter + Servlet request processing + happens here +end note +return + +@enduml \ No newline at end of file diff --git a/webapps/docs/architecture/requestProcess/21_http11.png b/webapps/docs/architecture/requestProcess/21_http11.png new file mode 100644 index 0000000000..dd59be2b2b Binary files /dev/null and b/webapps/docs/architecture/requestProcess/21_http11.png differ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org