www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential

Browse Source 
infinite loop in ssl_io_input_getline if connection is aborted without
inctx->rc being set.

PR: 29964


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2004-08-11 13:19:24 +00:00
parent 50deaf88cd
commit 371ef0b07e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
[Remove entries to the current 2.0 section below, when backported] [Remove entries to the current 2.0 section below, when backported]
*) SECURITY: CAN-2004-0748 (cve.mitre.org)
mod_ssl: Fix a potential infinite loop. PR 29964. [Joe Orton]
*) mod_disk_cache: Implement binary format for on-disk header files. *) mod_disk_cache: Implement binary format for on-disk header files.
[Brian Akins <bakins web.turner.com>, Justin Erenkrantz] [Brian Akins <bakins web.turner.com>, Justin Erenkrantz]
@@ -20,7 +23,7 @@ Changes with Apache 2.1.0-dev
*) Add load balancer support to the scoreboard in preparation for *) Add load balancer support to the scoreboard in preparation for
load balancing support in mod_proxy. [Mladen Turk] load balancing support in mod_proxy. [Mladen Turk]
*) mod_ssl: Build on RHEL 3. (RedHat bug: 82369.) [Justin Erenkrantz] *) mod_ssl: Build on RHEL 3. PR 18989. [Justin Erenkrantz]
*) mod_nw_ssl: Added the directive NWSSLUpgradeable to mod_nw_ssl to *) mod_nw_ssl: Added the directive NWSSLUpgradeable to mod_nw_ssl to
allow a non-secure connection to be upgraded to secure connections allow a non-secure connection to be upgraded to secure connections

4
modules/ssl/ssl_engine_io.c
View File

@@ -589,6 +589,10 @@ static apr_status_t ssl_io_input_read(bio_filter_in_ctx_t *inctx,
while (1) { while (1) {
if (!inctx->filter_ctx->pssl) { if (!inctx->filter_ctx->pssl) {
/* Ensure a non-zero error code is returned */
if (inctx->rc == APR_SUCCESS) {
inctx->rc = APR_EGENERAL;
}
break; break;
} }