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
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:
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()
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.