httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/tls mod_tls.c
Date Thu, 02 Aug 2001 22:54:39 GMT
wrowe       01/08/02 15:54:39

  Modified:    modules/tls mod_tls.c
  Log:
    Undo my unintentionally overzelous name change, and fix the style of sizeof()
  
  Revision  Changes    Path
  1.20      +9 -9      httpd-2.0/modules/tls/mod_tls.c
  
  Index: mod_tls.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/tls/mod_tls.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_tls.c	2001/08/01 06:27:08	1.19
  +++ mod_tls.c	2001/08/02 22:54:39	1.20
  @@ -89,7 +89,7 @@
   
   static void *create_tls_server_config(apr_pool_t *p, server_rec *s)
   {
  -    tls_config_rec *tcfg = apr_pcalloc(p, sizeof *tcfg);
  +    tls_config_rec *tcfg = apr_pcalloc(p, sizeof(*tcfg));
   
       tcfg->enabled = 0;
       tcfg->certificate_file = tcfg->key_file = NULL;
  @@ -164,15 +164,15 @@
   
           if (SSLStateMachine_write_can_extract(ctx->state_machine)) {
               n = SSLStateMachine_write_extract(ctx->state_machine, buf,
  -                                              sizeof buf);
  +                                              sizeof(buf));
               if (n > 0) {
  -                char *buf;
  +                char *pbuf;
   
                   if (!bb_out)
                       bb_out = apr_brigade_create(ctx->output_filter->c->pool);
   
  -                buf = apr_pmemdup(ctx->output_filter->c->pool, buf, n);
  -                b = apr_bucket_pool_create(buf, n, 
  +                pbuf = apr_pmemdup(ctx->output_filter->c->pool, buf, n);
  +                b = apr_bucket_pool_create(pbuf, n, 
                                              ctx->output_filter->c->pool);
                   APR_BRIGADE_INSERT_TAIL(bb_out, b);
                   done = 1;
  @@ -263,16 +263,16 @@
           /* write SSL */
           SSLStateMachine_read_inject(ctx->state_machine, data, len);
   
  -        n = SSLStateMachine_read_extract(ctx->state_machine, buf, sizeof buf);
  +        n = SSLStateMachine_read_extract(ctx->state_machine, buf, sizeof(buf));
           if (n > 0) {
               apr_bucket *b_out;
  -            char *buf;
  +            char *pbuf;
   
  -            buf = apr_pmemdup(ctx->input_filter->c->pool, buf, n);
  +            pbuf = apr_pmemdup(ctx->input_filter->c->pool, buf, n);
               /* XXX: should we use a heap bucket instead? Or a transient (in
                * which case we need a separate brigade for each bucket)?
                */
  -            b_out = apr_bucket_pool_create(buf, n, ctx->input_filter->c->pool);
  +            b_out = apr_bucket_pool_create(pbuf, n, ctx->input_filter->c->pool);
               APR_BRIGADE_INSERT_TAIL(ctx->bb_decrypted, b_out);
   
               /* Once we've read something, we can move to non-blocking mode
  
  
  

Mime
View raw message