Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1611928 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 6cc81fabb2018195de95e9b4bf90ba53c186c538..4e48f62294053e6749328c4ddf82c709ce9bf374 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -180,12 +180,35 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patches: trunk works
      +1: wrowe
 
-   * doc: improve doxygen output for util_ebcdic.h. I propose it for vote because
-     of the #if defined(DOXYGEN)
+   * doc: improve doxygen output for util_ebcdic.h and util_charset.h.
+     I propose it for vote because of the #if defined(DOXYGEN)
      trunk patch: http://svn.apache.org/r1611858
+                  http://svn.apache.org/r1611908
+                  http://svn.apache.org/r1611916
      2.4.x patch: trunk patch works
      +1: jailletc36
 
+   * Easy patches - synch with trunk
+        - mod_watchdog: Rename module name in doxygen + partly revert r832442 which
+                        skipped doxygen doc generation for 'mod_watchdog.h'
+        - mod_proxy: s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles
+        - mod_proxy_wstunnel: Use ap_remove_input_filter_byhandle instead of
+                              duplicating the code.
+        - Remove some 'register' in variable declaration.
+        - core: Remove some 'register' in variable declaration.
+                Save a few cycles by calling 'apr_isalnum' instead of
+                'apr_isalpha' and 'apr_isdigit'.
+        - Do not use deprecated define. s/MODULE_MAGIC_NUMBER/MODULE_MAGIC_NUMBER_MAJOR/
+     trunk patch:
+        http://svn.apache.org/r1597642
+        http://svn.apache.org/r1608999
+        http://svn.apache.org/r1605207
+        http://svn.apache.org/r1610366
+        http://svn.apache.org/r1610353
+        http://svn.apache.org/r1611871
+     2.4.x patch: http://people.apache.org/~jailletc36/backport9.patch
+     +1: jailletc36
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: