Commit 4b2c8022 authored by Rainer Jung's avatar Rainer Jung
Browse files

Update patch proposal, add comment. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@882610 13f79535-47bb-0310-9956-ffa450edef68
parent c6b7dafa

STATUS

+10 −3
Changes for STATUS: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -163,20 +163,27 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
                 /* Uh-oh. Failed to open the new log file. Try to clear



  * mod_ssl: Partial fix for CVE-2009-3555

    Trunk version of patch:

      http://svn.apache.org/viewvc?rev=833582&view=rev

      http://svn.apache.org/viewvc?rev=833593&view=rev

      http://svn.apache.org/viewvc?rev=881222&view=rev

    Patch in 2.2.x branch:

      http://svn.apache.org/viewvc?rev=833622&view=rev

    Backport version for 2.0.x of patch:

      http://people.apache.org/~rjung/patches/cve-2009-3555_httpd_2_0_x.patch

    Backport version for 2.0.x of patch (Updated with backport of r881222):

      http://people.apache.org/~rjung/patches/cve-2009-3555_httpd_2_0_x-v2.patch

    +1: rjung

    rpluem says: Two comments

    1. IMHO backports are done from trunk not from other stable branches

    2. The patch causes the compiler warning below that was fixed in r881222

       on trunk. The backport should reflect this.



ssl_engine_kernel.c: In function `ssl_callback_Info':

ssl_engine_kernel.c:1802: warning: passing arg 1 of `SSL_state' discards qualifiers from pointer target type



    Otherwise +1.

    rjung: Ad 1: I couldn't see any difference between the trunk and 2.2.x patch.

                 The backport of the trunk and 2.2.x versions are identical.

           Ad 2: I added the missing cast to the patch and updated the URL.





PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON: