Commit cd776d4b authored by Sander Temme's avatar Sander Temme
Browse files

Cast vote, and correctly attribute thread locking callback patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@534105 13f79535-47bb-0310-9956-ffa450edef68
parent 07f391c8
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    * mod_ssl: Move thread locking upcall initialization before
    * mod_ssl: Move thread locking upcall initialization before
      hardware library initialization, so hardware library can use
      hardware library initialization, so hardware library can use
      these upcalls when run in a threaded MPM. Fixes PR 20951. 
      these upcalls when run in a threaded MPM. Fixes PR 20951. 
      [adunn at ncipher.com]


      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
      
      
@@ -162,7 +163,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      (This was already committed to 2.2.x, and the reports persist.)
      (This was already committed to 2.2.x, and the reports persist.)
        http://issues.apache.org/bugzilla/show_bug.cgi?id=12355
        http://issues.apache.org/bugzilla/show_bug.cgi?id=12355
      Patch; http://issues.apache.org/bugzilla/attachment.cgi?id=16495
      Patch; http://issues.apache.org/bugzilla/attachment.cgi?id=16495
      +1: wrowe, rpluem
      +1: wrowe, rpluem, sctemme


    * mod_cgi and mod_cgid: Don't use apr_status_t error return
    * mod_cgi and mod_cgid: Don't use apr_status_t error return
      from input filters as HTTP return value from the handler.
      from input filters as HTTP return value from the handler.