Commit 2740ea62 authored by Martin Kraemer's avatar Martin Kraemer
Browse files

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
parent a7603102
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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,12 +300,13 @@ 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;
	}