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 2021/09/26 14:14:37 UTC
svn commit: r1893655 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/core.c
Author: minfrin
Date: Sun Sep 26 14:14:37 2021
New Revision: 1893655
URL: http://svn.apache.org/viewvc?rev=1893655&view=rev
Log:
Backport:
*) core: do not install core input/output filters on secondary
connections.
Trunk version of patch:
http://svn.apache.org/viewvc?view=revision&revision=1787606
Backport version for 2.4.x of patch:
svn merge -c 1787606 ^/httpd/httpd/trunk .
+1: icing, rpluem, ylavic
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/core.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1787606
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1893655&r1=1893654&r2=1893655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Sep 26 14:14:37 2021
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.50
+ *) core: do not install core input/output filters on secondary
+ connections. [Stefan Eissing]
+
*) core: Add ap_pre_connection() as a wrapper to ap_run_pre_connection()
and use it to prevent that failures in running the pre_connection
hook cause crashes afterwards. [Ruediger Pluem]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1893655&r1=1893654&r2=1893655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Sep 26 14:14:37 2021
@@ -142,14 +142,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) core: do not install core input/output filters on secondary
- connections.
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=revision&revision=1787606
- Backport version for 2.4.x of patch:
- svn merge -c 1787606 ^/httpd/httpd/trunk .
- +1: icing, rpluem, ylavic
-
*) mod_dav: Correctly handle errors returned by dav providers on REPORT
requests.
Trunk version of patch:
Modified: httpd/httpd/branches/2.4.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?rev=1893655&r1=1893654&r2=1893655&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/core.c (original)
+++ httpd/httpd/branches/2.4.x/server/core.c Sun Sep 26 14:14:37 2021
@@ -5257,9 +5257,14 @@ static conn_rec *core_create_conn(apr_po
static int core_pre_connection(conn_rec *c, void *csd)
{
- core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
+ core_net_rec *net;
apr_status_t rv;
+ if (c->master) {
+ return DONE;
+ }
+
+ net = apr_palloc(c->pool, sizeof(*net));
/* The Nagle algorithm says that we should delay sending partial
* packets in hopes of getting more data. We don't want to do
* this; we are not telnet. There are bad interactions between