httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1685078 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
Date Fri, 12 Jun 2015 12:31:13 GMT
Author: ylavic
Date: Fri Jun 12 12:31:13 2015
New Revision: 1685078

URL: http://svn.apache.org/r1685078
Log:
Follow up to r1685052: use retained data pattern instead.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1685078&r1=1685077&r2=1685078&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Fri Jun 12 12:31:13 2015
@@ -839,21 +839,17 @@ const char *ssl_cmd_SSLCertificateChainF
                                             const char *arg)
 {
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
-    void *once = NULL;
     const char *err;
 
-    apr_pool_userdata_get(&once, "ssl_cmd_SSLCertificateChainFile",
-                          ap_pglobal);
-    if (!once) {
+    const char *once_key = "ssl_cmd_SSLCertificateChainFile";
+    if (!ap_retained_data_get(once_key)) {
+        ap_retained_data_create(once_key, sizeof(char));
+
         ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, NULL,
                      APLOGNO(02559)
                      "The SSLCertificateChainFile directive (%s:%d) is "
                      "deprecated, SSLCertificateFile should be used instead",
                      cmd->directive->filename, cmd->directive->line_num);
-
-        apr_pool_userdata_set("ssl_cmd_SSLCertificateChainFile",
-                              apr_pstrdup(ap_pglobal, "1"), NULL,
-                              ap_pglobal);
     }
 
     if ((err = ssl_cmd_check_file(cmd, &arg))) {



Mime
View raw message