* Fixing NULL dereference if server variable SSL_PROTOCOL is unset.

* Setting DefaultRuntimeDir and PidFile in test configuration to override any platform defaults.
npuichigoB · Apr 4, 2026 · f3c5a8c · f3c5a8c
1 parent ff2fbec
commit f3c5a8c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+ * Fixing NULL dereference if server variable SSL_PROTOCOL is unset.
+ * Setting DefaultRuntimeDir and PidFile in test configuration to override
+   any platform defaults.
  * Disabling pollset use when compiling with APR version < 1.6.0
 
 v2.0.0

diff --git a/mod_http2/h2_protocol.c b/mod_http2/h2_protocol.c
@@ -460,7 +460,7 @@ int h2_protocol_is_acceptable_c1(conn_rec *c, request_rec *r, int require_all)
             return 0;
         }
 
-        if (!strcmp("TLSv1.2", val)) {
+        if (val && !strcmp("TLSv1.2", val)) {
             /* Check TLS cipher blacklist, defined pre-TLSv1.3, so only
              * checking for 1.2 */
             val = ap_ssl_var_lookup(pool, s, c, NULL, "SSL_CIPHER");

diff --git a/test/pyhttpd/conf/httpd.conf.template b/test/pyhttpd/conf/httpd.conf.template
@@ -1,6 +1,9 @@
 ServerName localhost
 ServerRoot "${server_dir}"
 
+DefaultRuntimeDir logs
+PidFile httpd.pid
+
 Include "conf/modules.conf"
 
 DocumentRoot "${server_dir}/htdocs"

diff --git a/test/pyhttpd/conf/stop.conf.template b/test/pyhttpd/conf/stop.conf.template
@@ -5,6 +5,9 @@
 ServerName localhost
 ServerRoot "${server_dir}"
 
+DefaultRuntimeDir logs
+PidFile httpd.pid
+
 Include "conf/modules.conf"
 
 DocumentRoot "${server_dir}/htdocs"