summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kraemer <martin@apache.org>2001-04-27 14:41:54 +0000
committerMartin Kraemer <martin@apache.org>2001-04-27 14:41:54 +0000
commit79269911293068f2c0a8d9accb0656a3582e4e3c (patch)
treee3e20490b470e89aae21df338d52090094bcfdfb
parent894bc9675a4f1c6d4dcd9200d5eed7decbe116b8 (diff)
downloadhttpd-79269911293068f2c0a8d9accb0656a3582e4e3c.tar.gz
Not that it matters, but the compiler complains (suggest parentheses around ...)
and we had a coding style once. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88949 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/tls/mod_tls.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/tls/mod_tls.c b/modules/tls/mod_tls.c
index 3654bbd4aa..2e9f475050 100644
--- a/modules/tls/mod_tls.c
+++ b/modules/tls/mod_tls.c
@@ -221,7 +221,7 @@ static apr_status_t churn(TLSFilterCtx *pCtx,apr_read_type_e eReadType,apr_size_
if(len == 0) {
/* Lazy frickin browsers just reset instead of shutting down. */
- if(ret == APR_EOF || ret == APR_ECONNRESET)
+ if(ret == APR_EOF || ret == APR_ECONNRESET) {
if(APR_BRIGADE_EMPTY(pCtx->pbbPendingInput))
return APR_EOF;
else
@@ -229,6 +229,7 @@ static apr_status_t churn(TLSFilterCtx *pCtx,apr_read_type_e eReadType,apr_size_
* so we'll return EOF then
*/
return APR_SUCCESS;
+ }
if(eReadType != APR_NONBLOCK_READ)
ap_log_error(APLOG_MARK,APLOG_ERR,ret,NULL,
@@ -299,11 +300,12 @@ static apr_status_t tls_out_filter(ap_filter_t *f,apr_bucket_brigade *pbbIn)
if(ret != APR_SUCCESS)
return ret;
ret=churn(pCtx,APR_NONBLOCK_READ,&zero);
- if(ret != APR_SUCCESS)
+ if(ret != APR_SUCCESS) {
if(ret == APR_EOF)
return APR_SUCCESS;
else
return ret;
+ }
}
break;
}