From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 15 Jul 2015 16:10:27 +0000 (+0000)
Subject: Approve and commit symbols export, with simplified CHANGES
X-Git-Tag: 2.2.31~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ad262a29d382dae6f3f4a4fda349253e8f9255;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/CHANGES b/CHANGES
index b031602d4eb..2c92d4c79be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
                                                          -*- 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.
diff --git a/STATUS b/STATUS
index 2d114d4b0f2..d9008ffa5b9 100644
--- a/STATUS
+++ b/STATUS
@@ -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. ]
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index ef1ce06961f..84a6c1a8e9f 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -787,9 +787,9 @@ 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_balancer *balancer,
-                                 server_rec *server);
+PROXY_DECLARE(void*) ap_proxy_set_scoreboard_lb(proxy_worker *worker,
+                                                proxy_balancer *balancer,
+                                                server_rec *server);
 #endif
 
 #define PROXY_LBMETHOD "proxylbmethod"
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 6426c39827b..584c21d69ad 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1802,9 +1802,9 @@ 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_balancer *balancer,
-                                 server_rec *server)
+PROXY_DECLARE(void*) ap_proxy_set_scoreboard_lb(proxy_worker *worker,
+                                                proxy_balancer *balancer,
+                                                server_rec *server)
 {
     if (ap_scoreboard_image && !worker->s) {
         int i = 0;