svn commit: r1934901 - in httpd/httpd/branches/2.4.x: . changes-entries modules/ssl

Author: covener
Date: Tue Jun  2 17:14:41 2026
New Revision: 1934901

Log:
Merge r1934210 from trunk:

mod_ssl: Set auth type to \"ClientCert\" after authentication

When client certificate authentication has been performed r->ap_auth_type was
never populated and env AUTH_TYPE was empty.
We now set auth type to \"ClientCert\".

PR: 45058
Submitted by: Michael Osipov <[email protected]>
Reviewed by:  michaelo, jorton, rpluem
Github: closes #645

Added:
   httpd/httpd/branches/2.4.x/changes-entries/ssl-authtype.txt
      - copied unchanged from r1934210, httpd/httpd/trunk/changes-entries/ssl-authtype.txt
Modified:
   httpd/httpd/branches/2.4.x/   (props changed)
   httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c

Copied: httpd/httpd/branches/2.4.x/changes-entries/ssl-authtype.txt (from r1934210, httpd/httpd/trunk/changes-entries/ssl-authtype.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ httpd/httpd/branches/2.4.x/changes-entries/ssl-authtype.txt	Tue Jun  2 17:14:41 2026	(r1934901, copy of r1934210, httpd/httpd/trunk/changes-entries/ssl-authtype.txt)
@@ -0,0 +1,2 @@
+*) mod_ssl: Set auth type to "ClientCert" when client certificate authentication
+   has been performed.  [Michael Osipov <michaelo apache.org>]

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c	Tue Jun  2 17:13:55 2026	(r1934900)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c	Tue Jun  2 17:14:41 2026	(r1934901)
@@ -1120,8 +1120,10 @@ int ssl_hook_Access(request_rec *r)
     if ((dc->nOptions & SSL_OPT_FAKEBASICAUTH) == 0 && dc->szUserName) {
         char *val = ssl_var_lookup(r->pool, r->server, r->connection,
                                    r, (char *)dc->szUserName);
-        if (val && val[0])
+        if (val && val[0]) {
             r->user = val;
+            r->ap_auth_type = "ClientCert";
+        }
         else
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02227)
                           "Failed to set r->user to '%s'", dc->szUserName);