merged current 2.4.x and ap_mmn.h update by minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705628 13f79535-47bb-0310-9956-ffa450edef68

diff --cc CHANGES
index daf96b42515db7d706bb8ec5fbdb3c6700b9b9eb,d0d91112e063f96a4c190dd0adae5b79491301d2..0581df378f56b8603dec5d2f4233527c398990eb
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,9 -1,26 +1,28 @@@
                                                           -*- coding: utf-8 -*-
  
  Changes with Apache 2.4.17
 +  *) mod_h2: added donated http/2 implementation to build system. Similar
 +     configuration options to mod_ssl. [Stefan Eissing]
  
+   *) mod_cache: r->err_headers_out is not merged into
+      r->headers when mod_cache is enabled and the response
+      is cached for the first time. [Edward Lu]
+ 
+   *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
+      can't create new (clear) slots while previous children gracefully stopping
+      still use the old ones (e.g. Windows, OS2). mod_proxy_balancer failed to
+      restart whenever the number of configured balancers/members changed during
+      restart.  PR 58024.  [Yann Ylavic]
+ 
+   *) core/util_script: make REDIRECT_URL a full URL.  PR 57785. [Nick Kew]
+ 
+   *) MPMs: Support SO_REUSEPORT to create multiple duplicated listener
+      records for scalability. [Yingqi Lu <yingqi.lu@intel.com>,
+      Jeff Trawick, Jim Jagielski, Yann Ylavic]
+ 
+   *) mod_proxy: Fix a race condition that caused a failed worker to be retried
+      before the retry period is over. [Ruediger Pluem]
+ 
    *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are
       loaded. [Eric Covener]
  

diff --cc docs/manual/mod/quickreference.html.en
Simple merge

diff --cc include/ap_mmn.h
index 72fe541e14fe7b774fedfdbbf266621eaca75862,bfaa6fb49390aebbc6dda2a287aa2608ba287b73..b6204fbdf26e0ed64abd7665c2b08e1d44664d75
--- 1/include/ap_mmn.h
--- 2/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@@ -445,7 -445,11 +445,17 @@@
   * 20120211.46 (2.4.13-dev) Add ap_map_http_request_error()
   * 20120211.47 (2.4.13-dev) Add ap_some_authn_required, ap_force_authn hook.
   *                          Deprecate broken ap_some_auth_required.
-  * 20140627.4 (2.5.0-dev)  Added ap_parse_token_list_strict() to httpd.h.
+  * 20120211.48 (2.4.13-dev) Added ap_log_mpm_common().
+  * 20120211.49 (2.4.13-dev) Add listener bucket in scoreboard.h's process_score.
+  * 20120211.50 (2.4.13-dev) Add ap_set_listencbratio(), ap_close_listeners_ex(),
+  *                          ap_duplicate_listeners(), ap_num_listen_buckets and
+  *                          ap_have_so_reuseport to ap_listen.h.
++ * 20120211.51 (2.4.17-dev) Add protocols and protocols_honor_order to
++ *                          core_server_config. Add hooks protocol_propose
++ *                          protocol_switch and protocol_get. Add
++ *                          ap_select_protocol(), ap_switch_protocol(),
++ *                          ap_get_protocol(). Add HTTP_MISDIRECTED_REQUEST.
++ *                          Added ap_parse_token_list_strict() to httpd.h
   */
  
  #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@@ -453,7 -457,7 +463,7 @@@
  #ifndef MODULE_MAGIC_NUMBER_MAJOR
  #define MODULE_MAGIC_NUMBER_MAJOR 20120211
  #endif
- #define MODULE_MAGIC_NUMBER_MINOR 47                   /* 0...n */
 -#define MODULE_MAGIC_NUMBER_MINOR 50                   /* 0...n */
++#define MODULE_MAGIC_NUMBER_MINOR 51                   /* 0...n */
  
  /**
   * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --cc include/httpd.h
Simple merge