]>
granicus.if.org Git - apache/log
Stefan Eissing [Fri, 16 Mar 2018 15:49:14 +0000 (15:49 +0000)]
adding r1827001 to backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827004 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Mar 2018 15:44:10 +0000 (15:44 +0000)]
backport proposal for r1826995
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826999 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 11:29:14 +0000 (11:29 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826974 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 09:18:45 +0000 (09:18 +0000)]
Reverting proposal again: compilation test reveals
that SSL_get_server_tmp_key is only OpenSSL 1.0.2+.
But it seems the whole feature doesn't make sense
without SSL_get_server_tmp_key.
For the sake of completeness: EVP_PKEY_id also isn't
part of 0.9.8a.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826929 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 08:30:26 +0000 (08:30 +0000)]
Add log msg from Yann's addition to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826925 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 08:26:21 +0000 (08:26 +0000)]
Proposing this again, now with Yann's addition.
The OpenSSL 1.0.2 dependency is not a problem, because
it is used only conditionally if 1.0.2 is available,
but not for older versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826922 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:36:43 +0000 (23:36 +0000)]
Votes (applies cleanly in order).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826904 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:27:20 +0000 (23:27 +0000)]
Thanks Yann for your additional patch but on second
thought the whole feature can't be backported
due to our support of OpenSSL 0.9.8 in 2.4.x
and EC_curve_nid2nist() is only available in
1.0.2+.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826901 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:20:16 +0000 (23:20 +0000)]
Follow up to r1826899: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826900 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:19:12 +0000 (23:19 +0000)]
Merge r1826556, r1826847 from trunk:
Fix timeout logging in ap_process_request().
We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.
Reported by: steffenal
Closes SpiderLabs/ModSecurity#1542
Follow up to r1826556: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826899 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:16:29 +0000 (23:16 +0000)]
Follow up to r1826897: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826898 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:15:49 +0000 (23:15 +0000)]
Merge r1826845 from trunk:
mod_slotmem_shm: SHMs need to be attached in MPM winnt children processes.
We can't (re-)create them since they exist already and are owned by the
parent process.
Submitted by: ylavic
Reviewed by: ylavic, covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826897 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:13:08 +0000 (23:13 +0000)]
Patches now uploaded, sorry.
Removed comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826896 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:11:39 +0000 (23:11 +0000)]
Follow up to r1826891: missing mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826895 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:09:24 +0000 (23:09 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826894 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:08:35 +0000 (23:08 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826893 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:05:58 +0000 (23:05 +0000)]
Merge
1710403 from trunk:
htpasswd/htdigest: Disable support for bcrypt on EBCDIC platforms.
apr-util's bcrypt implementation doesn't tolerate EBCDIC.
Submitted by: rjung
Reviewed by: rjung, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826892 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:02:58 +0000 (23:02 +0000)]
Merge
1626956 and
1628388 from trunk:
ab: try all destination socket addresses returned by apr_sockaddr_info_get
instead of failing on first one when not available.
Needed for instance if localhost resolves to both ::1 and 127.0.0.1
e.g. if both are in /etc/hosts.
ab: Use only one connection to determine working destination socket address.
Submitted by: rjung
Reviewed by: rjung, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826891 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:00:59 +0000 (23:00 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826890 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:58:21 +0000 (22:58 +0000)]
Anticipated +1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826889 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:56:40 +0000 (22:56 +0000)]
Merge
1781516 fro trunk:
htpasswd/htdbm: report the right limit when get_password()
overflows.
Submitted by: rjung
Reviewed by: rjung, covener, jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826888 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:53:42 +0000 (22:53 +0000)]
Merge
1812756 from trunk:
htpasswd: Don't fail in -v mode if password file is unwritable.
PR 61631.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826887 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:51:29 +0000 (22:51 +0000)]
Merge
1781509 from trunk:
htpasswd: don't point to (unused) stack memory on output
to make static analysers happy. PR 60634.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826886 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:46:27 +0000 (22:46 +0000)]
Merge
1821767 from trunk:
LibreSSL doesn't have or require applink.c
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826885 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:30:44 +0000 (22:30 +0000)]
More votes and comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826883 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:19:46 +0000 (22:19 +0000)]
Vote/promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826881 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 20:39:42 +0000 (20:39 +0000)]
Makes sense, withdrawing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826862 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 15 Mar 2018 20:09:39 +0000 (20:09 +0000)]
Easy vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826859 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 15 Mar 2018 19:24:29 +0000 (19:24 +0000)]
Slightly improve syntax highlight
(r1826856 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826858 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 15 Mar 2018 19:07:28 +0000 (19:07 +0000)]
vote/promote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826857 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:30:25 +0000 (18:30 +0000)]
Easy votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826850 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:22:41 +0000 (18:22 +0000)]
Proposing style :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826849 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:20:01 +0000 (18:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826848 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 13:27:48 +0000 (13:27 +0000)]
Propose backports bringing rotatelogs in sync
with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826813 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 12:10:42 +0000 (12:10 +0000)]
Add small backport proposals for htpasswd, htdbm
and htdigest bringing them in sync with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826801 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 11:45:25 +0000 (11:45 +0000)]
Propose ab patch for minor problem detected
during 2.4.32 testing (thanks to Joe for pointing
out the trunk fix) and two more small changes
bringing 2.4 ab in sync with trunk ab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826799 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Mar 2018 22:29:37 +0000 (22:29 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826759 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 12 Mar 2018 15:19:07 +0000 (15:19 +0000)]
Revert r1826543, was meant for trunk...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826555 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 12 Mar 2018 12:24:27 +0000 (12:24 +0000)]
Fix timeout logging in ap_process_request().
We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.
Reported by: steffenal
Fixes SpiderLabs/ModSecurity#1542
[Reverted by r1826555]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826543 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 12 Mar 2018 10:18:22 +0000 (10:18 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826531 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 12 Mar 2018 10:18:00 +0000 (10:18 +0000)]
mod_md.xml: update the Let’s Encrypt Subscriber Agreement link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826530 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Mar 2018 16:12:37 +0000 (16:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826415 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Mar 2018 16:10:45 +0000 (16:10 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826414 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 10 Mar 2018 02:33:29 +0000 (02:33 +0000)]
Post 2.4.32 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826391 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 10 Mar 2018 02:33:21 +0000 (02:33 +0000)]
Get ready to tag httpd 2.4.32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826389 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 10:59:45 +0000 (10:59 +0000)]
Update mergeinfo only: r1487775 was merged (indirectly) from
trunk to 2.4.x in r1824187.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826326 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 10:53:54 +0000 (10:53 +0000)]
Update mergeinfo only:
1374214 ,
1374216 ,
1375445 ,
1467593 were merged
from trunk to 2.4.x in r1476685.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826324 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Mar 2018 10:39:24 +0000 (10:39 +0000)]
Add a missing word in the French translation
(r1826318 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826323 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 9 Mar 2018 09:52:17 +0000 (09:52 +0000)]
-tabs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826316 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 9 Mar 2018 09:49:26 +0000 (09:49 +0000)]
Revival (while being discussed :p ).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826315 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 09:25:08 +0000 (09:25 +0000)]
Merged*4, thx for reviews!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826311 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 09:24:30 +0000 (09:24 +0000)]
Merge r1617913 from trunk:
* support/ab.c: Fix crash caused by integer overflow when printing stats with
lot of requests (for example -n
500000000 ).
Submitted by: jkaluza
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826310 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 09:19:44 +0000 (09:19 +0000)]
Merge r1667676, r1826207 from trunk:
* mod_access_compat, mod_authz_host: Handle '#' character.
For mod_access_compat, disable '#' in hostname completely.
For mod_authz_host, treat '#' as a comment and ignore everything after that.
This allows better handling of admin errors like
'Require host localhost# Add example.com later'.
* modules/aaa/mod_authz_host.c (host_check_authorization): Simplify
comment stripping in "Require host"; log a warning if a comment is
used in 'Require host', or an error if the expression is empty with
the comment stripped. (Currently in 2.4, #comment part is parsed)
Submitted by: jkaluza, jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826309 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 09:09:38 +0000 (09:09 +0000)]
Merge r1532281, r1532289, r1537718 from trunk:
* support/rotatelogs.c (get_now): Return the offset applied to the
Unix time as a parameter.
(doRotate): When exploding the time for strtfime formatting, iff in
-l mode, subtract the offset and explode the real Unix time as a
local time so %Z etc works correctly.
* support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
added in r1532281.
* support/rotatelogs.c: Introduce an adjusted_time_t type to store the
weird "adjusted time since epoch" type returned by get_now().
Switch from int to long to fix an unnecessary Y2K38 issue. Adjust
use throughout and clean up other type issues. No functional change
intended apart from fixing Y2K38.
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826306 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Mar 2018 07:55:27 +0000 (07:55 +0000)]
Merge r1811976 from trunk:
Add optional _RAW suffix to SSL_*_DN_xx attribute names, allowing
users to convert an attribute value without conversion to UTF-8. (A
public CA has issued certs with attributes tagged as the wrong ASN.1
string types.)
* modules/ssl/ssl_util_ssl.c (asn1_string_convert): Rename from
asn1_string_to_utf8; add raw argument. Reimplement _to_utf8 as
macro.
(modssl_X509_NAME_ENTRY_to_string): Add raw argument.
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Use raw
string conversion if _RAW suffix is present in DN component.
Submitted by: jorton
Reviewed by: jorton, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826300 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Mar 2018 22:56:57 +0000 (22:56 +0000)]
Update link (STALLED, but seems related to PR 62167, should we discuss it...).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826284 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Mar 2018 22:16:12 +0000 (22:16 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826281 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Mar 2018 22:00:21 +0000 (22:00 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826279 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 8 Mar 2018 15:40:42 +0000 (15:40 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826247 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 8 Mar 2018 12:33:42 +0000 (12:33 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826211 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Mar 2018 20:18:35 +0000 (20:18 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826158 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Mar 2018 20:10:59 +0000 (20:10 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826157 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Mar 2018 19:34:21 +0000 (19:34 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826153 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 6 Mar 2018 10:57:36 +0000 (10:57 +0000)]
Update mergeinfo only: r1735891 was merged to 2.4.x in r1787728.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825974 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 5 Mar 2018 14:59:13 +0000 (14:59 +0000)]
Note that 2.4.32 is in development
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825905 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 5 Mar 2018 14:53:45 +0000 (14:53 +0000)]
Add mergeinfo for r1825839.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825903 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 5 Mar 2018 02:17:51 +0000 (02:17 +0000)]
Sorry, 2.4.31. It just isn't your day.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825843 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 4 Mar 2018 22:56:53 +0000 (22:56 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825840 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 4 Mar 2018 22:56:42 +0000 (22:56 +0000)]
ab: Fix send length calculation
... for the non-blocking connect case introduced in 2.4.30.
Submitted By: jorton
Reviewed By: ylavic, druggeri, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825839 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 4 Mar 2018 22:54:07 +0000 (22:54 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825838 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 4 Mar 2018 22:39:00 +0000 (22:39 +0000)]
Easy to test vote for ab fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825837 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 4 Mar 2018 19:19:11 +0000 (19:19 +0000)]
ab fix is actually a show stopper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825836 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 4 Mar 2018 19:17:25 +0000 (19:17 +0000)]
This mod_dav proposal needs more work (addressing -1).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825835 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 4 Mar 2018 19:12:29 +0000 (19:12 +0000)]
Propose fix for ab defect detected in 2.4.31.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825834 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 3 Mar 2018 15:53:13 +0000 (15:53 +0000)]
Post 2.4.31 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825777 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 3 Mar 2018 15:53:06 +0000 (15:53 +0000)]
Get ready to tag httpd 2.4.31
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825775 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 3 Mar 2018 14:31:14 +0000 (14:31 +0000)]
*) mod_proxy_fcgi: Add the support for the mod_proxy's flushpackets parameter.
trunk patch: http://svn.apache.org/r1802040
http://svn.apache.org/r1807876
http://svn.apache.org/r1808014
http://svn.apache.org/r1805490
http://svn.apache.org/r1823886
2.4.x: svn merge -c
1802040 ,
1807876 ,
1808014 ,
1805490 ,
1823886 ^/httpd/httpd/trunk .
+1: elukey, jim, ylavic
elukey: this patch has been requested a couple of times in the users@ mailing list,
but from my tests in trunk the async/set-aside core features would already
do the job without the need of this patch. I am proposing the backport
to allow more users to migrate away from mod_fastcgi.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825771 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 3 Mar 2018 13:08:07 +0000 (13:08 +0000)]
fix properties and update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825769 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 3 Mar 2018 12:18:37 +0000 (12:18 +0000)]
Merge r1802040, r1807876, r1808014, r1805490, r1823886 from trunk:
mod_proxy_fcgi: Add the support for mod_proxy's
flushpackets and flushwait params
This change was requested on the development mailing
list in order to fill another gap between mod_fcgi
and mod_proxy_fcgi, namely the -flush funtionality.
The more evolved core trunk code would not need this
feature becuse of the non-blocking writes, but it
is be needed in 2.4.x.
mod_proxy_fcgi: limit the flush buckets inserted when flushpackets=on|auto
This commit is a follow up of r1802040 based on Jacob's
feedback, namely inserting the FLUSH buckets only when
really needed and useful, not always.
mod_proxy_fcgi: follow up to r1807876.
Fix mixed declarations and code [-Wdeclaration-after-statement].
Fix a compilation warning introduced by r1802040.
mod_proxy_fcgi.c:893:19: warning: ‘flushpoll’ may be used uninitialized in this function [-Wmaybe-uninitialized]
This warning is a false positive.
mod_proxy_fcgi: prioritize the check for mayflush when using flushpackets
The mayflush variable should be checked before the rest
to avoid polling when not needed.
Suggested by Yann Ylavic on the dev@ mailing list.
Submitted by: elukey, ylavic, jailletc36, elukey
Reviewed by: elukey, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825765 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 3 Mar 2018 12:14:44 +0000 (12:14 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825764 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 2 Mar 2018 12:59:58 +0000 (12:59 +0000)]
Merge r1825169 from trunk:
Propose backportable fix to accept libxml2 path in the
base form or the absolute path to include tree form.
Nowhere does the --with-libxml2= arg suggest the path
is that of the include tree, and disagrees with httpd's
use of --with- syntax for package location.
Submitted by: wrowe
Reviewed by: wrowe, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825720 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 2 Mar 2018 12:59:15 +0000 (12:59 +0000)]
backport promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825719 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 2 Mar 2018 12:58:53 +0000 (12:58 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825718 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Mar 2018 09:30:02 +0000 (09:30 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825632 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Mar 2018 09:29:47 +0000 (09:29 +0000)]
Merge r1825147 from trunk:
* modules/lua/config.m4: Use liblua paths from pkg-config if
available.
Reviewed by: wrowe, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825631 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Mar 2018 09:28:14 +0000 (09:28 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825630 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 27 Feb 2018 21:37:19 +0000 (21:37 +0000)]
Backport r1825504; fix missing util_debug.c omitted from CMakeLists.txt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825505 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 27 Feb 2018 16:03:33 +0000 (16:03 +0000)]
Backport r1825467.
Fix the version number in the docs to match the real release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825468 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 26 Feb 2018 13:38:56 +0000 (13:38 +0000)]
Backport r1825370:
rpm: Add mod_proxy_uwsgi to the RPM package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825371 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 26 Feb 2018 13:26:50 +0000 (13:26 +0000)]
Backport
1825368 :
rpm: Remove rpm build for mod_socache_dc, the dependency distcache has long since
stopped being available in RPM distros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825369 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Feb 2018 14:35:42 +0000 (14:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825245 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Feb 2018 14:34:28 +0000 (14:34 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825244 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 23 Feb 2018 20:34:51 +0000 (20:34 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825171 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 23 Feb 2018 20:29:14 +0000 (20:29 +0000)]
Propose small ./configure bandaids
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1825170 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 21 Feb 2018 15:52:21 +0000 (15:52 +0000)]
Follow up to r1824974: add mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824976 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 21 Feb 2018 14:56:38 +0000 (14:56 +0000)]
Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch]
and correct LICENSE/NOTICE to match.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824974 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 21 Feb 2018 13:18:59 +0000 (13:18 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824963 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 21 Feb 2018 10:12:43 +0000 (10:12 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824952 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 21 Feb 2018 10:10:43 +0000 (10:10 +0000)]
mod_ssl.xml: remove <override>Not applicable</override>
These tags generate a "Not applicable" section in
docs/manual/mod/overrides.html that doesn't make a lot of
sense, plus it breaks ./build.sh validate-xhtml.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824951 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 21 Feb 2018 07:12:40 +0000 (07:12 +0000)]
* Have a veto here. Sorry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824928 13f79535 -47bb-0310-9956-
ffa450edef68