Changeset 480aba1 in mod_gnutls

Timestamp:

Jan 29, 2013, 8:05:42 PM (10 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, upstream

Children:

929d313

Parents:

0367e02

git-author:

Daniel Kahn Gillmor <dkg@…> (01/26/13 23:49:23)

git-committer:

Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)

Message:

correct context terminology for GnuTLSCache configurations

"global config" is not one of the four standard directive contexts as
seen at:

​https://httpd.apache.org/docs/2.2/mod/directive-dict.html#Context

The intent was clearly "server config"

Files:

• docs/mod_gnutls_manual-0.1.html (modified) (2 diffs)
• src/gnutls_config.c (modified) (1 diff)

docs/mod_gnutls_manual-0.1.html

@@ -93 +93 @@
                 GnuTLSCache none<br />
                 <h5>Context:</h5>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                global config<br />
+                server config<br />
             </div>
             <p>This directive configures the SSL Session Cache for mod_gnutls.<br />
@@ -126 +126 @@
                 GnuTLSCacheTimeout 300<br />
                 <h5>Context:</h5>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                global config<br />
+                server config<br />
             </div>    
             <p>Sets the timeout for SSL Session Cache entries expiration.<br />

src/gnutls_config.c

@@ -337 +337 @@
         const char *arg) {
     int argint;
-    mgs_srvconf_rec *sc =
-            (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-            module_config,
-            &gnutls_module);
+    const char *err;
+    mgs_srvconf_rec *sc =
+            (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+            module_config,
+            &gnutls_module);
+
+    if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY))) {
+        return err;
+    }
 
     argint = atoi(arg);