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 Wed, 08 Aug 2001 05:11:33 GMT
dougm       01/08/07 22:11:33

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  get POST requests working with mod_ssl
  
  Revision  Changes    Path
  1.14      +13 -14    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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ssl_engine_io.c	2001/08/08 02:10:51	1.13
  +++ ssl_engine_io.c	2001/08/08 05:11:33	1.14
  @@ -120,7 +120,7 @@
                * XXX - Just trying to reflect the behaviour in 
                * openssl_state_machine.c [mod_tls]. TBD
                */
  -            rc = 0;
  +            rc = -1;
       }
       else
           rc = -1;
  @@ -251,7 +251,10 @@
   	/* read filter */
   	ret=apr_bucket_read(pbktIn,&data,&len,eReadType);
   
  -	APR_BUCKET_REMOVE(pbktIn);
  +        if (!(eReadType == APR_NONBLOCK_READ && APR_STATUS_IS_EAGAIN(ret))) {
  +            /* allow retry */
  +            APR_BUCKET_REMOVE(pbktIn);
  +        }
   
   	if(ret == APR_SUCCESS && len == 0 && eReadType == APR_BLOCK_READ)
   	    ret=APR_EOF;
  @@ -285,8 +288,10 @@
   
           ssl_hook_process_connection (pRec);
   
  -        n = ssl_io_hook_read(pRec->pssl, (unsigned char *)buf, sizeof(buf));
  -	if(n > 0) {
  +        /* pass along all of the current BIO */
  +        while ((n = ssl_io_hook_read(pRec->pssl,
  +                                     (unsigned char *)buf, sizeof(buf))) > 0)
  +        {
   	    apr_bucket *pbktOut;
   	    char *pbuf;
   
  @@ -296,18 +301,12 @@
   	     */
   	    pbktOut=apr_bucket_pool_create(pbuf,n,pRec->pInputFilter->c->pool);
   	    APR_BRIGADE_INSERT_TAIL(pRec->pbbPendingInput,pbktOut);
  -
  -	    /* Once we've read something, we can move to non-blocking mode (if
  -	     * we weren't already).
  -	     */
  -	    eReadType=APR_NONBLOCK_READ;
   
  -	    /* XXX: deal with EOF! */
  -	    /*	} else if(n == 0) {
  -	    apr_bucket *pbktEOS=apr_bucket_create_eos();
  -	    APR_BRIGADE_INSERT_TAIL(pbbInput,pbktEOS);*/
  +           /* Once we've read something, we can move to non-blocking mode (if
  +            * we weren't already).
  +            */
  +            eReadType = APR_NONBLOCK_READ;
   	}
  -	assert(n >= 0);
   
   	ret=churn_output(pRec);
   	if(ret != APR_SUCCESS)
  
  
  

Mime
View raw message