You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2015/01/14 14:22:36 UTC
svn commit: r1651656 - in /httpd/httpd/branches/2.4.x: CHANGES
server/mpm/event/event.c
Author: covener
Date: Wed Jan 14 13:22:36 2015
New Revision: 1651656
URL: http://svn.apache.org/r1651656
Log:
Merge r1651088 from trunk:
Update conn_rec.id when a new thread begins working on a connection, because
the old thread may work on a new connection and assign the same ID in parallel.
Submitted By: Michael Thorpe
Committed By: covener
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/server/mpm/event/event.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1651656&r1=1651655&r2=1651656&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jan 14 13:22:36 2015
@@ -5,6 +5,9 @@ Changes with Apache 2.4.11
*) SECURITY: CVE-2014-3583 (cve.mitre.org)
mod_proxy_fcgi: Fix a potential crash due to buffer over-read, with
response headers' size above 8K. [Yann Ylavic, Jeff Trawick]
+ *) event: Update the internal "connection id" when requests
+ move from thread to thread. Reuse can confuse modules like
+ mod_cgid. PR 57435. [Michael Thorpe <mike gistnet.com>]
*) SECURITY: CVE-2014-3581 (cve.mitre.org)
mod_cache: Avoid a crash when Content-Type has an empty value.
@@ -22,6 +25,10 @@ Changes with Apache 2.4.11
request headers earlier. Adds "MergeTrailers" directive to restore
legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
+ *) mod_ssl: Add support for extracting subjectAltName entries of type
+ rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
+ environment variables. Also addresses PR 57207. [Kaspar Brand]
+
*) core: Configuration files with long lines and continuation characters
are not read properly. PR 55910. [Manuel Mausz <manuel-as mausz.at>]
Modified: httpd/httpd/branches/2.4.x/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/event/event.c?rev=1651656&r1=1651655&r2=1651656&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/event/event.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/event/event.c Wed Jan 14 13:22:36 2015
@@ -1012,6 +1012,8 @@ static void process_socket(apr_thread_t
c->sbh = sbh;
notify_resume(cs);
c->current_thread = thd;
+ /* Subsequent request on a conn, and thread number is part of ID */
+ c->id = conn_id;
}
if (c->clogging_input_filters && !c->aborted) {
Re: svn commit: r1651656 - in /httpd/httpd/branches/2.4.x: CHANGES server/mpm/event/event.c
Posted by Eric Covener <co...@gmail.com>.
On Wed, Jan 14, 2015 at 5:25 PM, Marion & Christophe JAILLET
<ch...@wanadoo.fr> wrote:
> Has really been merged into 2.4.x or is it an error ???
Error. I even double-checked in my email and missed it -- thanks.
Re: svn commit: r1651656 - in /httpd/httpd/branches/2.4.x: CHANGES
server/mpm/event/event.c
Posted by Marion & Christophe JAILLET <ch...@wanadoo.fr>.
Has really been merged into 2.4.x or is it an error ???
CJ
Le 14/01/2015 14:22, covener@apache.org a écrit :
> Author: covener
> Date: Wed Jan 14 13:22:36 2015
> New Revision: 1651656
>
>
> Modified: httpd/httpd/branches/2.4.x/CHANGES
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1651656&r1=1651655&r2=1651656&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
> +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jan 14 13:22:36 2015
> [...]
> @@ -22,6 +25,10 @@ Changes with Apache 2.4.11
> request headers earlier. Adds "MergeTrailers" directive to restore
> legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
>
> + *) mod_ssl: Add support for extracting subjectAltName entries of type
> + rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
> + environment variables. Also addresses PR 57207. [Kaspar Brand]
> +
> *) core: Configuration files with long lines and continuation characters
> are not read properly. PR 55910. [Manuel Mausz <manuel-as mausz.at>]
>