httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Thu, 27 Feb 2003 11:57:35 GMT
trawick     2003/02/27 03:57:35

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_io.c
  Log:
  merge this mod_ssl fix into stable branch
  
  *) Fix 64-bit problem in mod_ssl input logic.
     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]
  
  reviewed by: trawick, jim, stoddard
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.49 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.48
  retrieving revision 1.988.2.49
  diff -u -r1.988.2.48 -r1.988.2.49
  --- CHANGES	27 Feb 2003 04:24:37 -0000	1.988.2.48
  +++ CHANGES	27 Feb 2003 11:57:31 -0000	1.988.2.49
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.45
   
  +  *) Fix 64-bit problem in mod_ssl input logic.  
  +     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]
  +
     *) Fix potential memory leaks in mod_deflate on malformed data.  PR 16046.
        [Justin Erenkrantz]
   
  
  
  
  1.751.2.127 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.126
  retrieving revision 1.751.2.127
  diff -u -r1.751.2.126 -r1.751.2.127
  --- STATUS	27 Feb 2003 04:25:14 -0000	1.751.2.126
  +++ STATUS	27 Feb 2003 11:57:32 -0000	1.751.2.127
  @@ -73,10 +73,6 @@
         +1: jim, wrowe, stoddard
         -1:
   
  -    * Fix 64-bit breakage in mod_ssl.
  -      modules/ssl/ssl_engine_io.c r1.104
  -      +1: trawick, jim, stoddard
  -
       * Rewrite how proxy sends its request to allow input bodies to 
         morph the request bodies.  Previously, if an input filter
         changed the request body, the original C-L would be sent which
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.100.2.3 +5 -4      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.100.2.2
  retrieving revision 1.100.2.3
  diff -u -r1.100.2.2 -r1.100.2.3
  --- ssl_engine_io.c	3 Feb 2003 17:31:52 -0000	1.100.2.2
  +++ ssl_engine_io.c	27 Feb 2003 11:57:34 -0000	1.100.2.3
  @@ -479,8 +479,9 @@
   /*
    * this is the function called by SSL_read()
    */
  -static int bio_filter_in_read(BIO *bio, char *in, int inl)
  +static int bio_filter_in_read(BIO *bio, char *in, int inlen)
   {
  +    apr_size_t inl = inlen;
       bio_filter_in_ctx_t *inctx = (bio_filter_in_ctx_t *)(bio->ptr);
       apr_read_type_e block = inctx->block;
       SSLConnRec *sslconn = myConnConfig(inctx->f->c);
  @@ -536,13 +537,13 @@
       inctx->rc = brigade_consume(inctx->bb, block, in, &inl);
   
       if (inctx->rc == APR_SUCCESS) {
  -        return inl;
  +        return (int)inl;
       }
   
       if (APR_STATUS_IS_EAGAIN(inctx->rc) 
               || APR_STATUS_IS_EINTR(inctx->rc)) {
           BIO_set_retry_read(bio);
  -        return inl;
  +        return (int)inl;
       }
           
       /* Unexpected errors and APR_EOF clean out the brigade.
  @@ -555,7 +556,7 @@
           /* Provide the results of this read pass,
            * without resetting the BIO retry_read flag
            */
  -        return inl;
  +        return (int)inl;
       }
   
       return -1;
  
  
  

Mime
View raw message