Commit 2525ad15 authored by Joe Orton's avatar Joe Orton
Browse files

* 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/modules/ssl@101135 13f79535-47bb-0310-9956-ffa450edef68
parent c2450b75

ssl_engine_io.c

+2 −1
Original line number Diff line number Diff line
@@ -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.