From 7821ac9053c8678f4e10f67b4efe772e40211d23 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sun, 15 Dec 2013 14:03:47 +0000 Subject: [PATCH] A set of easy proposals git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1551023 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/STATUS b/STATUS index 84cc8ee82c..8e2af6c8e9 100644 --- a/STATUS +++ b/STATUS @@ -202,6 +202,32 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patches: trunk patches work +1: jim + * easy proposals to synch 2.4.x and trunk + - log.c: avoid needless apr_pstrdup() + - Use apr_pstrmemdup instead of apr_pstrndup when this is safe. + - Use apr_pstrmemdup instead of apr_pstrndup when this is safe. + - Remove redundant check + - 'ap_getword_conf' does not return NULL but an empty string + - Ease logic around 'ap_getword_conf' and drop useless line of code. + - 'ap_getword_conf' can not return NULL + - 'ap_getword_conf' can not return NULL + - Remove redundant check (already performed the line before) + - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable + trunk patches: + - https://svn.apache.org/viewvc?view=revision&revision=1532122 + - https://svn.apache.org/viewvc?view=revision&revision=1549676 + - https://svn.apache.org/viewvc?view=revision&revision=1549680 + - https://svn.apache.org/viewvc?view=revision&revision=1550651 + - https://svn.apache.org/viewvc?view=revision&revision=1551005 + - https://svn.apache.org/viewvc?view=revision&revision=1551009 + - https://svn.apache.org/viewvc?view=revision&revision=1551010 + - https://svn.apache.org/viewvc?view=revision&revision=1551011 + - https://svn.apache.org/viewvc?view=revision&revision=1551012 + - https://svn.apache.org/viewvc?view=revision&revision=1551013 + 2.4.x patches: trunk patches work + +1: jailletc36 + + OTHER PROPOSALS * A list of further possible backports can be found at: -- 2.50.1