You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2015/07/15 18:10:27 UTC
svn commit: r1691239 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Author: wrowe
Date: Wed Jul 15 16:10:27 2015
New Revision: 1691239
URL: http://svn.apache.org/r1691239
Log:
Approve and commit symbols export, with simplified CHANGES
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h
httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1691239&r1=1691238&r2=1691239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Jul 15 16:10:27 2015
@@ -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.
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1691239&r1=1691238&r2=1691239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Jul 15 16:10:27 2015
@@ -23,8 +23,8 @@ Patches considered for backport are note
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. ]
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h?rev=1691239&r1=1691238&r2=1691239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.h Wed Jul 15 16:10:27 2015
@@ -787,9 +787,9 @@ ap_proxy_buckets_lifetime_transform(requ
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"
Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=1691239&r1=1691238&r2=1691239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Wed Jul 15 16:10:27 2015
@@ -1802,9 +1802,9 @@ static apr_status_t connection_destructo
#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;