httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1430945 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/http/http_request.c
Date Wed, 09 Jan 2013 16:36:15 GMT
Author: jim
Date: Wed Jan  9 16:36:15 2013
New Revision: 1430945

URL: http://svn.apache.org/viewvc?rev=1430945&view=rev
Log:
Merge r1402924 from trunk:

also copy r->invoke_mtx when creating a subrequest


Submitted by: covener
Reviewed/backported by: jim

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/modules/http/http_request.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1402924

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1430945&r1=1430944&r2=1430945&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jan  9 16:36:15 2013
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) mod_dialup/mod_http: Prevent a crash in mod_dialup in case of internal
+     redirect. PR 52230.
+
   *) various modules, rotatelogs: Replace use of apr_file_write() with
      apr_file_write_full() to prevent incomplete writes. PR 53131.
      [Nicolas Viennot <apache viennot biz>, Stefan Fritsch]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1430945&r1=1430944&r2=1430945&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jan  9 16:36:15 2013
@@ -92,11 +92,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-   * mod_dialup/mod_http: Prevent a crash in mod_dialup in case of internal redirect
-     PR: 52230
-     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1402924
-     2.4.x patch: trunk patch works + CHANGES to be added
-     +1: jailletc36, jim, humbedooh
      
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

Modified: httpd/httpd/branches/2.4.x/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_request.c?rev=1430945&r1=1430944&r2=1430945&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/http_request.c Wed Jan  9 16:36:15 2013
@@ -536,6 +536,10 @@ static request_rec *internal_internal_re
      */
     new->used_path_info = AP_REQ_DEFAULT_PATH_INFO;
 
+#if APR_HAS_THREADS
+    new->invoke_mtx = r->invoke_mtx;
+#endif
+
     /*
      * XXX: hmm.  This is because mod_setenvif and mod_unique_id really need
      * to do their thing on internal redirects as well.  Perhaps this is a



Mime
View raw message