httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Tue, 21 Aug 2001 00:58:42 GMT
dougm       01/08/20 17:58:42

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  cut out some noise
  
  Revision  Changes    Path
  1.25      +11 -9     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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ssl_engine_io.c	2001/08/21 00:53:54	1.24
  +++ ssl_engine_io.c	2001/08/21 00:58:42	1.25
  @@ -146,6 +146,9 @@
   
   static apr_status_t churn_output(SSLFilterRec *pRec)
   {
  +    conn_rec *c = pRec->pOutputFilter->c;
  +    apr_pool_t *p = c->pool;
  +
       apr_bucket_brigade *pbbOutput=NULL;
       int done;
   
  @@ -162,21 +165,19 @@
   	done=0;
   
   	if (BIO_pending(pRec->pbioWrite)) {
  -            n = BIO_read(pRec->pbioWrite,buf,sizeof buf);
  +            n = BIO_read(pRec->pbioWrite, buf, sizeof buf);
               if(n > 0) {
   		char *pbuf;
   
   		if(!pbbOutput)
  -		    pbbOutput=apr_brigade_create(pRec->pOutputFilter->c->pool);
  +		    pbbOutput = apr_brigade_create(p);
   
  -		pbuf=apr_pmemdup(pRec->pOutputFilter->c->pool,buf,n);
  -		pbkt=apr_bucket_pool_create(pbuf,n,
  -					    pRec->pOutputFilter->c->pool);
  +		pbuf = apr_pmemdup(p, buf, n);
  +		pbkt = apr_bucket_pool_create(pbuf, n, p);
   		APR_BRIGADE_INSERT_TAIL(pbbOutput,pbkt);
   		done=1;
   	    }
               else {
  -                conn_rec *c = (conn_rec *)SSL_get_app_data(pRec->pssl);
                   ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,
                           "attempting to read %d bytes from wbio, got %d",
                           sizeof buf, n);
  @@ -204,6 +205,8 @@
   static apr_status_t churn (SSLFilterRec *pRec,
           apr_read_type_e eReadType, apr_off_t *readbytes)
   {
  +    conn_rec *c = pRec->pInputFilter->c;
  +    apr_pool_t *p = c->pool;
       apr_bucket *pbktIn;
       ap_input_mode_t eMode = (eReadType == APR_BLOCK_READ) 
                               ? AP_MODE_BLOCKING : AP_MODE_NONBLOCKING;
  @@ -269,7 +272,6 @@
   	n = BIO_write (pRec->pbioRead, data, len);
           
           if (n != len) {
  -            conn_rec *c = (conn_rec *)SSL_get_app_data(pRec->pssl);
               /* this should never really happen, since we're just writing
                * into a memory buffer, unless, of course, we run out of 
                * memory
  @@ -303,11 +305,11 @@
   	    apr_bucket *pbktOut;
   	    char *pbuf;
   
  -	    pbuf=apr_pmemdup(pRec->pInputFilter->c->pool,buf,n);
  +	    pbuf = apr_pmemdup(p, buf, n);
   	    /* XXX: should we use a heap bucket instead? Or a transient (in
   	     * which case we need a separate brigade for each bucket)?
   	     */
  -	    pbktOut=apr_bucket_pool_create(pbuf,n,pRec->pInputFilter->c->pool);
  +	    pbktOut = apr_bucket_pool_create(pbuf, n, p);
   	    APR_BRIGADE_INSERT_TAIL(pRec->pbbPendingInput,pbktOut);
   
              /* Once we've read something, we can move to non-blocking mode (if
  
  
  

Mime
View raw message