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

Approve and commit symbols export, with simplified CHANGES 

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

CHANGES

+3 −2
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.31



  *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers.

     [Yann Ylavic, Gregg Smith]





Changes with Apache 2.2.30

Changes with Apache 2.2.30 (not released)



  *) SECURITY: CVE-2015-3183 (cve.mitre.org)

     core: Fix chunk header parsing defect.

STATUS

+2 −7
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ Patches considered for backport are noted in their branches' STATUS: 
Release history:

    [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,

          while x.{even}.z versions are Stable/GA releases.]

    2.2.31  : In maintenance

    2.2.30  : Tagged July 10, 2014

    2.2.31  : Tagged July 15, 2015

    2.2.30  : Tagged July 10, 2015. Not released.

    2.2.29  : Released September 3, 2014

    2.2.28  : Tagged August 22, 2014. Not released.

    2.2.27  : Released March 26, 2014
@@ -98,11 +98,6 @@ CURRENT RELEASE NOTES: 


RELEASE SHOWSTOPPERS:



  *) mod_proxy: PROXY_DECLARE ap_proxy_set_scoreboard_lb (2.2.x only) to fix

                the build (linking) on Windows.

     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-PROXY_DECLARE_set_scoreboard_lb.patch

     +1: ylavic, trawick





PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]

modules/proxy/mod_proxy.h

+3 −3
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ ap_proxy_buckets_lifetime_transform(request_rec *r, apr_bucket_brigade *from, 
                                        apr_bucket_brigade *to);



#if PROXY_HAS_SCOREBOARD

void *ap_proxy_set_scoreboard_lb(proxy_worker *worker,

PROXY_DECLARE(void*) ap_proxy_set_scoreboard_lb(proxy_worker *worker,

                                                proxy_balancer *balancer,

                                                server_rec *server);

#endif

modules/proxy/proxy_util.c

+3 −3
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static apr_status_t connection_destructor(void *resource, void *params, 
#endif



#if PROXY_HAS_SCOREBOARD

void *ap_proxy_set_scoreboard_lb(proxy_worker *worker,

PROXY_DECLARE(void*) ap_proxy_set_scoreboard_lb(proxy_worker *worker,

                                                proxy_balancer *balancer,

                                                server_rec *server)

{