Commit b6a4f4b7 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  Matt's proposed this be backported, choose the straight-line approach.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@419144 13f79535-47bb-0310-9956-ffa450edef68
parent e3f9bd0a
Loading
Loading
Loading
Loading
+7 −0
Changes for STATUS: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -116,6 +116,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    * mod_isapi: Simply backport the host of fixes for compilation on unix,
      PR#'s 15993 29098 30022 16637 30033 28089
      by pushing to trunk/ rev 416293 of modules/arch/win32/mod_isapi.[ch]
      which compiles without changes.  Source + Binary posted at
        http://people.apache.org/~wrowe/mod_isapi-416293.zip
      +1 wrowe 

    * Fix dbd merge_config function to support prepared statements
      PR#39386
      http://svn.apache.org/viewcvs.cgi?rev=396310&view=rev