cvs commit: httpd-2.0/modules/ssl mod_ssl.c ssl_engine_kernel.c

[do...@apache.org]

dougm       01/11/21 16:42:35

  Modified:    modules/ssl mod_ssl.c ssl_engine_kernel.c
  Log:
  get rid of 'apctx' table that used to live in SSL_get_app_data2(ssl)
  change app_data2 to be the request_rec itself.
  if something needs per-request context in the future,
  it can use r->request_config
  
  Revision  Changes    Path
  1.36      +1 -4      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- mod_ssl.c	2001/11/22 00:25:00	1.35
  +++ mod_ssl.c	2001/11/22 00:42:35	1.36
  @@ -220,7 +220,6 @@
   static int ssl_hook_pre_connection(conn_rec *c)
   {
       SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
  -    apr_table_t *apctx;
       SSL *ssl;
       unsigned char *cpVHostID;
       char *cpVHostMD5;
  @@ -272,9 +271,7 @@
           return DECLINED; /* XXX */
       }
       SSL_set_app_data(ssl, c);
  -    apctx = apr_table_make(c->pool, AP_CTX_MAX_ENTRIES);
  -    apr_table_setn(apctx, "ssl::request_rec", NULL);
  -    SSL_set_app_data2(ssl, apctx);
  +    SSL_set_app_data2(ssl, NULL); /* will be request_rec */
   
       sslconn->ssl = ssl;
   
  
  
  
  1.26      +2 -6      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ssl_engine_kernel.c	2001/11/22 00:25:00	1.25
  +++ ssl_engine_kernel.c	2001/11/22 00:42:35	1.26
  @@ -165,7 +165,6 @@
   {
       SSLConnRec *sslconn = myConnConfig(r->connection);
       SSL *ssl;
  -    apr_table_t *apctx;
   
       /*
        * Get the SSL connection structure and perform the
  @@ -173,8 +172,7 @@
        */
       ssl = sslconn->ssl;
       if (ssl != NULL) {
  -        apctx = (apr_table_t *)SSL_get_app_data2(ssl);
  -        apr_table_setn(apctx, "ssl::request_rec", (const char *)r);
  +        SSL_set_app_data2(ssl, r);
       }
   
       /*
  @@ -1199,7 +1197,6 @@
       SSLSrvConfigRec *sc;
       SSLDirConfigRec *dc;
       SSLConnRec *sslconn;
  -    apr_table_t *actx;
       X509 *xs;
       int errnum;
       int errdepth;
  @@ -1214,8 +1211,7 @@
       ssl  = (SSL *)X509_STORE_CTX_get_app_data(ctx);
       conn = (conn_rec *)SSL_get_app_data(ssl);
       sslconn = myConnConfig(conn);
  -    actx = (apr_table_t *)SSL_get_app_data2(ssl);
  -    r    = (request_rec *)apr_table_get(actx, "ssl::request_rec");
  +    r    = (request_rec *)SSL_get_app_data2(ssl);
       s    = conn->base_server;
       sc   = mySrvConfig(s);
       dc   = (r != NULL ? myDirConfig(r) : NULL);