Commit 26f5e286 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Propose one more, and note that I'm not going to risk the merge of dump_io.

I'll let someone else do that merge.  *hint*


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151250 13f79535-47bb-0310-9956-ffa450edef68
parent 54dc1e60
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -132,9 +132,10 @@ PATCHES TO BACKPORT FROM 2.1
    *) modules: Include mod_dumpio to the modules/experimental
       tree. Module included in 2.1:modules/debug.
       http://www.apache.org/~jim/mod_dumpio.c
       +1: jim, trawick
       jerenkrantz notes: I won't merge this myself because of the build system
                          tweaks required to add the module.
       +1: jim, trawick, jerenkrantz
       -0: nd (suggests the experimental directory instead)
           jerenkrantz (ditto)

    *) Fix the RPM spec file so that an RPM build now works. An RPM
       build now requires system installations of APR and APR-util.
@@ -412,6 +413,10 @@ PATCHES TO BACKPORT FROM 2.1
      +1: thommay, jerenkrantz
      trawick: "which" isn't portable; I've suggested a work-around on dev@

    * mod_proxy: Fix ProxyRemoteMatch.  PR 33170.
      svn rev 151248
      +1: jerenkrantz

CURRENT RELEASE NOTES:

    * Backwards compatibility is expected of future Apache 2.0 releases,