From: Doug MacEachern <dougm@apache.org>
Date: Fri, 29 Mar 2002 07:23:09 +0000 (+0000)
Subject: need to flush output buffer before reading in proxy mode
X-Git-Tag: 2.0.34~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0797583d16b69348fc112cada4442ee75fb29c1;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94299 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 54c7b6e772..b059c312c3 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -353,13 +353,14 @@ static int char_buffer_write(char_buffer_t *buffer, char *in, int inl)
 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);
     }
 
@@ -586,6 +587,10 @@ static apr_status_t ssl_io_filter_Output(ap_filter_t *f,
         return ap_pass_brigade(f->next, bb);
     }
 
+    if ((status = ssl_hook_process_connection(ctx)) != APR_SUCCESS) {
+        return status;
+    }
+
     while (!APR_BRIGADE_EMPTY(bb)) {
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);