You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2001/04/26 13:21:39 UTC

cvs commit: httpd-2.0/modules/tls mod_tls.c

martin      01/04/26 04:21:39

  Modified:    modules/tls mod_tls.c
  Log:
  Make mod_tls compile. Fix supplied by Jean-Frederic Clere
  
  Submitted by:	Jean-Frederic Clere <JF...@fujitsu-siemens.com>
  
  Revision  Changes    Path
  1.6       +3 -2      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.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- mod_tls.c	2001/04/22 22:19:31	1.5
  +++ mod_tls.c	2001/04/26 11:21:38	1.6
  @@ -280,6 +280,7 @@
   {
       TLSFilterCtx *pCtx=f->ctx;
       apr_bucket *pbktIn;
  +    apr_size_t zero = 0;
   
       APR_BRIGADE_FOREACH(pbktIn,pbbIn) {
   	const char *data;
  @@ -295,7 +296,7 @@
   		ret=churn_output(pCtx);
   		if(ret != APR_SUCCESS)
   		    return ret;
  -		ret=churn(pCtx,APR_NONBLOCK_READ);
  +		ret=churn(pCtx,APR_NONBLOCK_READ,&zero);
   		if(ret != APR_SUCCESS)
   		    if(ret == APR_EOF)
   			return APR_SUCCESS;
  @@ -307,7 +308,7 @@
   
   	if(APR_BUCKET_IS_FLUSH(pbktIn)) {
   	    // assume that churn will flush (or already has) if there's output
  -	    ret=churn(pCtx,APR_NONBLOCK_READ);
  +	    ret=churn(pCtx,APR_NONBLOCK_READ,&zero);
   	    if(ret != APR_SUCCESS)
   		return ret;
   	    continue;