From: Stefan Fritsch Date: Thu, 4 Jul 2013 17:41:19 +0000 (+0000) Subject: vote+promote X-Git-Tag: 2.4.5~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89a3e3c020f936ec77a6234b68190bad316cd435;p=apache vote+promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1499822 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 7b1cda75bb..385d3a8f80 100644 --- a/STATUS +++ b/STATUS @@ -113,6 +113,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: This changes the format of the updatesession SQL statement. Existing configurations must be changed. + * ap_release.h: avoid including apr_general.h. + The MSVC Resource Compiler truncates macro names at char 31. + Since apr_general.h includes apr.h which in turn includes + system headers we get warnings or errors with the Resource + Compiler with newer system headers (VC10 and later) which + have macro names defined with more than 31 chars. + trunk patch: http://svn.apache.org/r1499742 + 2.4.x patch: trunk patch works + +1: fuankg, gsmith, sf + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -245,16 +255,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works +1: jailletc36, jj - * ap_release.h: avoid including apr_general.h. - The MSVC Resource Compiler truncates macro names at char 31. - Since apr_general.h includes apr.h which in turn includes - system headers we get warnings or errors with the Resource - Compiler with newer system headers (VC10 and later) which - have macro names defined with more than 31 chars. - trunk patch: http://svn.apache.org/r1499742 - 2.4.x patch: trunk patch works - +1: fuankg, gsmith - A list of further possible backports can be found at: http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt If you want to propose one of those, please still add them here.