Commit 7ba72c86 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Hopefully this is it... not sure what's going on with my 

OS X box: svn merge is acting wonky


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696451 13f79535-47bb-0310-9956-ffa450edef68
parent 61447c5b

CHANGES

+3 −3
Changes for CHANGES: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ Changes with Apache 2.2.10 
  *) mod_charset_lite: Avoid dropping error responses by handling meta buckets

     correctly. PR 45687 [Dan Poirier <poirier pobox.com>]



  *) mod_proxy: Add connectiontimeout parameter for proxy workers in order to

     be able to set the timeout for connecting to the backend separately.

     PR 45445. [Ruediger Pluem, rahul <rahul sun.com>]

  *) mod_proxy_http: Introduce environment variable proxy-initial-not-pooled to

     avoid reusing pooled connections if the client connection is an initial

     connection. PR 37770. [Ruediger Pluem]



  *) mod_rewrite: Allow Cookie option to set secure and HttpOnly flags.

     PR 44799 [Christian Wenz <christian wenz.org>]