You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2022/01/24 16:20:07 UTC
svn commit: r1897424 - in /httpd/httpd/trunk: modules/ssl/mod_ssl.c server/mpm/event/event.c
Author: minfrin
Date: Mon Jan 24 16:20:07 2022
New Revision: 1897424
URL: http://svn.apache.org/viewvc?rev=1897424&view=rev
Log:
Begone, foul tabs.
Modified:
httpd/httpd/trunk/modules/ssl/mod_ssl.c
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1897424&r1=1897423&r2=1897424&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Mon Jan 24 16:20:07 2022
@@ -735,7 +735,7 @@ static int ssl_hook_process_connection(c
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(10371)
"SSL handshake in progress, continuing");
- status = AGAIN;
+ status = AGAIN;
}
else if (rv == AP_FILTER_ERROR) {
/* handshake error, but mod_ssl handled it */
@@ -743,7 +743,7 @@ static int ssl_hook_process_connection(c
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(10372)
"SSL handshake failed, returning error response");
- status = DECLINED;
+ status = DECLINED;
}
else {
/* we failed, give up */
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1897424&r1=1897423&r2=1897424&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Jan 24 16:20:07 2022
@@ -985,12 +985,12 @@ static void process_lingering_close(even
static void update_reqevents_from_sense(event_conn_state_t *cs, int sense)
{
- /* has the desired sense been overridden? */
- if (cs->pub.sense != CONN_SENSE_DEFAULT) {
- sense = cs->pub.sense;
- }
+ /* has the desired sense been overridden? */
+ if (cs->pub.sense != CONN_SENSE_DEFAULT) {
+ sense = cs->pub.sense;
+ }
- /* read or write */
+ /* read or write */
if (sense == CONN_SENSE_WANT_READ) {
cs->pfd.reqevents = APR_POLLIN | APR_POLLHUP;
}