httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/ssl README mod_ssl.h ssl_engine_compat.c ssl_engine_config.c ssl_engine_init.c ssl_engine_kernel.c ssl_engine_log.c ssl_scache.c ssl_util.c
Date Sat, 05 May 2001 15:02:14 GMT
rse         01/05/05 08:02:14

  Modified:    modules/ssl README mod_ssl.h ssl_engine_compat.c
                        ssl_engine_config.c ssl_engine_init.c
                        ssl_engine_kernel.c ssl_engine_log.c ssl_scache.c
                        ssl_util.c
  Log:
  Axe out EAPI-based SSL_VENDOR stuff.
  If we want this later again, we have to do it differently anyway. So,
  for now we try to strip down mod_ssl as heavy as possible and hence we
  kick out this stuff at all.
  
  Revision  Changes    Path
  1.4       +0 -18     httpd-2.0/modules/ssl/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/README,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README	2001/05/05 09:31:25	1.3
  +++ README	2001/05/05 15:02:13	1.4
  @@ -140,21 +140,3 @@
        mod_ssl automatically recognizes this OpenSSL variant and then can
        activate external crypto devices through SSLCryptoDevice directive.
   
  - VENDOR EXTENSIONS
  -
  - Inside the mod_ssl sources you can enable various EAPI vendor hooks
  - (`ap::mod_ssl::vendor::xxxx') by using the APACI --enable-rule=SSL_VENDOR
  - option.  These hooks can be used to change or extend mod_ssl by a vendor
  - without patching the source code. Grep for `ap::mod_ssl::vendor::'.
  - Additionally vendors can add their own source code to files named
  - ssl_vendor.c, ssl_vendor_XXX.c, etc.  The libssl.module script automatically
  - picks these up under configuration time and mod_ssl under run-time calls the
  - functions `void ssl_vendor_register(void)' and `void
  - ssl_vendor_unregister(void)' inside these objects to bootstrap them.
  -
  - An ssl_vendor.c should at least contain the following contents:
  -
  -   |  #include "mod_ssl.h"
  -   |  void ssl_vendor_register(void) { return; }
  -   |  void ssl_vendor_unregister(void) { return; }
  -
  
  
  
  1.5       +0 -16     httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_ssl.h	2001/05/05 09:58:03	1.4
  +++ mod_ssl.h	2001/05/05 15:02:13	1.5
  @@ -563,9 +563,6 @@
       struct {
           void *pV1, *pV2, *pV3, *pV4, *pV5, *pV6, *pV7, *pV8, *pV9, *pV10;
       } rCtx;
  -#ifdef SSL_VENDOR
  -    ap_ctx         *ctx;
  -#endif
   } SSLModConfigRec;
   
   /*
  @@ -609,9 +606,6 @@
       SSL_CTX     *pSSLProxyCtx;
       STACK_OF(X509_INFO) *skProxyClientCerts;
   #endif
  -#ifdef SSL_VENDOR
  -    ap_ctx      *ctx;
  -#endif
   } SSLSrvConfigRec;
   
   /*
  @@ -634,9 +628,6 @@
       char         *szCACertificatePath;
       char         *szCACertificateFile;
   #endif
  -#ifdef SSL_VENDOR
  -    ap_ctx       *ctx;
  -#endif
   #endif /* XXX */
   } SSLDirConfigRec;
   #if 0 /* XXX */
  @@ -833,7 +824,6 @@
   #endif
   
   /*  Utility Functions  */
  -char        *ssl_util_server_root_relative(pool *, char *, char *);
   char        *ssl_util_vhostid(pool *, server_rec *);
   void         ssl_util_strupper(char *);
   void         ssl_util_uuencode(char *, const char *, BOOL);
  @@ -847,12 +837,6 @@
   char        *ssl_util_algotypestr(ssl_algo_t);
   char        *ssl_util_ptxtsub(pool *, const char *, const char *, char *);
   void         ssl_util_thread_setup(void);
  -
  -/*  Vendor extension support  */
  -#if defined(SSL_VENDOR) && defined(SSL_VENDOR_OBJS)
  -void         ssl_vendor_register(void);
  -void         ssl_vendor_unregister(void);
  -#endif
   
   #endif /* XXX */
   
  
  
  
  1.4       +0 -16     httpd-2.0/modules/ssl/ssl_engine_compat.c
  
  Index: ssl_engine_compat.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_compat.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_engine_compat.c	2001/05/05 10:12:02	1.3
  +++ ssl_engine_compat.c	2001/05/05 15:02:13	1.4
  @@ -481,22 +481,6 @@
                   ap_table_set(r->subprocess_env, cpOld, cpVal);
           }
           else if (cpMsg != NULL) {
  -#ifdef SSL_VENDOR
  -           /*
  -            * something that isn't provided by mod_ssl, so at least
  -            * let vendor extensions provide a reasonable value first.
  -            */
  -            cpVal = NULL;
  -            ap_hook_use("ap::mod_ssl::vendor::compat_variables_lookup",
  -                        AP_HOOK_SIG3(ptr,ptr,ptr),
  -                        AP_HOOK_DECLINE(NULL),
  -                        &cpVal, r, cpOld);
  -            if (cpVal != NULL) {
  -                ap_table_set(r->subprocess_env, cpOld, cpVal);
  -                continue;
  -            }
  -#endif
  -
               /*
                * we cannot print a message, so we set at least
                * the variables content to the compat message
  
  
  
  1.5       +19 -64    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ssl_engine_config.c	2001/05/05 09:58:04	1.4
  +++ ssl_engine_config.c	2001/05/05 15:02:13	1.5
  @@ -84,9 +84,6 @@
           ssl_var_register();
           ssl_ext_register();
           ssl_io_register();
  -#if defined(SSL_VENDOR) && defined(SSL_VENDOR_OBJS)
  -        ssl_vendor_register();
  -#endif
       }
       return;
   }
  @@ -100,9 +97,6 @@
           ssl_var_unregister();
           ssl_ext_unregister();
           ssl_io_unregister();
  -#if defined(SSL_VENDOR) && defined(SSL_VENDOR_OBJS)
  -        ssl_vendor_unregister();
  -#endif
       }
       return;
   }
  @@ -145,12 +139,6 @@
   
           (void)memset(mc->pTmpKeys, 0, SSL_TKPIDX_MAX*sizeof(void *));
   
  -#ifdef SSL_VENDOR
  -        mc->ctx = ap_ctx_new(pPool);
  -        ap_hook_use("ap::mod_ssl::vendor::config_global_create",
  -                AP_HOOK_SIG2(void,ptr), AP_HOOK_MODE_ALL, mc);
  -#endif
  -
           /*
            * And push it into Apache's global context
            */
  @@ -225,13 +213,6 @@
       (void)memset(sc->pPublicCert, 0, SSL_AIDX_MAX*sizeof(X509 *));
       (void)memset(sc->pPrivateKey, 0, SSL_AIDX_MAX*sizeof(EVP_PKEY *));
   
  -#ifdef SSL_VENDOR
  -    sc->ctx = ap_ctx_new(p);
  -    ap_hook_use("ap::mod_ssl::vendor::config_server_create",
  -                AP_HOOK_SIG4(void,ptr,ptr,ptr), AP_HOOK_MODE_ALL,
  -                p, s, sc);
  -#endif
  -
       return sc;
   }
   
  @@ -271,13 +252,6 @@
           cfgMerge(pPrivateKey[i], NULL);
       }
   
  -#ifdef SSL_VENDOR
  -    cfgMergeCtx(ctx);
  -    ap_hook_use("ap::mod_ssl::vendor::config_server_merge",
  -                AP_HOOK_SIG5(void,ptr,ptr,ptr,ptr), AP_HOOK_MODE_ALL,
  -                p, base, add, new);
  -#endif
  -
   #ifdef SSL_EXPERIMENTAL_PROXY
       cfgMergeInt(nProxyVerifyDepth);
       cfgMergeString(szProxyCACertificatePath);
  @@ -314,13 +288,6 @@
       dc->szCACertificateFile    = NULL;
   #endif
   
  -#ifdef SSL_VENDOR
  -    dc->ctx = ap_ctx_new(p);
  -    ap_hook_use("ap::mod_ssl::vendor::config_perdir_create",
  -                AP_HOOK_SIG4(void,ptr,ptr,ptr), AP_HOOK_MODE_ALL,
  -                p, dir, dc);
  -#endif
  -
       return dc;
   }
   
  @@ -356,13 +323,6 @@
       cfgMergeString(szCACertificateFile);
   #endif
   
  -#ifdef SSL_VENDOR
  -    cfgMergeCtx(ctx);
  -    ap_hook_use("ap::mod_ssl::vendor::config_perdir_merge",
  -                AP_HOOK_SIG5(void,ptr,ptr,ptr,ptr), AP_HOOK_MODE_ALL,
  -                p, base, add, new);
  -#endif
  -
       return new;
   }
   
  @@ -403,7 +363,7 @@
   #ifndef WIN32
           mc->nMutexMode  = SSL_MUTEXMODE_FILE;
           mc->szMutexFile = ap_psprintf(mc->pPool, "%s.%lu",
  -                                      ssl_util_server_root_relative(cmd->pool, "mutex",
arg+5),
  +                                      ap_server_root_relative(cmd->pool, "mutex", arg+5),
                                         (unsigned long)getpid());
   #else
           return "SSLMutex: Lockfiles not available on this platform";
  @@ -437,7 +397,7 @@
       }
       else if (strlen(arg) > 5 && strEQn(arg, "exec:", 5)) {
           sc->nPassPhraseDialogType  = SSL_PPTYPE_FILTER;
  -        sc->szPassPhraseDialogPath = ssl_util_server_root_relative(cmd->pool, "dialog",
arg+5);
  +        sc->szPassPhraseDialogPath = ap_server_root_relative(cmd->pool, "dialog",
arg+5);
           if (!ssl_util_path_check(SSL_PCM_EXISTS, sc->szPassPhraseDialogPath))
               return ap_pstrcat(cmd->pool, "SSLPassPhraseDialog: file '",
                                 sc->szPassPhraseDialogPath, "' not exists", NULL);
  @@ -504,16 +464,16 @@
                             "invalid context: `", arg1, "'");
       if (strlen(arg2) > 5 && strEQn(arg2, "file:", 5)) {
           pRS->nSrc   = SSL_RSSRC_FILE;
  -        pRS->cpPath = ap_pstrdup(mc->pPool, ssl_util_server_root_relative(cmd->pool,
"random", arg2+5));
  +        pRS->cpPath = ap_pstrdup(mc->pPool, ap_server_root_relative(cmd->pool,
"random", arg2+5));
       }
       else if (strlen(arg2) > 5 && strEQn(arg2, "exec:", 5)) {
           pRS->nSrc   = SSL_RSSRC_EXEC;
  -        pRS->cpPath = ap_pstrdup(mc->pPool, ssl_util_server_root_relative(cmd->pool,
"random", arg2+5));
  +        pRS->cpPath = ap_pstrdup(mc->pPool, ap_server_root_relative(cmd->pool,
"random", arg2+5));
       }
   #if SSL_LIBRARY_VERSION >= 0x00905100
       else if (strlen(arg2) > 4 && strEQn(arg2, "egd:", 4)) {
           pRS->nSrc   = SSL_RSSRC_EGD;
  -        pRS->cpPath = ap_pstrdup(mc->pPool, ssl_util_server_root_relative(cmd->pool,
"random", arg2+4));
  +        pRS->cpPath = ap_pstrdup(mc->pPool, ap_server_root_relative(cmd->pool,
"random", arg2+4));
       }
   #endif
       else if (strcEQ(arg2, "builtin")) {
  @@ -522,7 +482,7 @@
       }
       else {
           pRS->nSrc   = SSL_RSSRC_FILE;
  -        pRS->cpPath = ap_pstrdup(mc->pPool, ssl_util_server_root_relative(cmd->pool,
"random", arg2));
  +        pRS->cpPath = ap_pstrdup(mc->pPool, ap_server_root_relative(cmd->pool,
"random", arg2));
       }
       if (pRS->nSrc != SSL_RSSRC_BUILTIN)
           if (!ssl_util_path_check(SSL_PCM_EXISTS, pRS->cpPath))
  @@ -575,7 +535,7 @@
       char *cpPath;
       int i;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCertificateFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -598,7 +558,7 @@
       char *cpPath;
       int i;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCertificateKeyFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -620,7 +580,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCertificateChainFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -636,7 +596,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISDIR, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCACertificatePath: directory '",
                             cpPath, "' not exists", NULL);
  @@ -659,7 +619,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCACertificateFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -682,7 +642,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISDIR, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCARecocationPath: directory '",
                             cpPath, "' not exists", NULL);
  @@ -698,7 +658,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLCARevocationFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -770,7 +730,7 @@
       else if (strlen(arg) > 4 && strcEQn(arg, "dbm:", 4)) {
           mc->nSessionCacheMode      = SSL_SCMODE_DBM;
           mc->szSessionCacheDataFile = ap_pstrdup(mc->pPool,
  -                                     ssl_util_server_root_relative(cmd->pool, "scache",
arg+4));
  +                                     ap_server_root_relative(cmd->pool, "scache", arg+4));
       }
       else if (   (strlen(arg) > 4 && strcEQn(arg, "shm:",   4)) 
                || (strlen(arg) > 6 && strcEQn(arg, "shmht:", 6))) {
  @@ -779,7 +739,7 @@
           mc->nSessionCacheMode      = SSL_SCMODE_SHMHT;
           cp = strchr(arg, ':');
           mc->szSessionCacheDataFile = ap_pstrdup(mc->pPool,
  -                                     ssl_util_server_root_relative(cmd->pool, "scache",
cp+1));
  +                                     ap_server_root_relative(cmd->pool, "scache", cp+1));
           mc->tSessionCacheDataTable = NULL;
           mc->nSessionCacheDataSize  = 1024*512; /* 512KB */
           if ((cp = strchr(mc->szSessionCacheDataFile, '(')) != NULL) {
  @@ -819,11 +779,6 @@
           }
       }
   	else
  -#ifdef SSL_VENDOR
  -        if (!ap_hook_use("ap::mod_ssl::vendor::cmd_sslsessioncache",
  -             AP_HOOK_SIG4(void,ptr,ptr,ptr), AP_HOOK_MODE_ALL,
  -             cmd, arg, mc))
  -#endif
           return "SSLSessionCache: Invalid argument";
   #endif /* XXX */
       return NULL;
  @@ -1095,7 +1050,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLProxyCACertificateFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -1111,7 +1066,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISDIR, cpPath))
           return ap_pstrcat(cmd->pool, "SSLProxyCACertificatePath: directory '",
                             cpPath, "' does not exists", NULL);
  @@ -1127,7 +1082,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath))
           return ap_pstrcat(cmd->pool, "SSLProxyMachineCertFile: file '",
                             cpPath, "' not exists or empty", NULL);
  @@ -1143,7 +1098,7 @@
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       char *cpPath;
   
  -    cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg);
  +    cpPath = ap_server_root_relative(cmd->pool, "certkey", arg);
       if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISDIR, cpPath))
           return ap_pstrcat(cmd->pool, "SSLProxyMachineCertPath: directory '",
                             cpPath, "' does not exists", NULL);
  
  
  
  1.4       +0 -11     httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_engine_init.c	2001/05/05 10:12:03	1.3
  +++ ssl_engine_init.c	2001/05/05 15:02:13	1.4
  @@ -145,11 +145,6 @@
           ssl_log(s, SSL_LOG_INFO, "Init: %d%s restart round (already detached)",
                   mc->nInitCount-2, (mc->nInitCount-2) == 1 ? "st" : "nd");
   
  -#ifdef SSL_VENDOR
  -    ap_hook_use("ap::mod_ssl::vendor::init_module",
  -                AP_HOOK_SIG3(void,ptr,ptr), AP_HOOK_ALL, s, p);
  -#endif
  -
       /*
        *  The initialization phase inside the Apache API is totally bogus.
        *  We actually have three non-trivial problems:
  @@ -829,12 +824,6 @@
                   "server certificate chain (%d CA certificate%s)", cpVHostID,
                   n, n == 1 ? "" : "s");
       }
  -
  -#ifdef SSL_VENDOR
  -    ap_hook_use("ap::mod_ssl::vendor::configure_server",
  -                AP_HOOK_SIG4(void,ptr,ptr,ptr), AP_HOOK_ALL, 
  -                s, p, sc);
  -#endif
   
       return;
   }
  
  
  
  1.4       +0 -12     httpd-2.0/modules/ssl/ssl_engine_kernel.c
  
  Index: ssl_engine_kernel.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_engine_kernel.c	2001/05/05 10:12:03	1.3
  +++ ssl_engine_kernel.c	2001/05/05 15:02:13	1.4
  @@ -365,13 +365,6 @@
   #ifndef WIN32
       SSL_set_read_ahead(ssl, TRUE);
   #endif
  -
  -#ifdef SSL_VENDOR
  -    /* Allow vendors to do more things on connection time... */
  -    ap_hook_use("ap::mod_ssl::vendor::new_connection",
  -                AP_HOOK_SIG2(void,ptr), AP_HOOK_ALL, conn);
  -#endif
  -
       return;
   }
   
  @@ -1032,11 +1025,6 @@
        * deny access.
        */
       rc = DECLINED;
  -#ifdef SSL_VENDOR
  -    ap_hook_use("ap::mod_ssl::vendor::access_handler",
  -                AP_HOOK_SIG2(int,ptr), AP_HOOK_DECLINE(DECLINED),
  -                &rc, r);
  -#endif
       return rc;
   }
   
  
  
  
  1.4       +2 -2      httpd-2.0/modules/ssl/ssl_engine_log.c
  
  Index: ssl_engine_log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_engine_log.c	2001/05/05 10:12:03	1.3
  +++ ssl_engine_log.c	2001/05/05 15:02:13	1.4
  @@ -97,7 +97,7 @@
           if (strEQ(sc->szLogFile, "/dev/null"))
               return;
           else if (sc->szLogFile[0] == '|') {
  -            szLogFile = ssl_util_server_root_relative(p, "log", sc->szLogFile+1);
  +            szLogFile = ap_server_root_relative(p, "log", sc->szLogFile+1);
               if ((pl = ap_open_piped_log(p, szLogFile)) == NULL) {
                   ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,
                           "Cannot open reliable pipe to SSL logfile filter %s", szLogFile);
  @@ -107,7 +107,7 @@
               setbuf(sc->fileLogFile, NULL);
           }
           else {
  -            szLogFile = ssl_util_server_root_relative(p, "log", sc->szLogFile);
  +            szLogFile = ap_server_root_relative(p, "log", sc->szLogFile);
               if ((sc->fileLogFile = ap_pfopen(p, szLogFile, "a")) == NULL) {
                   ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,
                           "Cannot open SSL logfile %s", szLogFile);
  
  
  
  1.4       +0 -38     httpd-2.0/modules/ssl/ssl_scache.c
  
  Index: ssl_scache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_scache.c	2001/05/05 10:12:06	1.3
  +++ ssl_scache.c	2001/05/05 15:02:13	1.4
  @@ -81,11 +81,6 @@
           ssl_scache_shmht_init(s, p);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           ssl_scache_shmcb_init(s, p);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_init",
  -                    AP_HOOK_SIG3(void,ptr,ptr), AP_HOOK_ALL, s, p);
  -#endif
       return;
   }
   
  @@ -99,11 +94,6 @@
           ssl_scache_shmht_kill(s);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           ssl_scache_shmcb_kill(s);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_kill",
  -                    AP_HOOK_SIG2(void,ptr), AP_HOOK_ALL, s);
  -#endif
       return;
   }
   
  @@ -118,12 +108,6 @@
           rv = ssl_scache_shmht_store(s, id, idlen, expiry, sess);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           rv = ssl_scache_shmcb_store(s, id, idlen, expiry, sess);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_store",
  -                    AP_HOOK_SIG6(int,ptr,ptr,int,int,ptr), AP_HOOK_ALL,
  -                    (int *)&rv, s, id, idlen, (int)expiry, sess);
  -#endif
       return rv;
   }
   
  @@ -138,12 +122,6 @@
           sess = ssl_scache_shmht_retrieve(s, id, idlen);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           sess = ssl_scache_shmcb_retrieve(s, id, idlen);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_retrieve",
  -                    AP_HOOK_SIG4(ptr,ptr,ptr,int), AP_HOOK_ALL, 
  -                    &sess, s, id, idlen);
  -#endif
       return sess;
   }
   
  @@ -157,11 +135,6 @@
           ssl_scache_shmht_remove(s, id, idlen);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           ssl_scache_shmcb_remove(s, id, idlen);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_remove",
  -                    AP_HOOK_SIG4(void,ptr,ptr,int), AP_HOOK_ALL, s, id, idlen);
  -#endif
       return;
   }
   
  @@ -175,12 +148,6 @@
           ssl_scache_shmht_status(s, p, func, arg);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           ssl_scache_shmcb_status(s, p, func, arg);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_status",
  -                    AP_HOOK_SIG5(void,ptr,ptr,ptr,ptr), AP_HOOK_ALL, 
  -                    s, p, func, arg);
  -#endif
       return;
   }
   
  @@ -194,11 +161,6 @@
           ssl_scache_shmht_expire(s);
       else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
           ssl_scache_shmcb_expire(s);
  -#ifdef SSL_VENDOR
  -    else
  -        ap_hook_use("ap::mod_ssl::vendor::scache_expire",
  -                    AP_HOOK_SIG2(void,ptr), AP_HOOK_ALL, s);
  -#endif
       return;
   }
   
  
  
  
  1.4       +0 -14     httpd-2.0/modules/ssl/ssl_util.c
  
  Index: ssl_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_util.c	2001/05/05 10:12:07	1.3
  +++ ssl_util.c	2001/05/05 15:02:13	1.4
  @@ -71,20 +71,6 @@
   **  _________________________________________________________________
   */
   
  -char *ssl_util_server_root_relative(pool *p, char *what, char *arg)
  -{
  -    char *rv = NULL;
  -
  -#ifdef SSL_VENDOR
  -    ap_hook_use("ap::mod_ssl::vendor::ssl_server_root_relative",
  -                AP_HOOK_SIG4(ptr,ptr,ptr,ptr), AP_HOOK_ALL, &rv, p, what, arg);
  -    if (rv != NULL)
  -        return rv;
  -#endif
  -    rv = ap_server_root_relative(p, arg);
  -    return rv;
  -}
  -
   char *ssl_util_vhostid(pool *p, server_rec *s)
   {
       char *id;
  
  
  

Mime
View raw message