Commit a321cdc5 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Promote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536289 13f79535-47bb-0310-9956-ffa450edef68
parent 23788785
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -105,6 +105,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      (It also works for httpd-2.2.x).
      +1: jfclere, rpluem, wrowe

   * proxy_util.c: Add alternate is_socket_connected() function
     which uses APR calls.
     Trunk version of patch:
       http://svn.apache.org/viewvc?view=rev&rev=473278
       http://svn.apache.org/viewvc?view=rev&rev=535354
     2.2.x version of patch:
       Trunk version works
     +1: rpluem, mturk, jim

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

@@ -165,15 +173,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         non-path, special values, (e.g. '/' vs %2F the character)
         then I'm strongly +1.

   * proxy_util.c: Add alternate is_socket_connected() function
     which uses APR calls.
     Trunk version of patch:
       http://svn.apache.org/viewvc?view=rev&rev=473278
       http://svn.apache.org/viewvc?view=rev&rev=535354
     2.2.x version of patch:
       Trunk version works
     +1: rpluem, mturk, jim

   * core: Add extern "C" linkage to several headers to make it easier to use
     them in C++ code.
        PR: 42286