Commit 6ccca1a2 authored by Sander Temme's avatar Sander Temme
Browse files

Propose backport of hardware SSL fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@525712 13f79535-47bb-0310-9956-ffa450edef68
parent a2b1db25
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    * mod_ssl: Move thread locking upcall initialization before
      hardware library initialization, so hardware library can use
      these upcalls when run in a threaded MPM. Fixes PR 20951. 
      Trunk version of patch applies: 

      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?r1=520701&r2=525709&view=patch
      
      +1: sctemme

    * mod_proxy_ajp: Fix wrong retry when sending the response failed.
      PR 40310 (The old fix wasn't ok).
      Trunk version of patch: