svn commit: r1935818 - in httpd/httpd/branches/2.4.x: . include modules/http

[email protected] Thu, 02 Jul 2026 19:55:40 -0000
Newsgroups gmane.comp.apache.cvs
Message-ID <178302214031.3846627.12698840983735966871@svn03-he-fi>
Author: jim
Date: Thu Jul  2 19:55:40 2026
New Revision: 1935818

Log:
*) include/httpd.h: Define HTTP_EARLY_HINTS (103) per RFC 8297.
     modules/http/http_protocol.c (status_lines): Add 103 response.

Modified:
   httpd/httpd/branches/2.4.x/   (props changed)
   httpd/httpd/branches/2.4.x/STATUS
   httpd/httpd/branches/2.4.x/include/httpd.h
   httpd/httpd/branches/2.4.x/modules/http/http_protocol.c

Modified: httpd/httpd/branches/2.4.x/STATUS
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS	Thu Jul  2 19:54:30 2026	(r1935817)
+++ httpd/httpd/branches/2.4.x/STATUS	Thu Jul  2 19:55:40 2026	(r1935818)
@@ -163,12 +163,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) include/httpd.h: Define HTTP_EARLY_HINTS (103) per RFC 8297.
-     modules/http/http_protocol.c (status_lines): Add 103 response.
-     Needed by backport 1934913 below.
-     trunk patch: https://svn.apache.org/r1927935
-     2.4.x patch: svn merge -c 1927935 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
 
 ------------------------------------------------------------------------
 
@@ -180,24 +174,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1934891 ^/httpd/httpd/trunk .
      +1: jim,
 
-  *) modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_remain):
-     Fix off-by-one in tm_mday calculation, identified by Gemini.
-     trunk patch: https://svn.apache.org/1931420
-     2.4.x patch: svn merge -c 1931420 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
-
-  *) Constify static arrays of string constants.
-     trunk patch: https://svn.apache.org/r1933659
-     2.4.x patch: svn merge -c 1933659 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
-
-  *) include/httpd.h: Define HTTP_EARLY_HINTS (103) per RFC 8297.
-     modules/http/http_protocol.c (status_lines): Add 103 response.
-     Needed by backport 1934913 below.
-     trunk patch: https://svn.apache.org/r1927935
-     2.4.x patch: svn merge -c 1927935 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
-
   *) Use HTTP_* and ap_is_*() macros instead of literal;
      Use ap_strstr_c() instead of strstr() in mod_md.
      trunk patch: https://svn.apache.org/r1934913

Modified: httpd/httpd/branches/2.4.x/include/httpd.h
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h	Thu Jul  2 19:54:30 2026	(r1935817)
+++ httpd/httpd/branches/2.4.x/include/httpd.h	Thu Jul  2 19:55:40 2026	(r1935818)
@@ -486,11 +486,12 @@ AP_DECLARE(const char *) ap_get_server_b
  * When adding a new code here add it to status_lines as well.
  * A future version should dynamically generate the apr_table_t at startup.
  */
-#define RESPONSE_CODES 103
+#define RESPONSE_CODES 104
 
 #define HTTP_CONTINUE                        100
 #define HTTP_SWITCHING_PROTOCOLS             101
 #define HTTP_PROCESSING                      102
+#define HTTP_EARLY_HINTS                     103
 #define HTTP_OK                              200
 #define HTTP_CREATED                         201
 #define HTTP_ACCEPTED                        202

Modified: httpd/httpd/branches/2.4.x/modules/http/http_protocol.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_protocol.c	Thu Jul  2 19:54:30 2026	(r1935817)
+++ httpd/httpd/branches/2.4.x/modules/http/http_protocol.c	Thu Jul  2 19:55:40 2026	(r1935818)
@@ -75,7 +75,8 @@ static const char * const status_lines[R
     "100 Continue",
     "101 Switching Protocols",
     "102 Processing",
-#define LEVEL_200  3
+    "103 Early Hints",
+#define LEVEL_200  4
     "200 OK",
     "201 Created",
     "202 Accepted",
@@ -103,7 +104,7 @@ static const char * const status_lines[R
     NULL, /* 224 */
     NULL, /* 225 */
     "226 IM Used",
-#define LEVEL_300 30
+#define LEVEL_300 31
     "300 Multiple Choices",
     "301 Moved Permanently",
     "302 Found",
@@ -113,7 +114,7 @@ static const char * const status_lines[R
     NULL, /* 306 */
     "307 Temporary Redirect",
     "308 Permanent Redirect",
-#define LEVEL_400 39
+#define LEVEL_400 40
     "400 Bad Request",
     "401 Unauthorized",
     "402 Payment Required",
@@ -166,7 +167,7 @@ static const char * const status_lines[R
     NULL, /* 449 */
     NULL, /* 450 */
     "451 Unavailable For Legal Reasons",
-#define LEVEL_500 91
+#define LEVEL_500 92
     "500 Internal Server Error",
     "501 Not Implemented",
     "502 Bad Gateway",