httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_config.c
Date Mon, 18 Mar 2002 03:18:47 GMT
jwoolley    02/03/17 19:18:47

  Modified:    modules/ssl ssl_engine_config.c
  Log:
  Fix some possibly-uninitialized warnings and some incorrect format strings
  
  Revision  Changes    Path
  1.40      +6 -7      httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -d -u -r1.39 -r1.40
  --- ssl_engine_config.c	17 Mar 2002 17:32:24 -0000	1.39
  +++ ssl_engine_config.c	18 Mar 2002 03:18:47 -0000	1.40
  @@ -591,7 +591,7 @@
                                             int idx)
   {
       SSLSrvConfigRec *sc = mySrvConfig(parms->server);
  -    const char *err, *desc, **files;
  +    const char *err, *desc=NULL, **files=NULL;
       int i;
   
       if ((err = ssl_cmd_check_file(parms, &arg))) {
  @@ -837,7 +837,6 @@
       SSLModConfigRec *mc = myModConfig(cmd->server);
       const char *err, *colon;
       char *cp, *cp2;
  -    int maxsize;
       int arglen = strlen(arg);
   
       if ((err = ap_check_cmd_context(cmd, GLOBAL_ONLY))) {
  @@ -857,7 +856,7 @@
           mc->szSessionCacheDataFile = ap_server_root_relative(mc->pPool, arg+4);
           if (!mc->szSessionCacheDataFile) {
               return apr_psprintf(cmd->pool,
  -                                "SSLSessionCache: Invalid cache file path ",
  +                                "SSLSessionCache: Invalid cache file path %s",
                                   arg+4);
           }
       }
  @@ -871,7 +870,7 @@
               ap_server_root_relative(mc->pPool, colon+1);
           if (!mc->szSessionCacheDataFile) {
               return apr_psprintf(cmd->pool,
  -                                "SSLSessionCache: Invalid cache file path ",
  +                                "SSLSessionCache: Invalid cache file path %s",
                                   colon+1);
           }
           mc->tSessionCacheDataTable = NULL;
  @@ -898,7 +897,7 @@
                   return apr_psprintf(cmd->pool,
                                       "SSLSessionCache: Invalid argument: "
                                       "size has to be < %d bytes on this "
  -                                    "platform", maxsize);
  +                                    "platform", APR_SHM_MAXSIZE);
               }
           }
       }
  @@ -913,7 +912,7 @@
               ap_server_root_relative(mc->pPool, colon+1);
           if (!mc->szSessionCacheDataFile) {
               return apr_psprintf(cmd->pool,
  -                                "SSLSessionCache: Invalid cache file path ",
  +                                "SSLSessionCache: Invalid cache file path %s",
                                   colon+1);
           }
           mc->tSessionCacheDataTable = NULL;
  @@ -941,7 +940,7 @@
                   return apr_psprintf(cmd->pool,
                                       "SSLSessionCache: Invalid argument: "
                                       "size has to be < %d bytes on this "
  -                                    "platform", maxsize);
  +                                    "platform", APR_SHM_MAXSIZE);
   
               }
           }
  
  
  

Mime
View raw message