From: Joe Orton <jorton@apache.org>
Date: Mon, 26 Jan 2004 10:08:30 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_io.c (ssl_io_filter_connect): Check the
X-Git-Tag: 2.0.49~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b542bf980c4b401afe90ae029f3ac2a173c428c0;p=thirdparty%2Fapache%2Fhttpd.git

* modules/ssl/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>
Reviewed by: Joe Orton, Justin Erenkrantz, Andr�� Malo


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

diff --git a/STATUS b/STATUS
index cf345562aea..49c514252da 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/25 00:06:20 $]
+Last modified at [$Date: 2004/01/26 10:08:30 $]
 
 Release:
 
@@ -254,10 +254,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/filters/mod_include.c: r1.264
       +1: nd, trawick
 
-    * mod_ssl: fix check for the plain-HTTP-request error
-        modules/ssl/ssl_engine_io.c r1.111
-      +1: jorton, jerenkrantz, nd
-
     * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
       check r->connection->local_addr->port before defaulting to 
       server->port or ap_default_port()
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 2893ea85544..c5b8e80d41e 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.