https://svn.apache.org/r1874101
https://svn.apache.org/r1913838
svn merge -c 1874101,1913838 ^/httpd/httpd/trunk .
- +1: ylavic, minfrin
+ +1: ylavic, minfrin, jorton
ylavic: changes in ssl_private.h not needed if/after r1908537 is
backported (below proposal), though they are harmless. See:
https://lists.apache.org/thread/k924ql8c9ry1b9y94fpr2b0d5o6tmds6
minfrin: r1908537 is backported, can you update this proposal clean?
ylavic: done, votes reset
- *) Fix compiler warnings triggered by clang.
- trunk patch: http://svn.apache.org/r1909450
- 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-warnings-be-gone.patch
- +1: minfrin, ylavic, jfclere
-
*) Add CGIScriptTimeout to mod_cgi.
trunk patch: http://svn.apache.org/r1828172
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch