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, 26 Mar 2002 00:30:47 GMT
dougm       02/03/25 16:30:47

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  fix bug seen on win32 with netscape client where output filter is run
  triggered by lingering_close after ssl_hook_CloseConnection has been called
  
  Revision  Changes    Path
  1.61      +6 -2      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.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- ssl_engine_io.c	14 Mar 2002 07:21:10 -0000	1.60
  +++ ssl_engine_io.c	26 Mar 2002 00:30:47 -0000	1.61
  @@ -579,6 +579,12 @@
                                            apr_bucket_brigade *bb)
   {
       apr_status_t status = APR_SUCCESS;
  +    SSLFilterRec *ctx = f->ctx;
  +
  +    if (!ctx->pssl) {
  +        /* ssl_hook_CloseConnection has already been called */
  +        return ap_pass_brigade(f->next, bb);
  +    }
   
       while (!APR_BRIGADE_EMPTY(bb)) {
           apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
  @@ -587,8 +593,6 @@
            * These types do not require translation by OpenSSL.  
            */
           if (APR_BUCKET_IS_EOS(bucket) || APR_BUCKET_IS_FLUSH(bucket)) {
  -            SSLFilterRec *ctx = f->ctx;
  -
               if ((status = BIO_bucket_flush(ctx->pbioWrite)) != APR_SUCCESS) {
                   return status;
               }
  
  
  

Mime
View raw message