From: Joe Orton <jorton@apache.org>
Date: Fri, 29 Aug 2003 14:45:26 +0000 (+0000)
Subject: * ssl_engine_io.c (ssl_io_filter_connect): Check the
X-Git-Tag: pre_ajp_proxy~1190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c198e9b2657b54f4ac9175f52113b5f287d39ac5;p=thirdparty%2Fapache%2Fhttpd.git

* ssl_engine_io.c (ssl_io_filter_connect): Check the
library code as well as the reason code when looking for the
plain-HTTP-request error.

Submitted by: Stephen Henson <steve@openssl.org>


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

diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index e7cbf96dd5a..f3160cc2b7d 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1091,7 +1091,8 @@ static int ssl_io_filter_connect(ssl_filter_ctx_t *filter_ctx)
             outctx->rc = APR_EAGAIN;
             return SSL_ERROR_WANT_READ;
         }
-        else if (ERR_GET_REASON(ERR_peek_error()) == SSL_R_HTTP_REQUEST) {
+        else if (ERR_GET_LIB(ERR_peek_error()) == ERR_LIB_SSL &&
+                 ERR_GET_REASON(ERR_peek_error()) == SSL_R_HTTP_REQUEST) {
             /*
              * The case where OpenSSL has recognized a HTTP request:
              * This means the client speaks plain HTTP on our HTTPS port.