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 Fri, 29 Mar 2002 07:23:09 GMT
dougm       02/03/28 23:23:09

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  need to flush output buffer before reading in proxy mode
  
  need to call ssl_hook_process_connection in the output filter in proxy
  mode, since proxy hits the output filter before the input filter
  
  Revision  Changes    Path
  1.67      +6 -1      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.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- ssl_engine_io.c	28 Mar 2002 17:11:12 -0000	1.66
  +++ ssl_engine_io.c	29 Mar 2002 07:23:09 -0000	1.67
  @@ -353,13 +353,14 @@
   static int bio_bucket_in_read(BIO *bio, char *in, int inl)
   {
       BIO_bucket_in_t *inbio = BIO_bucket_in_ptr(bio);
  +    SSLConnRec *sslconn = myConnConfig(inbio->f->c);
       int len = 0;
   
       /* XXX: flush here only required for SSLv2;
        * OpenSSL calls BIO_flush() at the appropriate times for
        * the other protocols.
        */
  -    if (SSL_version(inbio->ssl) == SSL2_VERSION) {
  +    if ((SSL_version(inbio->ssl) == SSL2_VERSION) || sslconn->is_proxy) {
           BIO_bucket_flush(inbio->wbio);
       }
   
  @@ -584,6 +585,10 @@
       if (!ctx->pssl) {
           /* ssl_abort() has been called */
           return ap_pass_brigade(f->next, bb);
  +    }
  +
  +    if ((status = ssl_hook_process_connection(ctx)) != APR_SUCCESS) {
  +        return status;
       }
   
       while (!APR_BRIGADE_EMPTY(bb)) {
  
  
  

Mime
View raw message